Hello community, here is the log from the commit of package xvkbd for openSUSE:Factory checked in at Mon Mar 1 01:51:31 CET 2010. -------- --- xvkbd/xvkbd.changes 2009-12-04 15:05:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/xvkbd/xvkbd.changes 2010-02-15 16:41:57.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 15 16:18:01 CET 2010 - dimstar@opensuse.org + +- Update to version 3.1: + + Changed the default setting for automatic click to OFF, which + was set ON in the previous release in error and caused + confusion. + + The keypad is now customizable, too (see XVkbd-strip.ad for the + example). + + Up to 25x25 keys can now be supported both for the main + keyboard and the keypad. + + Able to open the keypad panel when startup, by setting + `xvkbd.keypad: false' and `xvkbd.keypadOnly: true'. + + Fixed errors in some keyboard layout files (Korean, Slovene, + UK). + + A new sample layout file XVkbd-strip.ad. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xvkbd-3.0.tar.bz2 New: ---- xvkbd-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvkbd.spec ++++++ --- /var/tmp/diff_new_pack.Jw3RNL/_old 2010-03-01 01:51:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Jw3RNL/_new 2010-03-01 01:51:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xvkbd (Version 3.0) +# spec file for package xvkbd (Version 3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,8 @@ BuildRequires: xaw3d-devel %endif Summary: Virtual Keyboard for the X Window System -Version: 3.0 -Release: 30 +Version: 3.1 +Release: 1 License: GPLv2+ Group: System/X11/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xvkbd-3.0.tar.bz2 -> xvkbd-3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/Imakefile new/xvkbd-3.1/Imakefile --- old/xvkbd-3.0/Imakefile 2008-05-04 12:08:41.000000000 +0200 +++ new/xvkbd-3.1/Imakefile 2010-01-16 13:57:06.000000000 +0100 @@ -63,6 +63,7 @@ InstallAppDefaults(XVkbd-swissgerman) InstallAppDefaults(XVkbd-turkish) InstallAppDefaults(XVkbd-uk) +InstallAppDefaults(XVkbd-strip) XCOMM ============================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/README new/xvkbd-3.1/README --- old/xvkbd-3.0/README 2008-05-05 15:12:13.000000000 +0200 +++ new/xvkbd-3.1/README 2010-01-17 04:26:00.000000000 +0100 @@ -465,12 +465,12 @@ Download Latest Official Release - http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz - - source of version 3.0 (2008-05-05) + http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.1.tar.gz + - source of version 3.1 (2010-01-17) previous release - http://homepage3.nifty.com/tsato/xvkbd/xvkbd-2.9.tar.gz - - source of version 2.9 (2008-03-30) + http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz + - source of version 3.0 (2008-05-05) xvkbd is distributed under the terms of the GNU General Public License. @@ -625,8 +625,8 @@ (Shift, Control, Meta and Alt) respectively. If the first character of the assigned string is `!', the string will - be used as command to be executed when the key is clicked. String - starting with `!' can be assigned by putting `\' before `!'. + be used as command to be executed when the key is clicked. To assign + string starting with `!' or `\', put `\' before the string. The file is $HOME/.xvkbd in default, and it can be changed by setting the filename with xvkbd.keyFile resource. @@ -960,6 +960,24 @@ - Key-click sounds when key is pressed. + Version 3.1 (2010-01-17) + + - Changed the default setting for automatic click to OFF, which was + set ON in the previous release in error and caused confusion. + + - The keypad is now customizable, too (see XVkbd-strip.ad for the + example). + + - Up to 25x25 keys can now be supported both for the main keyboard + and the keypad. + + - Able to open the keypad panel when startup, by setting + `xvkbd.keypad: false' and `xvkbd.keypadOnly: true'. + + - Fixed errors in some keyboard layout files (Korean, Slovene, UK). + + - A new sample layout file XVkbd-strip.ad. + Author xvkbd was written by Tom Sato, and it is distributed under the terms of the GNU General Public License Version 2 or any later version. @@ -973,4 +991,4 @@ meat.net), and you can probably receive the announce via e-mail if you wish. - 2008-05-05 xvkbd(1) + 2010-01-17 xvkbd(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-common.ad new/xvkbd-3.1/XVkbd-common.ad --- old/xvkbd-3.0/XVkbd-common.ad 2008-05-05 14:26:15.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-common.ad 2010-01-17 01:49:46.000000000 +0100 @@ -280,9 +280,11 @@ !! keyboard layouts ! -XVkbd.customizations: default,belgian,danish,fitaly,french,french2,\ - german,greek,hebrew,icelandic,italian,jisx6002/ja,jisx6004/ja,korean/ko_KR.eucKR,\ - norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,swedish,swissgerman,turkish,uk,latin1 +XVkbd.customizations: default,belgian,danish,fitaly,\ + french,french2,german,greek,hebrew,icelandic,italian,\ + jisx6002/ja_JP.eucJP,jisx6004/ja_JP.eucJP,korean/ko_KR.eucKR,\ + norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,\ + swedish,swissgerman,turkish,uk,latin1,small,strip XVkbd*layout_panel*default.label: Default XVkbd*layout_panel*belgian.label: Belgian @@ -308,6 +310,8 @@ XVkbd*layout_panel*turkish.label: Turkish XVkbd*layout_panel*uk.label: United Kingdom XVkbd*layout_panel*latin1.label: Latin-1 +XVkbd*layout_panel*small.label: Small Keyboard +XVkbd*layout_panel*strip.label: Key Strip XVkbd*Iconify.width: 20 XVkbd*Iconify.shadowWidth: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-common.h new/xvkbd-3.1/XVkbd-common.h --- old/xvkbd-3.0/XVkbd-common.h 2008-05-05 14:27:30.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-common.h 2010-01-17 01:49:48.000000000 +0100 @@ -239,9 +239,11 @@ "XVkbd*deadkey_panel*dead_doubleacute.label: \\264\\264", "XVkbd*deadkey_panel*dead_tilde.label: ~", "XVkbd*deadkey_panel*dead_abovedot.label: \\267", -"XVkbd.customizations: default,belgian,danish,fitaly,french,french2,\ - german,greek,hebrew,icelandic,italian,jisx6002/ja,jisx6004/ja,korean/ko_KR.eucKR,\ - norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,swedish,swissgerman,turkish,uk,latin1", +"XVkbd.customizations: default,belgian,danish,fitaly,\ + french,french2,german,greek,hebrew,icelandic,italian,\ + jisx6002/ja_JP.eucJP,jisx6004/ja_JP.eucJP,korean/ko_KR.eucKR,\ + norwegian,portuguese,russian/ru_RU.KOI8-R,slovene,spanish,\ + swedish,swissgerman,turkish,uk,latin1,small,strip", "XVkbd*layout_panel*default.label: Default", "XVkbd*layout_panel*belgian.label: Belgian", "XVkbd*layout_panel*danish.label: Danish", @@ -266,6 +268,8 @@ "XVkbd*layout_panel*turkish.label: Turkish", "XVkbd*layout_panel*uk.label: United Kingdom", "XVkbd*layout_panel*latin1.label: Latin-1", +"XVkbd*layout_panel*small.label: Small Keyboard", +"XVkbd*layout_panel*strip.label: Key Strip", "XVkbd*Iconify.width: 20", "XVkbd*Iconify.shadowWidth: 0", "XVkbd*Iconify.resizable: false", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-fitaly.ad new/xvkbd-3.1/XVkbd-fitaly.ad --- old/xvkbd-3.0/XVkbd-fitaly.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-fitaly.ad 2010-01-17 01:50:19.000000000 +0100 @@ -9,6 +9,7 @@ xvkbd.title: xvkbd - Virtual Keyboard ("Fitaly" Style) +xvkbd.inheritGeoemetry: false xvkbd.compact: true xvkbd.form*Repeater.shadowWidth: 1 xvkbd.form*Command.shadowWidth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-korean.ad new/xvkbd-3.1/XVkbd-korean.ad --- old/xvkbd-3.0/XVkbd-korean.ad 2004-05-04 05:56:07.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-korean.ad 2009-12-17 12:42:12.000000000 +0100 @@ -67,7 +67,7 @@ Tab q w e r t y u i o p [ ] Delete \n\ Caps_Lock a s d f g h j k l ; ' Return \n\ Shift_L z x c v b n m , . / Shift_R \n\ - MainMenu Constrol_L Alt_L Meta_L space Mode_switch Left Right Up Down Focus + MainMenu Control_L Alt_L Meta_L space Mode_switch Left Right Up Down Focus xvkbd.KeyLabels: \ Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 \n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-slovene.ad new/xvkbd-3.1/XVkbd-slovene.ad --- old/xvkbd-3.0/XVkbd-slovene.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-slovene.ad 2009-12-17 12:42:12.000000000 +0100 @@ -35,7 +35,7 @@ xvkbd.AltgrKeys: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 BackSpace \n\ Escape ~ 2 ^ 4 5 6 7 8 9 0 ' + cedilla currency \n\ - Tab \\ | e r t z u i o p division multiply Delele \n\ + Tab \\ | e r t z u i o p division multiply Delete \n\ Control_L a s d f g h j lstroke Lstroke ccaron ssharp Return \n\ Shift_L < y x c @ { } section , . - Multi_key Shift_R \n\ MainMenu Caps_Lock Alt_L Meta_L space Mode_switch Left Right Up Down Focus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-small.ad new/xvkbd-3.1/XVkbd-small.ad --- old/xvkbd-3.0/XVkbd-small.ad 2006-09-08 15:39:43.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-small.ad 2010-01-17 01:49:01.000000000 +0100 @@ -10,6 +10,7 @@ !! Please note that you must take account of size of the window border !! when you want set window position from right/bottom of the screen. ! +xvkbd.inheritGeoemetry: false xvkbd.windowGeometry: 220x85-5-25 xvkbd.keypad_panel.geometry: 100x100 xvkbd.sun_fkey_panel.geometry: 70x120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-strip.ad new/xvkbd-3.1/XVkbd-strip.ad --- old/xvkbd-3.0/XVkbd-strip.ad 1970-01-01 01:00:00.000000000 +0100 +++ new/xvkbd-3.1/XVkbd-strip.ad 2010-01-17 03:19:19.000000000 +0100 @@ -0,0 +1,232 @@ +!! XVkbd-strip.ad - sample app-defaults file for xvkbd +!! by Tom Sato <VEF00200@nifty.ne.jp>, http://homepage3.nifty.com/tsato/ +!! +!! Last update: 2010-01-16 + +#include "XVkbd-common" + +! Make the virtual keyboard support most Latin-1 characters +! +xvkbd.title: xvkbd - Virtual Keyboard + +xvkbd.inheritGeoemetry: false +xvkbd.modalKeytop: true +xvkbd.keypad: false +xvkbd.keypadOnly: true +xvkbd.geometry: +0-0 +xvkbd.keypad_panel.geometry: -0-0 +xvkbd*keypad.vertDistance: 0 +xvkbd*keypad.horizDistance: 0 + +xvkbd*banner.width: 1 +xvkbd*banner.height: 1 +xvkbd.form*Command.width: 27 +xvkbd.form*Command.height: 22 +xvkbd.form*Repeater.width: 27 +xvkbd.form*Repeater.height: 22 +xvkbd.form*Return.width: 54 +xvkbd.form*MainMenu.width: 27 +xvkbd.form*Control_L.width: 18 +xvkbd.form*Shift_L.width: 18 +xvkbd.form*Mode_switch.width: 18 +xvkbd.keypad_panel*Repeater.width: 27 +xvkbd.keypad_panel*Repeater.height: 22 +xvkbd*Command.horizDistance: 0 +xvkbd*Repeater.horizDistance: 0 +xvkbd*Command.justify: center +xvkbd*Repeater.justify: center +xvkbd*Command.justify: center +xvkbd*Repeater.justify: center +xvkbd*vertDistance: 0 + +xvkbd*Focus.bitmap: /usr/include/X11/bitmaps/target + +xvkbd.NormalKeys: \ + a n \n\ + b o \n\ + c p \n\ + d q \n\ + e r \n\ + f s \n\ + g t \n\ + h u \n\ + i v \n\ + j w \n\ + k x \n\ + l y \n\ + m z \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.ShiftKeys: \ + A N \n\ + B O \n\ + C P \n\ + D Q \n\ + E R \n\ + F S \n\ + G T \n\ + H U \n\ + I V \n\ + J W \n\ + K X \n\ + L Y \n\ + M Z \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.NormalKeyLabels: \ + a n \n\ + b o \n\ + c p \n\ + d q \n\ + e r \n\ + f s \n\ + g t \n\ + h u \n\ + i v \n\ + j w \n\ + k x \n\ + l y \n\ + m z \n\ + space BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.ShiftKeyLabels: \ + A N \n\ + B O \n\ + C P \n\ + D Q \n\ + E R \n\ + F S \n\ + G T \n\ + H U \n\ + I V \n\ + J W \n\ + K X \n\ + L Y \n\ + M Z \n\ + space BS \n\ + Return \n\ + Ctrl Shift AltGr \n\ + Focus MainMenu + +xvkbd.AltgrKeys: \ + , . \n\ + ; : \n\ + ! ? \n\ + ( ) \n\ + { } \n\ + [ ] \n\ + < > \n\ + # $ \n\ + % ^ \n\ + & @ \n\ + _ ~ \n\ + | = \n\ + ' " \n\ + \\ BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.AltgrKeyLabels: \ + , . \n\ + ; : \n\ + ! ? \n\ + ( ) \n\ + { } \n\ + [ ] \n\ + < > \n\ + # $ \n\ + % ^ \n\ + & @ \n\ + _ ~ \n\ + | = \n\ + ' " \n\ + \\ BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.ShiftAltgrKeys: \ + Escape Tab \n\ + + - \n\ + * / \n\ + 0 5 \n\ + 1 6 \n\ + 2 7 \n\ + 3 8 \n\ + 4 9 \n\ + . , \n\ + Left Right \n\ + Up Down \n\ + F1 F4 \n\ + F2 F5 \n\ + space BackSpace \n\ + Return \n\ + Control_L Shift_L Mode_switch \n\ + Focus MainMenu + +xvkbd.ShiftAltgrKeyLabels: \ + Esc Tab \n\ + + - \n\ + * / \n\ + 0 5 \n\ + 1 6 \n\ + 2 7 \n\ + 3 8 \n\ + 4 9 \n\ + . , \n\ + left right \n\ + up down \n\ + F1 F4 \n\ + F2 F5 \n\ + space BS \n\ + Return \n\ + Ct Sh Ag \n\ + Focus MainMenu + +xvkbd.KeypadLabels: \ + Esc Tab \n\ + + - \n\ + * / \n\ + 0 F1 \n\ + 1 F2 \n\ + 2 F3 \n\ + 3 F4 \n\ + 4 F5 \n\ + 5 F6 \n\ + 6 F7 \n\ + 7 F8 \n\ + 8 F9 \n\ + 9 F10 \n\ + . Ent \n\ + left right \n\ + up down \n\ + Del Ins + +xvkbd.NormalKeypad: \ + Escape Tab \n\ + KP_Add KP_Subtract \n\ + KP_Multiply KP_Divide \n\ + KP_0 F1 \n\ + KP_1 F2 \n\ + KP_2 F3 \n\ + KP_3 F4 \n\ + KP_4 F5 \n\ + KP_5 F6 \n\ + KP_6 F7 \n\ + KP_7 F8 \n\ + KP_8 F9 \n\ + KP_9 F10 \n\ + . Enter \n\ + Left Right \n\ + Up Down \n\ + Delete Insert diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/XVkbd-uk.ad new/xvkbd-3.1/XVkbd-uk.ad --- old/xvkbd-3.0/XVkbd-uk.ad 2004-05-04 05:53:17.000000000 +0200 +++ new/xvkbd-3.1/XVkbd-uk.ad 2009-12-17 12:42:12.000000000 +0100 @@ -23,7 +23,7 @@ xvkbd.ShiftKeys: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 BackSpace \n\ - Escape ! " � $ % ^ & = ( ) _ + � ~ \n\ + Escape ! " � $ % ^ & * ( ) _ + � ~ \n\ Tab Q W E R T Y U I O P { } Delete \n\ Control_L A S D F G H J K L : @ Return \n\ Shift_L | Z X C V B N M < > ? Multi_key Shift_R \n\ @@ -31,7 +31,7 @@ xvkbd.KeyLabels: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Backspace \n\ - Esc !\n1 "\n2 �\n3 $\n4 %\n5 ^\n6 &\n7 =\n8 (\n9 )\n0 _\n- +\n= �\n` ~\n# \n\ + Esc !\n1 "\n2 �\n3 $\n4 %\n5 ^\n6 &\n7 *\n8 (\n9 )\n0 _\n- +\n= �\n` ~\n# \n\ Tab Q W E R T Y U I O P {\n[ }\n] Del \n\ Control A S D F G H J K L :\n; @\n' Return \n\ Shift |\n\\ Z X C V B N M <\n, >\n. ?\n/ Com\npose Shift \n\ @@ -47,7 +47,7 @@ xvkbd.ShiftKeyLabels: \ F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Backspace \n\ - Esc ! " � $ % ^ & = ( ) _ + � ~ \n\ + Esc ! " � $ % ^ & * ( ) _ + � ~ \n\ Tab Q W E R T Y U I O P { } Del \n\ Ctrl A S D F G H J K L : @ Return \n\ Shift | Z X C V B N M < > ? Comp Shift \n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/resources.h new/xvkbd-3.1/resources.h --- old/xvkbd-3.0/resources.h 2008-05-05 12:22:15.000000000 +0200 +++ new/xvkbd-3.1/resources.h 2010-01-17 01:39:37.000000000 +0100 @@ -24,6 +24,7 @@ String show_manual_command; String geometry; + Boolean inherit_geometry; Boolean debug; Boolean xtest; Boolean no_sync; @@ -80,6 +81,11 @@ String shift_key_labels; String altgr_key_labels; String shift_altgr_key_labels; + + String keypad_normal; + String keypad_shift; + String keypad_labels; + String deadkeys; int altgr_keycode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/xvkbd.c new/xvkbd-3.1/xvkbd.c --- old/xvkbd-3.0/xvkbd.c 2008-05-05 15:03:41.000000000 +0200 +++ new/xvkbd-3.1/xvkbd.c 2010-01-17 04:02:34.000000000 +0100 @@ -1,8 +1,8 @@ /* * xvkbd - Virtual Keyboard for X Window System - * (Version 3.0, 2008-05-05) + * (Version 3.1, 2010-01-17) * - * Copyright (C) 2000-2008 by Tom Sato <VEF00200@nifty.ne.jp> + * Copyright (C) 2000-2010 by Tom Sato <VEF00200@nifty.ne.jp> * http://homepage3.nifty.com/tsato/ * * This program is free software; you can redistribute it and/or @@ -54,14 +54,14 @@ #endif #include "resources.h" -#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.0)" +#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.1)" /* * Default keyboard layout is hardcoded here. * Layout of the main keyboard can be redefined by resources. */ -#define NUM_KEY_ROWS 6 -#define NUM_KEY_COLS 20 +#define NUM_KEY_ROWS 25 +#define NUM_KEY_COLS 25 static char *keys_normal[NUM_KEY_ROWS][NUM_KEY_COLS] = { { "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "BackSpace" }, @@ -116,8 +116,8 @@ static char *shift_altgr_key_labels[NUM_KEY_ROWS][NUM_KEY_COLS] = { { NULL } }; -#define NUM_KEYPAD_ROWS 5 -#define NUM_KEYPAD_COLS 5 +#define NUM_KEYPAD_ROWS NUM_KEY_ROWS +#define NUM_KEYPAD_COLS NUM_KEY_COLS static char *keypad[NUM_KEYPAD_ROWS][NUM_KEYPAD_COLS] = { { "Num_Lock", "KP_Divide", "KP_Multiply", "Focus" }, @@ -213,7 +213,7 @@ { "description", "Description", XtRString, sizeof(char *), Offset(description), XtRImmediate, PROGRAM_NAME_WITH_VERSION " - virtual keyboard for X window system\n\n" - "Copyright (C) 2000-2008 by Tom Sato <VEF00200@nifty.ne.jp>\n" + "Copyright (C) 2000-2010 by Tom Sato <VEF00200@nifty.ne.jp>\n" "http://homepage3.nifty.com/tsato/\n\n" "This program is free software with ABSOLUTELY NO WARRANTY,\n" "distributed under the terms of the GNU General Public License.\n" }, @@ -222,6 +222,8 @@ { "windowGeometry", "Geometry", XtRString, sizeof(char *), Offset(geometry), XtRImmediate, "" }, + { "inheritGeoemetry", "Inherit", XtRBoolean, sizeof(Boolean), + Offset(inherit_geometry), XtRImmediate, (XtPointer)TRUE }, { "debug", "Debug", XtRBoolean, sizeof(Boolean), Offset(debug), XtRImmediate, (XtPointer)FALSE }, #ifdef USE_XTEST @@ -338,6 +340,14 @@ Offset(altgr_key_labels), XtRImmediate, "" }, { "shiftaltgrkeylabels", "ShiftAltgrKeyLabels", XtRString, sizeof(char *), Offset(shift_altgr_key_labels), XtRImmediate, "" }, + + { "normalkeypad", "NormalKeypad", XtRString, sizeof(char *), + Offset(keypad_normal), XtRImmediate, "" }, + { "shiftkeypad", "ShiftKeypad", XtRString, sizeof(char *), + Offset(keypad_shift), XtRImmediate, "" }, + { "keypad_labels", "KeypadLabels", XtRString, sizeof(char *), + Offset(keypad_labels), XtRImmediate, "" }, + { "deadkeys", "DeadKeys", XtRString, sizeof(char *), Offset(deadkeys), XtRImmediate, "" }, { "altgrKeycode", "AltgrKeycode", XtRInt, sizeof(int), @@ -364,7 +374,7 @@ { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(int), Offset(key_click_duration), XtRImmediate, (XtPointer)1 }, { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(int), - Offset(autoclick_delay), XtRImmediate, (XtPointer)500 }, + Offset(autoclick_delay), XtRImmediate, (XtPointer)0 }, }; #undef Offset @@ -1701,11 +1711,16 @@ for (i = 1; i < argc1; i++) { if (strncmp(argv1[i], "-geom", strlen("-geom")) == 0) { - argv1[i + 1] = GetWindowGeometry(toplevel); + if (appres.inherit_geometry) { + argv1[i + 1] = GetWindowGeometry(toplevel); + } else if (i + 2 == argc1) { + argv1[i] = NULL; + argc1 = i; + } break; } } - if (i == argc1) { + if (i == argc1 && appres.inherit_geometry) { argv1[argc1++] = "-geometry"; argv1[argc1++] = GetWindowGeometry(toplevel); argv1[argc1] = NULL; @@ -2131,6 +2146,14 @@ } } +void SignalUser1(void) +{ + XWindowAttributes attr; + XGetWindowAttributes(dpy, XtWindow(toplevel), &attr); + IconifyWindow(None, attr.map_state != IsUnmapped); + XSync(dpy, FALSE); +} + /* * This will be called when user pressed a key on the screen. */ @@ -2360,9 +2383,11 @@ char *s = XtNewString(spec); char *cp; int row, col; + int key_rows = NUM_KEY_ROWS; + int key_cols = NUM_KEY_COLS; - for (row = 0; row < NUM_KEY_ROWS; row++) { - for (col = 0; col < NUM_KEY_COLS; col++) array[row][col] = NULL; + for (row = 0; row < key_rows; row++) { + for (col = 0; col < key_cols; col++) array[row][col] = NULL; } row = 0; col = 0; @@ -2374,10 +2399,10 @@ cp = cp + 1; } if (*cp != '\0') { - if (NUM_KEY_ROWS <= row) { + if (key_rows <= row) { fprintf(stderr, "%s: too many key rows: \"%s\" ignored\n", PROGRAM_NAME, cp); - } else if (NUM_KEY_COLS <= col) { + } else if (key_cols <= col) { fprintf(stderr, "%s: too many keys in a row: \"%s\" ignored\n", PROGRAM_NAME, cp); } else { @@ -2622,8 +2647,11 @@ first_row = appres.function_key ? 0 : 1; if (!appres.keypad_only) { for (row = first_row; row < NUM_KEY_ROWS; row++) { + if (keys_normal[row][0] == NULL) continue; + sprintf(name, "row%d", row); key_box[row] = XtVaCreateManagedWidget(name, formWidgetClass, form, NULL); + key_box[row + 1] = None; if (row != first_row) XtVaSetValues(key_box[row], XtNfromVert, key_box[row - 1], NULL); else if (!appres.function_key) @@ -2698,7 +2726,7 @@ } } - if (appres.keypad) MakeKeypad(form, key_box[0], key_box[1]); + if (appres.keypad) MakeKeypad(form, key_box[0], key_box[1]); if (!appres.keypad_only && appres.function_key && appres.keypad) { XtVaCreateManagedWidget("banner", labelWidgetClass, form, @@ -2733,12 +2761,12 @@ XtVaGetValues(key_box[1], XtNwidth, &max_wd, NULL); } else { max_wd = 0; - for (row = first_row; row < NUM_KEY_ROWS; row++) { + for (row = first_row; row < NUM_KEY_ROWS && key_box[row] != None; row++) { XtVaGetValues(key_box[row], XtNwidth, &wd, NULL); if (max_wd < wd) max_wd = wd; } } - for (row = first_row; row < NUM_KEY_ROWS; row++) { + for (row = first_row; row < NUM_KEY_ROWS && key_box[row] != None; row++) { XtVaSetValues(key_box[row], XtNwidth, max_wd, NULL); } } @@ -3270,6 +3298,7 @@ NULL, }; + Boolean open_keypad_panel = FALSE; char ch; Window child; int op, ev, err; @@ -3305,7 +3334,7 @@ } if (appres.keypad_only && !appres.keypad) { appres.keypad_only = FALSE; - fprintf(stderr, "%s: warning: keypad_only ignored\n", PROGRAM_NAME); + open_keypad_panel = TRUE; } if (appres.no_sync) { @@ -3368,6 +3397,16 @@ if (0 < strlen(appres.shift_altgr_key_labels)) RedefineKeys(shift_altgr_key_labels, appres.shift_altgr_key_labels); + if (0 < strlen(appres.keypad_normal)) { + RedefineKeys(keypad, appres.keypad_normal); + RedefineKeys(keypad_shift, appres.keypad_normal); + RedefineKeys(keypad_label, appres.keypad_normal); + } + if (0 < strlen(appres.keypad_shift)) + RedefineKeys(keypad_shift, appres.keypad_shift); + if (0 < strlen(appres.keypad_labels)) + RedefineKeys(keypad_label, appres.keypad_labels); + MakeKeyboard(FALSE); if (focused_window != None && @@ -3419,8 +3458,22 @@ #endif } + { +#ifdef SYSV + signal(SIGUSR1, SignalUser1); +#else + struct sigaction sigact; + sigact.sa_handler = SignalUser1; + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = 0; + sigaction(SIGUSR1, &sigact, NULL); +#endif + } + SetIconBitmap(toplevel); + if (open_keypad_panel) MenuSelected(None, "keypad"); + XtAppMainLoop(app_con); } exit(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xvkbd-3.0/xvkbd.man new/xvkbd-3.1/xvkbd.man --- old/xvkbd-3.0/xvkbd.man 2008-05-05 15:12:13.000000000 +0200 +++ new/xvkbd-3.1/xvkbd.man 2010-01-17 04:25:59.000000000 +0100 @@ -1,4 +1,4 @@ -.TH xvkbd 1 2008-05-05 +.TH xvkbd 1 2010-01-17 .SH NAME @@ -558,14 +558,14 @@ .SH "Download" .TP 4 \fILatest Official Release\fP -\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz\fP +\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.1.tar.gz\fP .br -- source of version 3.0 (2008-05-05) +- source of version 3.1 (2010-01-17) .TP 4 previous release -http://homepage3.nifty.com/tsato/xvkbd/xvkbd-2.9.tar.gz\fP +http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.0.tar.gz .br -- source of version 2.9 (2008-03-30) +- source of version 3.0 (2008-05-05) .PP \fIxvkbd\fP is distributed under the terms of the GNU General Public License. @@ -760,8 +760,8 @@ .PP If the first character of the assigned string is `\fB!\fP', the string will be used as command to be executed when the key is clicked. -String starting with `\fB!\fP' can be assigned -by putting `\fB\\\fP' before `\fB!\fP'. +To assign string starting with `\fB!\fP' or `\fB\\\fP', +put `\fB\\\fP' before the string. .PP The file is \fB$HOME/.xvkbd\fP in default, and it can be changed by setting the filename @@ -1127,6 +1127,20 @@ New automatic click feature. .IP " - " 6 Key-click sounds when key is pressed. +.TP 4 +Version 3.1 (2010-01-17) +.IP " - " 6 +Changed the default setting for automatic click to OFF, which was set ON in the previous release in error and caused confusion. +.IP " - " 6 +The keypad is now customizable, too (see XVkbd-strip.ad for the example). +.IP " - " 6 +Up to 25x25 keys can now be supported both for the main keyboard and the keypad. +.IP " - " 6 +Able to open the keypad panel when startup, by setting `\fBxvkbd.keypad: false\fP' and `\fBxvkbd.keypadOnly: true\fP'. +.IP " - " 6 +Fixed errors in some keyboard layout files (Korean, Slovene, UK). +.IP " - " 6 +A new sample layout file XVkbd-strip.ad. .SH "Author" \fIxvkbd\fP was written by Tom Sato, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org