From 5a112412779b537b4f14dd12dd9632b74df064dd Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 16 Dec 2021 21:53:47 -0300 Subject: [PATCH] Cant disable top menu and save shortcut in apple platform. --- pw3270.cbp | 6 ++++++ schemas/macos/window.gschema.xml.in | 6 ------ src/objects/application/application.c | 4 ++++ src/objects/os/linux/savedesktopicon.c | 36 +----------------------------------- src/objects/os/macos/savedesktopicon.c | 320 +++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/objects/os/windows/savedesktopicon.c | 2 +- src/objects/window/private.h | 2 +- src/objects/window/window.c | 24 ++++++++++++++---------- 8 files changed, 38 insertions(+), 362 deletions(-) diff --git a/pw3270.cbp b/pw3270.cbp index 51d8141..a779f3f 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -136,6 +136,12 @@ + + + + diff --git a/schemas/macos/window.gschema.xml.in b/schemas/macos/window.gschema.xml.in index 1e63335..9ad6f76 100644 --- a/schemas/macos/window.gschema.xml.in +++ b/schemas/macos/window.gschema.xml.in @@ -68,12 +68,6 @@ - - false - The menubar visible state - - - -1 How to draw the toolbar. diff --git a/src/objects/application/application.c b/src/objects/application/application.c index d34fc2c..47802da 100644 --- a/src/objects/application/application.c +++ b/src/objects/application/application.c @@ -204,13 +204,17 @@ static gboolean on_user_interface(const gchar G_GNUC_UNUSED(*option), const gcha g_settings_set_uint(app_settings,"ui-style",PW3270_UI_STYLE_GNOME); g_settings_set_boolean(win_settings,"toolbar-visible",TRUE); +#ifndef __APPLE__ g_settings_set_boolean(win_settings,"menubar-visible",FALSE); +#endif // __APPLE__ } else if(!g_ascii_strcasecmp(value,"classic")) { g_settings_set_uint(app_settings,"ui-style",PW3270_UI_STYLE_CLASSICAL); g_settings_set_boolean(win_settings,"toolbar-visible",TRUE); +#ifndef __APPLE__ g_settings_set_boolean(win_settings,"menubar-visible",TRUE); +#endif // __APPLE__ } else if(!g_ascii_strcasecmp(value,"default")) { diff --git a/src/objects/os/linux/savedesktopicon.c b/src/objects/os/linux/savedesktopicon.c index bbef5d7..1aa5d2a 100644 --- a/src/objects/os/linux/savedesktopicon.c +++ b/src/objects/os/linux/savedesktopicon.c @@ -105,7 +105,7 @@ static const struct _entry { }; -GAction * pw3270_action_save_desktop_icon_new(void) { +GAction * pw3270_action_save_session_shortcut_new(void) { V3270SimpleAction * action = v3270_dialog_action_new(factory); @@ -117,40 +117,6 @@ GAction * pw3270_action_save_desktop_icon_new(void) { } -/* -static gchar * get_filename(GtkWidget *terminal) { - - g_autofree gchar * defname = v3270_keyfile_get_default_filename(); -const gchar * current = v3270_key_file_get_filename(terminal); - -// If is not the default name, return it. -if(strcmp(defname,current)) { - return g_strdup(current); -} - -// It's the default one, create a new one on the user_config dir -g_autofree gchar * config_path = v3270_key_file_get_default_path(terminal); - -// Use the hostname -const char * hostname = lib3270_host_get_name(v3270_get_session(terminal)); -if(!hostname) { - hostname = G_STRINGIFY(PRODUCT_NAME); -} - -// Build the filename -gchar *filename = g_strconcat(config_path,G_DIR_SEPARATOR_S,hostname,".3270",NULL); - -unsigned int index = 0; -while(g_file_test(filename,G_FILE_TEST_EXISTS)) { - g_free(filename); - filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s.%u.3270",config_path,hostname,++index); -} - -return filename; - -} -*/ - GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) { size_t ix; diff --git a/src/objects/os/macos/savedesktopicon.c b/src/objects/os/macos/savedesktopicon.c index bbef5d7..acf52a7 100644 --- a/src/objects/os/macos/savedesktopicon.c +++ b/src/objects/os/macos/savedesktopicon.c @@ -28,7 +28,7 @@ */ /** - * @brief Implement Linux version of the save desktop icon action. + * @brief Implement MacOS version of the save desktop icon action. * */ @@ -44,68 +44,8 @@ #include static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); -static void response(GtkWidget *dialog, gint response_id, GtkWidget *terminal); -static const struct _entry { - - const gchar * key; - const gchar * label; - const gchar * tooltip; - const gchar * default_value; - gint margin_top; - gint width; - -} entries[] = { - - // 0 = Shortcut name - { - .key = "Name", - .label = N_("Shortcut name"), - .default_value = G_STRINGIFY(PRODUCT_NAME), - .width = 20, - }, - - // 1 = Shortcut file - { - .label = N_("Shortcut file"), - .tooltip = N_("Path for the new shortcut"), - .width = 40, - }, - - // 2 = Session name - { - .label = N_("Session name"), - .margin_top = 12, - .tooltip = N_("The session name used in the window/tab title (empty for default)"), - .width = 15, - }, - - // 3 = Session file - { - .label = N_("Session file"), - .tooltip = N_("The file with the session preferences for this shortcut"), - .width = 40, - }, - - // 4 = Generic name. - { - .key = "GenericName", - .margin_top = 12, - .label = N_("Generic name"), - .default_value = G_STRINGIFY(PRODUCT_NAME), - .width = 20, - }, - - { - .key = "Comment", - .label = N_("Comment"), - .default_value = N_("IBM 3270 Terminal emulator"), - .width = 30, - } - -}; - -GAction * pw3270_action_save_desktop_icon_new(void) { +GAction * pw3270_action_save_session_shortcut_new(void) { V3270SimpleAction * action = v3270_dialog_action_new(factory); @@ -117,262 +57,24 @@ GAction * pw3270_action_save_desktop_icon_new(void) { } -/* -static gchar * get_filename(GtkWidget *terminal) { - - g_autofree gchar * defname = v3270_keyfile_get_default_filename(); -const gchar * current = v3270_key_file_get_filename(terminal); - -// If is not the default name, return it. -if(strcmp(defname,current)) { - return g_strdup(current); -} - -// It's the default one, create a new one on the user_config dir -g_autofree gchar * config_path = v3270_key_file_get_default_path(terminal); - -// Use the hostname -const char * hostname = lib3270_host_get_name(v3270_get_session(terminal)); -if(!hostname) { - hostname = G_STRINGIFY(PRODUCT_NAME); -} - -// Build the filename -gchar *filename = g_strconcat(config_path,G_DIR_SEPARATOR_S,hostname,".3270",NULL); - -unsigned int index = 0; -while(g_file_test(filename,G_FILE_TEST_EXISTS)) { - g_free(filename); - filename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s.%u.3270",config_path,hostname,++index); -} - -return filename; - -} -*/ - GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) { - size_t ix; - - gboolean use_header; - g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL); - - GtkWidget * dialog = - GTK_WIDGET(g_object_new( - GTK_TYPE_DIALOG, - "use-header-bar", (use_header ? 1 : 0), - NULL - )); - - - gtk_window_set_modal(GTK_WINDOW(dialog),TRUE); - gtk_window_set_title(GTK_WINDOW(dialog),action->label); - - gtk_dialog_add_buttons( - GTK_DIALOG(dialog), - _("_Cancel"), GTK_RESPONSE_CANCEL, - _("_Save"), GTK_RESPONSE_APPLY, - NULL - ); - - g_signal_connect(dialog,"response",G_CALLBACK(response),terminal); - - // Create entry fields - GtkWidget ** inputs = g_new0(GtkWidget *,G_N_ELEMENTS(entries)); - g_object_set_data_full(G_OBJECT(dialog),"inputs",inputs,g_free); - debug("Dialog=%p inputs=%p",dialog,inputs); - - GtkGrid * grid = GTK_GRID(gtk_grid_new()); - - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(grid),TRUE,TRUE,0); - - // https://developer.gnome.org/hig/stable/visual-layout.html.en - gtk_container_set_border_width(GTK_CONTAINER(grid),18); - gtk_grid_set_row_spacing(GTK_GRID(grid),6); - gtk_grid_set_column_spacing(GTK_GRID(grid),12); - - // https://developer.gnome.org/hig/stable/visual-layout.html.en - // gtk_box_set_spacing(GTK_BOX(content_area),18); - - for(ix = 0; ix < G_N_ELEMENTS(entries); ix++) { - - GtkWidget * label = gtk_label_new(gettext(entries[ix].label)); - gtk_label_set_xalign(GTK_LABEL(label),1); - gtk_grid_attach(grid,label,0,ix,1,1); - - inputs[ix] = gtk_entry_new(); - debug("inputs[%u]=%p",(unsigned int) ix, inputs[ix]); - - if(entries[ix].margin_top) { - gtk_widget_set_margin_top(label,entries[ix].margin_top); - gtk_widget_set_margin_top(inputs[ix],entries[ix].margin_top); - } - - if(entries[ix].default_value) { - gtk_entry_set_text(GTK_ENTRY(inputs[ix]),gettext(entries[ix].default_value)); - } - - if(entries[ix].tooltip) { - gtk_widget_set_tooltip_markup(GTK_WIDGET(inputs[ix]),gettext(entries[ix].tooltip)); - } - - gtk_entry_set_width_chars(GTK_ENTRY(inputs[ix]),entries[ix].width); - gtk_widget_set_hexpand(inputs[ix],FALSE); - gtk_widget_set_vexpand(inputs[ix],FALSE); - - gtk_grid_attach(grid,inputs[ix],1,ix,entries[ix].width,1); - - } - - g_autofree gchar * filename = g_strdup_printf("%s/" G_STRINGIFY(PRODUCT_NAME) ".desktop",g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP)); - - // 1 = Shortcut filename - { - gtk_entry_set_text(GTK_ENTRY(inputs[1]),filename); - gtk_entry_bind_to_filechooser( - inputs[1], - GTK_FILE_CHOOSER_ACTION_SAVE, - _("Save to shortcut file"), - NULL, - "*.desktop", - _("Standard desktop files") + GtkWidget * dialog = + gtk_message_dialog_new( + GTK_WINDOW(gtk_widget_get_toplevel(terminal)), + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("This action is not available in this platform") ); - } - - // 2 = Session name - { - gchar * session_name = g_strdup(v3270_get_session_name(terminal)); - gchar * ptr = strchr(session_name,':'); - if(ptr) - *ptr = 0; - - if(strcmp(session_name,G_STRINGIFY(PRODUCT_NAME))) - gtk_entry_set_text(GTK_ENTRY(inputs[2]),session_name); - - } - - // 3 = Session filename - { - g_autofree gchar * session_filename = v3270_key_file_build_filename(terminal); - gtk_entry_set_text(GTK_ENTRY(inputs[3]),session_filename); - - gtk_entry_bind_to_filechooser( - inputs[3], - GTK_FILE_CHOOSER_ACTION_SAVE, - _("Save to session filename"), - NULL, - "*.3270", - _("3270 session files") - ); + g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL); + g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL); - } - - // 4 = Generic name - gtk_entry_set_placeholder_text(GTK_ENTRY(inputs[4]),v3270_get_url(terminal)); - gtk_entry_set_text(GTK_ENTRY(inputs[4]),v3270_get_url(terminal)); - gtk_entry_set_input_hints(GTK_ENTRY(inputs[4]),GTK_INPUT_HINT_SPELLCHECK); - - gtk_widget_show_all(GTK_WIDGET(grid)); return dialog; } static void apply(GtkWidget *dialog, GtkWidget *terminal) { - GError * error = NULL; - size_t ix; - - static const char * key_file_data = - "[Desktop Entry]\n" \ - "Icon=" G_STRINGIFY(PRODUCT_NAME) "\n" \ - "Terminal=false\n" \ - "Type=Application\n" \ - "StartupNotify=true\n" \ - "Categories=GTK;GNOME;TerminalEmulator\n" \ - "OnlyShowIn=GNOME;Unity\n"; - - GKeyFile * keyfile = g_key_file_new(); - g_key_file_load_from_data(keyfile,key_file_data,-1,G_KEY_FILE_NONE,NULL); - -#ifdef DEBUG - { - g_autofree gchar * dbg_data = g_key_file_to_data(keyfile,NULL,NULL); - debug("\n%s\n",dbg_data); - } -#endif // DEBUG - - - GtkWidget ** inputs = g_object_get_data(G_OBJECT(dialog),"inputs"); - debug("dialog=%p inputs=%p",dialog,inputs); - - for(ix = 0; ix < G_N_ELEMENTS(entries); ix++) { - if(entries[ix].key) { - debug("inputs[%u]=%p",(unsigned int) ix, inputs[ix]); - g_key_file_set_string(keyfile,"Desktop Entry",entries[ix].key,gtk_entry_get_text(GTK_ENTRY(inputs[ix]))); - } - } - - // Save keyfile - v3270_key_file_save_to_file( - terminal, - gtk_entry_get_text(GTK_ENTRY(inputs[3])), - &error - ); - - // Get program file name - // https://stackoverflow.com/questions/4517425/how-to-get-program-path - if(!error) { - char buffer[4096]; - g_autofree gchar * pidfile = g_strdup_printf("/proc/%d/exe", getpid()); - - int bytes = readlink(pidfile,buffer,4095); - - if(bytes >= 0) - buffer[bytes] = '\0'; - - g_autofree gchar * exec_line = - g_strconcat( - buffer, - " \"",gtk_entry_get_text(GTK_ENTRY(inputs[3])),"\"", - NULL - ); - - g_key_file_set_string(keyfile,"Desktop Entry","Exec",exec_line); - - } - - // Save shortcut - g_key_file_save_to_file(keyfile,gtk_entry_get_text(GTK_ENTRY(inputs[1])),&error); - - g_key_file_free(keyfile); - - if(error) { - - g_message("%s",error->message); - g_error_free(error); - - } else { - - // Set session name (after save to avoid changes on the old session file). - v3270_set_session_name(terminal,gtk_entry_get_text(GTK_ENTRY(inputs[2]))); - v3270_emit_save_settings(terminal,NULL); - - } - -} - -void response(GtkWidget *dialog, gint response_id, GtkWidget *terminal) { - - debug("%s(%d)",__FUNCTION__,response_id); - - gtk_widget_hide(dialog); - if(response_id == GTK_RESPONSE_APPLY) { - apply(dialog,terminal); - } - - gtk_widget_destroy(dialog); - } - diff --git a/src/objects/os/windows/savedesktopicon.c b/src/objects/os/windows/savedesktopicon.c index bfe4f21..e016cae 100644 --- a/src/objects/os/windows/savedesktopicon.c +++ b/src/objects/os/windows/savedesktopicon.c @@ -98,7 +98,7 @@ static const struct _entry { }; -GAction * pw3270_action_save_desktop_icon_new(void) { +GAction * pw3270_action_save_session_shortcut_new(void) { V3270SimpleAction * action = v3270_dialog_action_new(factory); diff --git a/src/objects/window/private.h b/src/objects/window/private.h index 47e0395..18dfbd8 100644 --- a/src/objects/window/private.h +++ b/src/objects/window/private.h @@ -91,7 +91,7 @@ G_GNUC_INTERNAL GAction * pw3270_file_transfer_action_new(void); G_GNUC_INTERNAL GAction * pw3270_action_window_close_new(void); G_GNUC_INTERNAL GAction * pw3270_action_connect_new(void); G_GNUC_INTERNAL GAction * pw3270_action_save_session_preferences_new(void); -G_GNUC_INTERNAL GAction * pw3270_action_save_desktop_icon_new(void); +G_GNUC_INTERNAL GAction * pw3270_action_save_session_shortcut_new(void); GAction * pw3270_action_session_properties_new(void); diff --git a/src/objects/window/window.c b/src/objects/window/window.c index d5e3b5a..86ec3ad 100644 --- a/src/objects/window/window.c +++ b/src/objects/window/window.c @@ -501,22 +501,18 @@ static void pw3270ApplicationWindow_init(pw3270ApplicationWindow *widget) { size_t ix; GAction * actions[] = { -// pw3270_action_host_properties_new(), pw3270_action_session_properties_new(), -// pw3270_set_color_action_new(), - pw3270_action_save_session_preferences_new(), - pw3270_file_transfer_action_new(), - pw3270_action_window_close_new(), - pw3270_action_connect_new(), v3270_pfkey_action_new(), v3270_pakey_action_new(), - pw3270_action_save_desktop_icon_new(), +#ifndef __APPLE__ + pw3270_action_save_session_shortcut_new(), +#endif // __APPLE__ }; @@ -535,10 +531,12 @@ static void pw3270ApplicationWindow_init(pw3270ApplicationWindow *widget) { // // Bind properties // +#ifndef __APPLE__ g_action_map_add_action( G_ACTION_MAP(widget), G_ACTION(g_property_action_new("menubar", widget, "show-menubar")) ); +#endif // !__APPLE__ g_settings_bind( settings, @@ -640,15 +638,19 @@ GtkWidget * pw3270_application_window_new(GtkApplication * application, const gc #endif // DEBUG if(style == PW3270_UI_STYLE_AUTOMATIC) { - -#ifdef G_OS_UNIX +#if defined(__APPLE__) + style = PW3270_UI_STYLE_GNOME; + g_settings_set_int(settings,"header-icon-type",1); +#elif defined( G_OS_UNIX ) style = PW3270_UI_STYLE_GNOME; g_settings_set_boolean(settings,"menubar-visible",FALSE); g_settings_set_int(settings,"header-icon-type",1); -#else +#elif defined( G_OS_WIN32 ) style = PW3270_UI_STYLE_CLASSICAL; g_settings_set_boolean(settings,"menubar-visible",TRUE); g_settings_set_int(settings,"header-icon-type",0); +#else + #error Unsupported platform #endif // G_OS_UNIX g_settings_set_boolean(settings,"toolbar-visible",TRUE); @@ -692,6 +694,7 @@ GtkWidget * pw3270_application_window_new(GtkApplication * application, const gc } +#ifndef __APPLE__ g_settings_bind( settings, "menubar-visible", @@ -699,6 +702,7 @@ GtkWidget * pw3270_application_window_new(GtkApplication * application, const gc "show-menubar", G_SETTINGS_BIND_DEFAULT ); +#endif // !__APPLE__ } -- libgit2 0.21.2