Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taiko2k
Taiko2k committed Jan 16, 2025
1 parent 7c3423b commit 56eccf0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
8 changes: 4 additions & 4 deletions src/tauon/t_modules/t_draw.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def __init__(self) -> None:

def destruct(self) -> None:
if self.surface:
sdl3.SDL_FreeSurface(self.surface)
sdl3.SDL_DestroySurface(self.surface)
self.surface = None
if self.texture:
sdl3.SDL_DestroyTexture(self.texture)
Expand All @@ -105,7 +105,7 @@ def read_and_thumbnail(self, f: str, width: int, height: int) -> None:
def prime(self) -> None:

texture = sdl3.SDL_CreateTextureFromSurface(self.renderer, self.surface)
sdl3.SDL_FreeSurface(self.surface)
sdl3.SDL_DestroySurface(self.surface)
self.surface = None
tex_w = pointer(c_int(0))
tex_h = pointer(c_int(0))
Expand Down Expand Up @@ -685,7 +685,7 @@ def __draw_text_cairo(
sdl3.SDL_SetColorKey(sdl3.SDL_surface, True, ke)

c = sdl3.SDL_CreateTextureFromSurface(self.renderer, sdl3.SDL_surface)
sdl3.SDL_FreeSurface(sdl3.SDL_surface)
sdl3.SDL_DestroySurface(sdl3.SDL_surface)

if alpha_bg:
blend_mode = sdl3.SDL_ComposeCustomBlendMode(sdl3.SDL_BLENDFACTOR_ONE, sdl3.SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA, sdl3.SDL_BLENDOPERATION_ADD, sdl3.SDL_BLENDFACTOR_ONE, sdl3.SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA, sdl3.SDL_BLENDOPERATION_ADD)
Expand Down Expand Up @@ -805,7 +805,7 @@ def __draw_text_windows(
dst.w = int(tex_w.contents.value)
dst.h = int(tex_h.contents.value)

sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
#im.close()

if align == 1:
Expand Down
59 changes: 30 additions & 29 deletions src/tauon/t_modules/t_main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8439,7 +8439,7 @@ def render(self, track: TrackClass, location, size=None, force_offset=None) -> b
wop = rw_from_object(order[1])
s_image = sdl3.IMG_Load_RW(wop, 0)
c = sdl3.SDL_CreateTextureFromSurface(renderer, s_image)
sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
tex_w = pointer(c_int(size))
tex_h = pointer(c_int(size))
sdl3.SDL_QueryTexture(c, None, None, tex_w, tex_h)
Expand Down Expand Up @@ -10297,10 +10297,11 @@ def get_xcursor(name: str):
xcursor_theme = os.environ["XCURSOR_THEME"]
xcursor_size = os.environ["XCURSOR_SIZE"]
c1 = xcu.XcursorLibraryLoadImage(c_char_p(name.encode()), c_char_p(xcursor_theme.encode()), c_int(int(xcursor_size))).contents
sdl3.SDL_surface = sdl3.SDL_CreateRGBSurfaceWithFormatFrom(c1.pixels, c1.width, c1.height, 32, c1.width * 4, sdl3.SDL_PIXELFORMAT_ARGB8888)
#sdl3.SDL_surface = sdl3.SDL_CreateRGBSurfaceWithFormatFrom(c1.pixels, c1.width, c1.height, 32, c1.width * 4, sdl3.SDL_PIXELFORMAT_ARGB8888)
sdl3.SDL_surface = sdl3.SDL_CreateSurfaceFrom(c1.width, c1.height, sdl3.SDL_PIXELFORMAT_ARGB8888, c1.pixels, c1.width * 4)
cursor = sdl3.SDL_CreateColorCursor(sdl3.SDL_surface, round(c1.xhot), round(c1.yhot))
xcu.XcursorImageDestroy(ctypes.byref(c1))
sdl3.SDL_FreeSurface(sdl3.SDL_surface)
sdl3.SDL_DestroySurface(sdl3.SDL_surface)
return cursor

cursor_br_corner = get_xcursor("se-resize")
Expand Down Expand Up @@ -10736,7 +10737,7 @@ def prepare(self, w, h):
dst.w = int(tex_w.contents.value)
dst.h = int(tex_h.contents.value)

sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
g.close()
im.close()

Expand Down Expand Up @@ -13031,7 +13032,7 @@ def display(self, track: TrackClass, location, box, fast: bool = False, theme_on
dst.h = int(tex_h.contents.value)

# Clean uo
sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
source_image.close()
g.close()
# if close:
Expand Down Expand Up @@ -13232,7 +13233,7 @@ def display(self) -> None:
dst.h = int(tex_h.contents.value)

# Clean uo
sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
self.im.close()

# sdl3.SDL_SetTextureAlphaMod(c, 10)
Expand Down Expand Up @@ -37092,7 +37093,7 @@ def load_img(self, artist):
wop = rw_from_object(g)
s_image = sdl3.IMG_Load_RW(wop, 0)
texture = sdl3.SDL_CreateTextureFromSurface(renderer, s_image)
sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
tex_w = pointer(c_int(0))
tex_h = pointer(c_int(0))
sdl3.SDL_QueryTexture(texture, None, None, tex_w, tex_h)
Expand Down Expand Up @@ -39431,7 +39432,7 @@ def draw(self, x, y):
wop = rw_from_object(self.image_data)
s_image = sdl3.IMG_Load_RW(wop, 0)
self.texture = sdl3.SDL_CreateTextureFromSurface(renderer, s_image)
sdl3.SDL_FreeSurface(s_image)
sdl3.SDL_DestroySurface(s_image)
tex_w = pointer(c_int(0))
tex_h = pointer(c_int(0))
sdl3.SDL_QueryTexture(self.texture, None, None, tex_w, tex_h)
Expand Down Expand Up @@ -39947,7 +39948,7 @@ def draw(self, station, x, y, w):
return 0
if r[0] == 2:
texture = sdl3.SDL_CreateTextureFromSurface(renderer, r[3])
sdl3.SDL_FreeSurface(r[3])
sdl3.SDL_DestroySurface(r[3])
tex_w = pointer(c_int(0))
tex_h = pointer(c_int(0))
sdl3.SDL_QueryTexture(texture, None, None, tex_w, tex_h)
Expand Down Expand Up @@ -42981,7 +42982,7 @@ def drop_file(target):
keymaps.hits.append("MB4")
elif event.button.button == sdl3.SDL_BUTTON_X2:
keymaps.hits.append("MB5")
elif event.type == sdl3.SDL_MOUSEBUTTONUP:
elif event.type == sdl3.SDL_EVENT_MOUSE_BUTTON_UP:
k_input = True
power += 5
gui.update += 1
Expand All @@ -42995,7 +42996,7 @@ def drop_file(target):

mouse_down = False
gui.update += 1
elif event.type == sdl3.SDL_KEYDOWN and key_focused == 0:
elif event.type == sdl3.SDL_EVENT_KEY_DOWN and key_focused == 0:
k_input = True
power += 5
gui.update += 2
Expand Down Expand Up @@ -43068,7 +43069,7 @@ def drop_file(target):
key_meta = True
key_focused = 1

elif event.type == sdl3.SDL_KEYUP:
elif event.type == sdl3.SDL_EVENT_KEY_UP:

k_input = True
power += 5
Expand All @@ -43094,25 +43095,25 @@ def drop_file(target):
key_meta = False
key_focused = 1

elif event.type == sdl3.SDL_TEXTINPUT:
elif event.type == sdl3.SDL_EVENT_TEXT_INPUT:
k_input = True
power += 5
input_text += event.text.text.decode("utf-8")

gui.update += 1
#logging.info(input_text)

elif event.type == sdl3.SDL_MOUSEWHEEL:
elif event.type == sdl3.SDL_EVENT_MOUSE_WHEEL:
k_input = True
power += 6
mouse_wheel += event.wheel.y
gui.update += 1
elif event.type == sdl3.SDL_WINDOWEVENT:
elif event.type >= sdl3.SDL_EVENT_WINDOW_FIRST and event.type <= sdl3.SDL_EVENT_WINDOW_LAST :

power += 5
#logging.info(event.window.event)
#logging.info(event.type)

if event.window.event == sdl3.SDL_WINDOWEVENT_FOCUS_GAINED:
if event.type == sdl3.SDL_EVENT_WINDOW_FOCUS_GAINED:
#logging.info("sdl3.SDL_WINDOWEVENT_FOCUS_GAINED")

if system == "Linux" and not macos and not msys:
Expand All @@ -43128,15 +43129,15 @@ def drop_file(target):
gui.pl_update = 1
gui.update += 1

elif event.window.event == sdl3.SDL_WINDOWEVENT_FOCUS_LOST:
elif event.type == sdl3.SDL_EVENT_WINDOW_FOCUS_LOST:
close_all_menus()
key_focused = 1
gui.update += 1

elif event.window.event == sdl3.SDL_WINDOWEVENT_DISPLAY_CHANGED:
elif event.type == sdl3.SDL_EVENT_WINDOW_DISPLAY_CHANGED:
# sdl3.SDL_WINDOWEVENT_DISPLAY_CHANGED logs new display ID as data1 (0 or 1 or 2...), it not width, and data 2 is always 0
pass
elif event.window.event == sdl3.SDL_WINDOWEVENT_RESIZED:
elif event.type == sdl3.SDL_EVENT_WINDOW_RESIZED:
# sdl3.SDL_WINDOWEVENT_RESIZED logs width to data1 and height to data2
if event.window.data1 < 500:
logging.error("Window width is less than 500, grrr why does this happen, stupid bug")
Expand All @@ -43161,25 +43162,25 @@ def drop_file(target):
update_layout = True


elif event.window.event == sdl3.SDL_WINDOWEVENT_ENTER:
elif event.type == sdl3.SDL_EVENT_WINDOW_MOUSE_ENTER:
#logging.info("ENTER")
mouse_enter_window = True
gui.mouse_in_window = True
gui.update += 1

# elif event.window.event == sdl3.SDL_WINDOWEVENT_HIDDEN:
# elif event.type == sdl3.SDL_WINDOWEVENT_HIDDEN:
#
elif event.window.event == sdl3.SDL_WINDOWEVENT_EXPOSED:
elif event.type == sdl3.SDL_EVENT_WINDOW_EXPOSED:
#logging.info("expose")
gui.lowered = False

elif event.window.event == sdl3.SDL_WINDOWEVENT_MINIMIZED:
elif event.type == sdl3.SDL_EVENT_WINDOW_MINIMIZED:
gui.lowered = True
# if prefs.min_to_tray:
# tray.down()
# tauon.thread_manager.sleep()

elif event.window.event == sdl3.SDL_WINDOWEVENT_RESTORED:
elif event.type == sdl3.SDL_EVENT_WINDOW_RESTORED:

gui.lowered = False
gui.maximized = False
Expand All @@ -43190,25 +43191,25 @@ def drop_file(target):
update_title_do()
#logging.info("restore")

elif event.window.event == sdl3.SDL_WINDOWEVENT_SHOWN:
elif event.type == sdl3.SDL_EVENT_WINDOW_SHOWN:
focused = True
gui.pl_update = 1
gui.update += 1

# elif event.window.event == sdl3.SDL_WINDOWEVENT_FOCUS_GAINED:
# elif event.type == sdl3.SDL_WINDOWEVENT_FOCUS_GAINED:
# logging.info("FOCUS GAINED")
# # input.mouse_enter_event = True
# # gui.update += 1
# # k_input = True

elif event.window.event == sdl3.SDL_WINDOWEVENT_MAXIMIZED:
elif event.type == sdl3.SDL_EVENT_WINDOW_MAXIMIZED:
if gui.mode != 3: # workaround. sdl bug? gives event on window size set
gui.maximized = True
update_layout = True
gui.pl_update = 1
gui.update += 1

elif event.window.event == sdl3.SDL_WINDOWEVENT_LEAVE:
elif event.type == sdl3.SDL_EVENT_WINDOW_MOUSE_LEAVE:
gui.mouse_in_window = False
gui.update += 1
power = 1000
Expand Down

0 comments on commit 56eccf0

Please sign in to comment.