From 0751b3f98534e4ad61cf0aabd1cd7f8bda2a0ad8 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Fri, 31 Dec 2004 00:52:49 +0000 Subject: [PATCH] preview is working again! --- capplets/keyboard/ChangeLog | 6 ++ .../keyboard/gnome-keyboard-properties-xkb.h | 2 + .../gnome-keyboard-properties-xkblt.c | 94 ++++++++++++++++++- .../gnome-keyboard-properties-xkbpv.c | 32 ++++--- 4 files changed, 121 insertions(+), 13 deletions(-) diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index e2bc6c831..5b47ffa40 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2004-12-31 Sergey V. Udaltsov + + * gnome-keyboard-properties-xkb.h, + gnome-keyboard-properties-xkblt.c + gnome-keyboard-properties-xkbpv.c: preview reimplemented! Hurray! + 2004-12-23 Sergey V. Udaltsov * use_cases.txt: just some memo (mostly for myself) regarding the diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.h b/capplets/keyboard/gnome-keyboard-properties-xkb.h index 976d39ab2..061743112 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkb.h +++ b/capplets/keyboard/gnome-keyboard-properties-xkb.h @@ -92,5 +92,7 @@ extern void xkb_layouts_enable_disable_default (GladeXML * dialog, GSWITCHIT_KBD_CONFIG_KEY_OPTIONS, \ GCONF_VALUE_STRING, (list), NULL) +extern GtkWidget * create_preview_widget (GladeXML * dialog); + G_END_DECLS #endif /* __GNOME_KEYBOARD_PROPERTY_XKB_H */ diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c index 871249245..3fcbdeb68 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c @@ -38,6 +38,7 @@ #include <../accessibility/keyboard/accessibility-keyboard.h> #include "gnome-keyboard-properties-xkb.h" +#include "libkbdraw/keyboard-drawing.h" #define GROUP_SWITCHERS_GROUP "grp" #define DEFAULT_GROUP_SWITCH "grp:alts_toggle" @@ -51,6 +52,17 @@ #define CWID(s) glade_xml_get_widget (chooserDialog, s) +#ifdef HAVE_X11_EXTENSIONS_XKB_H +#include "X11/XKBlib.h" +/** + * BAD STYLE: Taken from xklavier_private_xkb.h + * Any ideas on architectural improvements are WELCOME + */ +extern Bool _XklXkbConfigPrepareNative( const XklConfigRecPtr data, XkbComponentNamesPtr componentNamesPtr ); +extern void _XklXkbConfigCleanupNative( XkbComponentNamesPtr componentNamesPtr ); +/* */ +#endif + static GtkTreeIter current1stLevelIter; static const char *current1stLevelId; @@ -61,6 +73,8 @@ static int defaultGroup = -1; static GtkCellRenderer *textRenderer; static GtkCellRenderer *toggleRenderer; +static GtkWidget* kbdraw; + void clear_xkb_elements_list (GSList * list) { @@ -292,6 +306,66 @@ xkb_layouts_prepare_selected_tree (GladeXML * dialog, GConfChangeSet * changeset G_CALLBACK (def_group_in_ui_changed), dialog); } +static void +xkb_layout_chooser_selection_changed (GladeXML * chooserDialog) +{ +#ifdef HAVE_X11_EXTENSIONS_XKB_H + GtkWidget *availableLayoutsTree = CWID ("xkb_layouts_available"); + GtkTreeSelection *selection = + gtk_tree_view_get_selection (GTK_TREE_VIEW (availableLayoutsTree)); + GtkTreeIter selectedIter; + GtkTreeModel *model; + if (kbdraw != NULL && + gtk_tree_selection_get_selected (selection, &model, &selectedIter)) + { + gchar *id; + XklConfigRec data; + char **p, *layout, *variant; + int i; + XkbComponentNamesRec componentNames; + + gtk_tree_model_get (model, &selectedIter, ALT_COL_ID, &id, -1); + XklConfigRecInit (&data); + if (XklConfigGetFromServer (&data)) + { + if( ( p = data.layouts ) != NULL ) + { + for( i = data.numLayouts; --i >= 0; ) + free( *p++ ); + } + + if( ( p = data.variants ) != NULL ) + { + for( i = data.numVariants; --i >= 0; ) + free( *p++ ); + } + data.numLayouts = + data.numVariants = 1; + data.layouts = realloc (data.layouts, sizeof (char*)); + data.variants = realloc (data.variants, sizeof (char*)); + if (GSwitchItKbdConfigSplitItems (id, &layout, &variant) + && variant != NULL) + { + data.layouts[0] = (layout == NULL) ? NULL : strdup (layout); + data.variants[0] = (variant == NULL) ? NULL : strdup (variant); + } else + { + data.layouts[0] = (id == NULL) ? NULL : strdup (id); + data.variants[0] = NULL; + } + if (_XklXkbConfigPrepareNative (&data, &componentNames)) + { + keyboard_drawing_set_keyboard (KEYBOARD_DRAWING (kbdraw), &componentNames); + + _XklXkbConfigCleanupNative( &componentNames ); + } + } + XklConfigRecDestroy (&data); + } +#endif + xkb_layout_chooser_enable_disable_buttons (chooserDialog); +} + void xkb_layouts_fill_selected_tree (GladeXML * dialog) { @@ -383,7 +457,7 @@ xkb_layouts_fill_available_tree (GladeXML * chooserDialog) sort_tree_content (treeView); g_signal_connect_swapped (G_OBJECT (selection), "changed", G_CALLBACK - (xkb_layout_chooser_enable_disable_buttons), chooserDialog); + (xkb_layout_chooser_selection_changed), chooserDialog); } static void @@ -554,14 +628,30 @@ xkb_layout_choose (GladeXML * dialog) { GladeXML* chooserDialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "xkb_layout_chooser", NULL); GtkWidget* chooser = CWID ( "xkb_layout_chooser"); + gtk_window_set_transient_for (GTK_WINDOW (chooser), GTK_WINDOW (WID ("keyboard_dialog"))); xkb_layouts_fill_available_tree (chooserDialog); - xkb_layout_chooser_enable_disable_buttons (chooserDialog); + xkb_layout_chooser_selection_changed (chooserDialog); +#ifdef HAVE_X11_EXTENSIONS_XKB_H + if (!strcmp (XklGetBackendName(), "XKB")) + { + kbdraw = create_preview_widget (dialog); + + gtk_container_add (GTK_CONTAINER (CWID ("vboxPreview")), kbdraw); + gtk_widget_show_all (kbdraw); + } else +#endif + { + gtk_widget_hide_all (CWID ("vboxPreview")); + } + g_signal_connect (G_OBJECT (chooser), "response", G_CALLBACK (xkb_layout_chooser_response), chooserDialog); gtk_dialog_run (GTK_DIALOG (chooser)); gtk_widget_destroy (chooser); + + kbdraw = NULL; } diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbpv.c b/capplets/keyboard/gnome-keyboard-properties-xkbpv.c index c1e11c6a5..ec32021c4 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbpv.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbpv.c @@ -37,19 +37,36 @@ static GtkWidget * previewWindow = NULL; static gint preview_origin_x = -1; static gint preview_origin_y = -1; -static gboolean click_on_X (GtkWidget *widget, - GdkEvent *event, - GladeXML *dialog) +static KeyboardDrawingGroupLevel groupsLevels[] = {{0,0},{0,1},{0,2},{0,3}}; +static KeyboardDrawingGroupLevel * pGroupsLevels[] = { +groupsLevels, groupsLevels+1, groupsLevels+2, groupsLevels+3 }; + +static gboolean +click_on_X (GtkWidget *widget, GdkEvent *event, GladeXML *dialog) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("enable_preview")), FALSE); /* stop processing! */ return TRUE; } +GtkWidget* +create_preview_widget (GladeXML * dialog) +{ + GtkWidget *kbdraw = keyboard_drawing_new (); + //keyboard_drawing_set_track_group (KEYBOARD_DRAWING (kbdraw), TRUE); + //keyboard_drawing_set_track_config (KEYBOARD_DRAWING (kbdraw), TRUE); + + /* show levels 1 and 2 - hoping that no more levels are used */ + + //keyboard_drawing_set_levels (KEYBOARD_DRAWING (kbdraw), 0, 1); + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + return kbdraw; +} + static void init_preview (GladeXML * dialog) { - GtkWidget *kbdraw = keyboard_drawing_new (); + GtkWidget *kbdraw = create_preview_widget (dialog); GtkWidget *capplet_dialog = glade_xml_get_widget(dialog, "keyboard_dialog"); previewWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -65,13 +82,6 @@ init_preview (GladeXML * dialog) gtk_window_set_title(GTK_WINDOW (previewWindow), _("Keyboard layout preview")); - keyboard_drawing_set_track_group (KEYBOARD_DRAWING (kbdraw), TRUE); - keyboard_drawing_set_track_config (KEYBOARD_DRAWING (kbdraw), TRUE); - - /* show levels 1 and 2 - hoping that no more levels are used */ - - keyboard_drawing_set_levels (KEYBOARD_DRAWING (kbdraw), 0, 1); - gtk_container_add (GTK_CONTAINER (previewWindow), kbdraw); g_signal_connect (G_OBJECT (previewWindow), "delete-event",