mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

More cocoa functions moved into cocoa header

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-27 11:51:07 +05:30
parent 8e4e023026
commit 5432a1680f
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kitty/cocoa_window.h
View File

@@ -9,6 +9,35 @@
#include "data-types.h" #include "data-types.h"
typedef enum {
PREFERENCES_WINDOW,
NEW_OS_WINDOW,
NEW_OS_WINDOW_WITH_WD,
NEW_TAB_WITH_WD,
CLOSE_OS_WINDOW,
CLOSE_TAB,
NEW_TAB,
NEXT_TAB,
PREVIOUS_TAB,
DETACH_TAB,
LAUNCH_URLS,
NEW_WINDOW,
CLOSE_WINDOW,
RESET_TERMINAL,
CLEAR_TERMINAL_AND_SCROLLBACK,
RELOAD_CONFIG,
TOGGLE_MACOS_SECURE_KEYBOARD_ENTRY,
TOGGLE_FULLSCREEN,
OPEN_KITTY_WEBSITE,
HIDE,
HIDE_OTHERS,
MINIMIZE,
QUIT,
USER_MENU_ACTION,
NUM_COCOA_PENDING_ACTIONS
} CocoaPendingAction;
void cocoa_focus_window(void *w); void cocoa_focus_window(void *w);
long cocoa_window_number(void *w); long cocoa_window_number(void *w);
void cocoa_create_global_menu(void); void cocoa_create_global_menu(void);
@@ -27,3 +56,5 @@ size_t cocoa_get_workspace_ids(void *w, size_t *workspace_ids, size_t array_sz);
monotonic_t cocoa_cursor_blink_interval(void); monotonic_t cocoa_cursor_blink_interval(void);
bool cocoa_render_line_of_text(const char *text, const color_type fg, const color_type bg, uint8_t *rgba_output, const size_t width, const size_t height); bool cocoa_render_line_of_text(const char *text, const color_type fg, const color_type bg, uint8_t *rgba_output, const size_t width, const size_t height);
extern uint8_t* render_single_ascii_char_as_mask(const char ch, size_t *result_width, size_t *result_height); extern uint8_t* render_single_ascii_char_as_mask(const char ch, size_t *result_width, size_t *result_height);
void get_cocoa_key_equivalent(uint32_t, int, char *key, size_t key_sz, int*);
void set_cocoa_pending_action(CocoaPendingAction action, const char*);

2
kitty/glfw.c
View File

@@ -604,7 +604,6 @@ apple_url_open_callback(const char* url) {
return true; return true;
} }
extern bool cocoa_render_line_of_text(const char *text, const color_type fg, const color_type bg, uint8_t *rgba_output, const size_t width, const size_t height);
bool bool
draw_window_title(OSWindow *window UNUSED, const char *text, color_type fg, color_type bg, uint8_t *output_buf, size_t width, size_t height) { draw_window_title(OSWindow *window UNUSED, const char *text, color_type fg, color_type bg, uint8_t *output_buf, size_t width, size_t height) {
@@ -613,7 +612,6 @@ draw_window_title(OSWindow *window UNUSED, const char *text, color_type fg, colo
return cocoa_render_line_of_text(buf, fg, bg, output_buf, width, height); return cocoa_render_line_of_text(buf, fg, bg, output_buf, width, height);
} }
extern uint8_t* render_single_ascii_char_as_mask(const char ch, size_t *result_width, size_t *result_height);
uint8_t* uint8_t*
draw_single_ascii_char(const char ch, size_t *result_width, size_t *result_height) { draw_single_ascii_char(const char ch, size_t *result_width, size_t *result_height) {

31
kitty/state.h
View File

@@ -363,36 +363,7 @@ void set_os_window_chrome(OSWindow *w);
FONTS_DATA_HANDLE load_fonts_data(double, double, double); FONTS_DATA_HANDLE load_fonts_data(double, double, double);
void send_prerendered_sprites_for_window(OSWindow *w); void send_prerendered_sprites_for_window(OSWindow *w);
#ifdef __APPLE__ #ifdef __APPLE__
void get_cocoa_key_equivalent(uint32_t, int, char *key, size_t key_sz, int*); #include "cocoa_window.h"
typedef enum {
PREFERENCES_WINDOW,
NEW_OS_WINDOW,
NEW_OS_WINDOW_WITH_WD,
NEW_TAB_WITH_WD,
CLOSE_OS_WINDOW,
CLOSE_TAB,
NEW_TAB,
NEXT_TAB,
PREVIOUS_TAB,
DETACH_TAB,
LAUNCH_URLS,
NEW_WINDOW,
CLOSE_WINDOW,
RESET_TERMINAL,
CLEAR_TERMINAL_AND_SCROLLBACK,
RELOAD_CONFIG,
TOGGLE_MACOS_SECURE_KEYBOARD_ENTRY,
TOGGLE_FULLSCREEN,
OPEN_KITTY_WEBSITE,
HIDE,
HIDE_OTHERS,
MINIMIZE,
QUIT,
USER_MENU_ACTION,
NUM_COCOA_PENDING_ACTIONS
} CocoaPendingAction;
void set_cocoa_pending_action(CocoaPendingAction action, const char*);
#endif #endif
void request_frame_render(OSWindow *w); void request_frame_render(OSWindow *w);
void request_tick_callback(void); void request_tick_callback(void);