From dfafa94463e9c3e5afe61c78deb4decbabb0ad70 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Fri, 17 Aug 2007 15:44:54 +0000 Subject: matchbox-keyboard_svn: fix compilation issues due to oudated patches (fixes bug #2796) * updated 2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch * updated 3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch * updated 4-Add-rendering-debug-logging.patch --- ...-Used-to-cycle-thru-all-available-layouts.patch | 10 +-- ...ring--especially-after-adding-support-for.patch | 73 +++++++++++----------- .../files/4-Add-rendering-debug-logging.patch | 8 +-- 3 files changed, 45 insertions(+), 46 deletions(-) (limited to 'packages') diff --git a/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch b/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch index 2d05e5d652..8aae3a0203 100644 --- a/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch +++ b/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch @@ -71,15 +71,15 @@ diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard.c diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard.h --- a/src/matchbox-keyboard.h Sun Apr 08 23:28:43 2007 +0000 +++ b/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000 -@@ -148,6 +148,7 @@ struct MBKeyboard - +@@ -153,6 +153,7 @@ + char *config_file; List *layouts; MBKeyboardLayout *selected_layout; -+ int selected_layout_no; - ++ int selected_layout_no; int key_border, key_pad, key_margin; int row_spacing, col_spacing; -@@ -177,6 +178,9 @@ int + boolean extended; /* are we showing extended keys ? */ +@@ -179,6 +180,9 @@ int mb_kbd_ui_init(MBKeyboard *kbd); diff --git a/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch b/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch index 8513b6ed86..0a319e759e 100644 --- a/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch +++ b/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch @@ -43,52 +43,51 @@ diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard-ui.c layout = mb_kbd_get_selected_layout(ui->kbd); row_item = mb_kbd_layout_rows(layout); -diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.c ---- a/src/matchbox-keyboard.c Sun Apr 08 23:56:09 2007 +0000 -+++ b/src/matchbox-keyboard.c Mon Apr 09 00:06:34 2007 +0000 -@@ -23,8 +23,9 @@ mb_kbd_usage (char *progname) - mb_kbd_usage (char *progname) - { - fprintf(stderr, "Usage:\n %s [Options ] [ Layout Variant ]\n", progname); -- fprintf(stderr, "\nOptions are;\n" -- " -xid,--xid Print window ID to stdout ( for embedding )\n"); -+ fprintf(stderr, "\nOptions are:\n" -+ " -xid,--xid Print window ID to stdout ( for embedding )\n" -+ " --hfactor Fix keyboard window size in percentage of desktop height\n"); - fprintf(stderr, "\nmatchbox-keyboard %s \nCopyright (C) 2005 Matthew Allum, OpenedHand Ltd.\n", VERSION); +--- a/src/matchbox-keyboard.c 2007-08-17 17:09:05.240878162 +0300 ++++ b/src/matchbox-keyboard.c 2007-08-17 17:11:36.749512174 +0300 +@@ -27,7 +27,9 @@ + " -xid,--xid Print window ID to stdout ( for embedding )\n" + " -d,--daemon Run in 'daemon' mode (for remote control)\n" + " -o,--orientation \n" +- " Use to limit visibility with screen orientation \n"); ++ " Use to limit visibility with screen orientation \n" ++ " -h,--hfactor \n" ++ " Fix keyboard window size in percentage of desktop height\n"); + fprintf(stderr, "\nmatchbox-keyboard %s \nCopyright (C) 2007 OpenedHand Ltd.\n", VERSION); exit(-1); -@@ -58,6 +59,13 @@ mb_kbd_new (int argc, char **argv) - want_embedding = True; - continue; - } -+ if (streq ("-hfactor", argv[i]) || streq ("--hfactor", argv[i])) -+ { -+ if (i + 1 < argc) { -+ kb->hfactor = atoi(argv[i + 1]); -+ } -+ continue; -+ } +@@ -52,7 +53,7 @@ + kb->row_spacing = 5; - if (i == (argc-1) && argv[i][0] != '-') - variant = argv[i]; -@@ -77,7 +85,7 @@ mb_kbd_new (int argc, char **argv) - kb->key_pad = 0; - kb->col_spacing = 0; - kb->row_spacing = 0; -- kb->font_pt_size = 5; -+ kb->font_pt_size = 6; - } + kb->font_family = strdup("sans"); +- kb->font_pt_size = 5; ++ kb->font_pt_size = 6; + kb->font_variant = strdup("bold"); - if (!mb_kbd_config_load(kb, variant)) + for (i = 1; i < argc; i++) +@@ -63,6 +64,14 @@ + continue; + } + ++ if (streq ("-h", argv[i]) || streq ("--hfactor", argv[i])) ++ { ++ if (i + 1 < argc) { ++ kb->hfactor = atoi(argv[i + 1]); ++ } ++ continue; ++ } ++ + if (streq ("-d", argv[i]) || streq ("--daemon", argv[i])) + { + want_daemon = True; diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.h --- a/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000 +++ b/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000 -@@ -143,6 +143,7 @@ struct MBKeyboard +@@ -150,6 +150,7 @@ char *font_family; int font_pt_size; char *font_variant; + int hfactor; - char *config_file; - + List *layouts; + MBKeyboardLayout *selected_layout; diff --git a/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch b/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch index 7ce61e469c..509cd09404 100644 --- a/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch +++ b/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch @@ -44,14 +44,14 @@ diff -r b010d54a6c50 -r 38c3459f2e1a src/matchbox-keyboard-ui.c width_diff = width - ui->base_alloc_width; height_diff = height - ui->base_alloc_height; -@@ -1125,6 +1133,7 @@ mb_kbd_ui_event_loop(MBKeyboardUI *ui) +@@ -1178,6 +1178,7 @@ } break; case ConfigureNotify: + DBG("ConfigureNotify %i,%i", xev.xconfigure.width, xev.xconfigure.height); - if (xev.xconfigure.width != ui->xwin_width - || xev.xconfigure.height != ui->xwin_height) - mb_kbd_ui_handle_configure(ui, + if (xev.xconfigure.window == ui->xwin + && (xev.xconfigure.width != ui->xwin_width + || xev.xconfigure.height != ui->xwin_height)) diff -r b010d54a6c50 -r 38c3459f2e1a src/matchbox-keyboard.h --- a/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000 +++ b/src/matchbox-keyboard.h Mon Apr 09 00:08:07 2007 +0000 -- cgit v1.2.3