[oe-commits] org.oe.dev matchbox-keyboard_svn: fix compilation issues due to oudated patches (fixes bug #2796)
philippe commit
openembedded-commits at lists.openembedded.org
Fri Aug 17 15:56:43 UTC 2007
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
Author: philippe at openembedded.org
Branch: org.openembedded.dev
Revision: 6872bbed00f51ddc9c28ab65dae421c4b6751524
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6872bbed00f51ddc9c28ab65dae421c4b6751524
Files:
1
packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch
packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch
packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch
Diffs:
#
# mt diff -r2bb12a87a16d491343922ea72e25180e165a9b13 -r6872bbed00f51ddc9c28ab65dae421c4b6751524
#
#
#
# patch "packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch"
# from [d37f4c2f59e428172f8a70481172f2c8813790b4]
# to [abb667bd8d124acc351a36f00c0d452e094e105d]
#
# patch "packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch"
# from [f1007f312f166afc1af40a84f7d2cee5f1e5e9d2]
# to [9f4820b13f07c71e14826caa39826628e064679c]
#
# patch "packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch"
# from [caf942b51b36963448104e736cae985e67435a8c]
# to [edcdbeb783f5016e7bde8344932aaa73ac22e0b9]
#
============================================================
--- packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch d37f4c2f59e428172f8a70481172f2c8813790b4
+++ packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch abb667bd8d124acc351a36f00c0d452e094e105d
@@ -71,15 +71,15 @@ diff -r 96305d94eb31 -r ff9cf1fd8177 src
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);
============================================================
--- packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch f1007f312f166afc1af40a84f7d2cee5f1e5e9d2
+++ packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch 9f4820b13f07c71e14826caa39826628e064679c
@@ -43,52 +43,51 @@ diff -r ff9cf1fd8177 -r b010d54a6c50 src
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 <percent> 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 <portrait|landscape>\n"
+- " Use to limit visibility with screen orientation \n");
++ " Use to limit visibility with screen orientation \n"
++ " -h,--hfactor <percent>\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;
-
============================================================
--- packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch caf942b51b36963448104e736cae985e67435a8c
+++ packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch edcdbeb783f5016e7bde8344932aaa73ac22e0b9
@@ -44,14 +44,14 @@ diff -r b010d54a6c50 -r 38c3459f2e1a src
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
More information about the Openembedded-commits
mailing list