Update to 3.9
- Sort PLIST - Update WWW Changes: http://t-sato.in.coocan.jp/xvkbd/#changelog
This commit is contained in:
parent
bcf3e96ee4
commit
673d72ff15
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=508477
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= xvkbd
|
||||
PORTVERSION= 3.7
|
||||
PORTVERSION= 3.9
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= http://t-sato.in.coocan.jp/xvkbd/
|
||||
|
||||
|
@ -1,2 +1,3 @@
|
||||
SHA256 (xvkbd-3.7.tar.gz) = 895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b
|
||||
SIZE (xvkbd-3.7.tar.gz) = 81645
|
||||
TIMESTAMP = 1565025196
|
||||
SHA256 (xvkbd-3.9.tar.gz) = b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d
|
||||
SIZE (xvkbd-3.9.tar.gz) = 88440
|
||||
|
@ -7,7 +7,7 @@ Forwarded: no
|
||||
Author: Peter Pentchev <roam@FreeBSD.org>
|
||||
Last-Update: 2015-05-07
|
||||
|
||||
--- xvkbd.c.orig 2015-02-14 11:32:32 UTC
|
||||
--- xvkbd.c.orig 2018-02-25 00:55:33 UTC
|
||||
+++ xvkbd.c
|
||||
@@ -470,8 +470,8 @@ static int altgr_mask = 0;
|
||||
static int level3_shift_mask = 0;
|
||||
@ -33,7 +33,7 @@ Last-Update: 2015-05-07
|
||||
static void DeleteWindowProc(Widget w, XEvent *event, String *pars, Cardinal *n_pars);
|
||||
static void SaveProperty(void);
|
||||
|
||||
+static void SignalUser1(int sig);
|
||||
+static void SignalUser1(int dummy);
|
||||
+
|
||||
/*
|
||||
* Search for window which has specified instance name (WM_NAME)
|
||||
@ -48,7 +48,7 @@ Last-Update: 2015-05-07
|
||||
XClassHint hint;
|
||||
char *win_name;
|
||||
|
||||
@@ -802,7 +803,9 @@ static int MyErrorHandler(Display *my_dp
|
||||
@@ -824,7 +825,9 @@ static int MyErrorHandler(Display *my_dp
|
||||
*/
|
||||
static void SendEvent(XKeyEvent *event)
|
||||
{
|
||||
@ -58,7 +58,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
if (!appres.no_sync) {
|
||||
XSync(event->display, FALSE);
|
||||
@@ -1099,11 +1102,11 @@ static void SendKeyPressedEvent(KeySym k
|
||||
@@ -1136,11 +1139,11 @@ static void SendKeyPressedEvent(KeySym k
|
||||
|
||||
#ifdef USE_XTEST
|
||||
if (appres.xtest && press_release == 0) {
|
||||
@ -72,7 +72,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
event.type = KeyRelease;
|
||||
event.state = 0;
|
||||
@@ -1281,7 +1284,7 @@ static int n_word_list = 0;
|
||||
@@ -1332,7 +1335,7 @@ static int n_word_list = 0;
|
||||
|
||||
static void SetDefaultDictionary(void)
|
||||
{
|
||||
@ -81,7 +81,7 @@ Last-Update: 2015-05-07
|
||||
XtVaSetValues(props_dict_entry, XtNstring, dict_filename, NULL);
|
||||
}
|
||||
|
||||
@@ -1296,7 +1299,7 @@ static void ReadCompletionDictionary(voi
|
||||
@@ -1347,7 +1350,7 @@ static void ReadCompletionDictionary(voi
|
||||
struct WORDLIST *p;
|
||||
|
||||
if (strcmp(cur_dict_filename, dict_filename) == 0) return;
|
||||
@ -90,7 +90,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
if (!first) {
|
||||
int cnt = 0;
|
||||
@@ -1346,7 +1349,7 @@ static void ReadCompletionDictionary(voi
|
||||
@@ -1397,7 +1400,7 @@ static void ReadCompletionDictionary(voi
|
||||
|
||||
static void AddToCompletionText(KeySym keysym)
|
||||
{
|
||||
@ -99,7 +99,7 @@ Last-Update: 2015-05-07
|
||||
struct WORDLIST *node_ptr;
|
||||
|
||||
if (completion_entry != None) {
|
||||
@@ -1436,7 +1439,7 @@ static void PopupCompletionPanel(void)
|
||||
@@ -1487,7 +1490,7 @@ static void PopupCompletionPanel(void)
|
||||
|
||||
ReadCompletionDictionary();
|
||||
|
||||
@ -108,7 +108,7 @@ Last-Update: 2015-05-07
|
||||
XtVaSetValues(completion_entry, XtNlabel, msg, NULL);
|
||||
|
||||
completion_text[0] = '\0';
|
||||
@@ -1451,11 +1454,11 @@ static void PopupCompletionPanel(void)
|
||||
@@ -1502,11 +1505,11 @@ static void PopupCompletionPanel(void)
|
||||
*/
|
||||
static void KeyPressed(Widget w, char *key, char *data);
|
||||
|
||||
@ -123,7 +123,7 @@ Last-Update: 2015-05-07
|
||||
int val;
|
||||
Window target_root, child, junk_w;
|
||||
int junk_i;
|
||||
@@ -1480,8 +1483,7 @@ static void SendString(const unsigned ch
|
||||
@@ -1536,8 +1539,7 @@ static void SendString(const unsigned ch
|
||||
} else {
|
||||
len = cp2 - cp - 1;
|
||||
if (sizeof(key) <= len) len = sizeof(key) - 1;
|
||||
@ -133,7 +133,7 @@ Last-Update: 2015-05-07
|
||||
KeyPressed(None, key, NULL);
|
||||
cp = cp2;
|
||||
}
|
||||
@@ -1528,11 +1530,12 @@ static void SendString(const unsigned ch
|
||||
@@ -1584,11 +1586,12 @@ static void SendString(const unsigned ch
|
||||
if ('1' <= *cp && *cp <= '9') {
|
||||
usleep((*cp - '0') * 100000);
|
||||
} else {
|
||||
@ -147,7 +147,7 @@ Last-Update: 2015-05-07
|
||||
cp++;
|
||||
if ('1' <= *cp && *cp <= '9') {
|
||||
if (appres.debug) fprintf(stderr, "XTestFakeButtonEvent(%d)\n", *cp - '0');
|
||||
@@ -1543,10 +1546,18 @@ static void SendString(const unsigned ch
|
||||
@@ -1599,10 +1602,18 @@ static void SendString(const unsigned ch
|
||||
fprintf(stderr, "%s: no digit after \"\\m\"\n",
|
||||
PROGRAM_NAME);
|
||||
}
|
||||
@ -167,7 +167,7 @@ Last-Update: 2015-05-07
|
||||
target_root = RootWindow(target_dpy, DefaultScreen(target_dpy));
|
||||
XQueryPointer(target_dpy, target_root, &junk_w, &child,
|
||||
&cur_x, &cur_y, &junk_i, &junk_i, &junk_u);
|
||||
@@ -1628,7 +1639,7 @@ static void Highlight(char *name, int st
|
||||
@@ -1684,7 +1695,7 @@ static void Highlight(char *name, int st
|
||||
char name1[50];
|
||||
Widget w;
|
||||
|
||||
@ -176,7 +176,7 @@ Last-Update: 2015-05-07
|
||||
w = XtNameToWidget(toplevel, name1);
|
||||
if (w != None) {
|
||||
if (strstr(name, "Focus") != NULL) {
|
||||
@@ -1674,13 +1685,13 @@ static Boolean CheckShiftState(int row,
|
||||
@@ -1730,13 +1741,13 @@ static Boolean CheckShiftState(int row,
|
||||
static void RefreshShiftState(Boolean force)
|
||||
{
|
||||
static Boolean first = TRUE;
|
||||
@ -195,7 +195,7 @@ Last-Update: 2015-05-07
|
||||
int first_row, row, col;
|
||||
Boolean shifted;
|
||||
char *label;
|
||||
@@ -1768,7 +1779,7 @@ static void RefreshShiftState(Boolean fo
|
||||
@@ -1824,7 +1835,7 @@ static void RefreshShiftState(Boolean fo
|
||||
|
||||
Window root, child;
|
||||
int root_x, root_y, x, y;
|
||||
@ -204,7 +204,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
XKeyEvent event;
|
||||
|
||||
@@ -1784,28 +1795,28 @@ static void RefreshShiftState(Boolean fo
|
||||
@@ -1840,28 +1851,28 @@ static void RefreshShiftState(Boolean fo
|
||||
event.same_screen = TRUE;
|
||||
event.state = 0;
|
||||
|
||||
@ -238,7 +238,7 @@ Last-Update: 2015-05-07
|
||||
event.keycode = XKeysymToKeycode(target_dpy, XK_Meta_L);
|
||||
event.type = (shift_state & meta_mask) ? KeyPress : KeyRelease;
|
||||
SendEvent(&event);
|
||||
@@ -1866,7 +1877,7 @@ static char *GetWindowGeometry(Widget w)
|
||||
@@ -1922,7 +1933,7 @@ static char *GetWindowGeometry(Widget w)
|
||||
|
||||
XtVaGetValues(w, XtNx, &x0, XtNy, &y0, NULL);
|
||||
XGetGeometry(dpy, XtWindow(w), &root, &x1, &y1, &wd, &ht, &bd, &dp);
|
||||
@ -247,7 +247,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
return geom;
|
||||
}
|
||||
@@ -1908,7 +1919,7 @@ static void SetWindowManagerHint(Boolean
|
||||
@@ -1964,7 +1975,7 @@ static void SetWindowManagerHint(Boolean
|
||||
FALSE, SubstructureNotifyMask | SubstructureRedirectMask,
|
||||
(XEvent *)&ev);
|
||||
if (appres.debug)
|
||||
@ -256,7 +256,7 @@ Last-Update: 2015-05-07
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1930,7 +1941,7 @@ static void LayoutSelected(Widget w, cha
|
||||
@@ -1986,7 +1997,7 @@ static void LayoutSelected(Widget w, cha
|
||||
if (key != NULL) {
|
||||
if (strcmp(key, "default") != 0) {
|
||||
sscanf(key, "%29[^/]/%29s", customization, lang);
|
||||
@ -265,7 +265,7 @@ Last-Update: 2015-05-07
|
||||
xenv = XtResolvePathname(dpy, "app-defaults", name, NULL, NULL, NULL, 0, NULL);
|
||||
if (xenv == NULL) {
|
||||
fprintf(stderr, "%s: app-default file \"%s\" not installed\n",
|
||||
@@ -1938,12 +1949,10 @@ static void LayoutSelected(Widget w, cha
|
||||
@@ -1994,12 +2005,10 @@ static void LayoutSelected(Widget w, cha
|
||||
}
|
||||
}
|
||||
|
||||
@ -280,7 +280,7 @@ Last-Update: 2015-05-07
|
||||
putenv(env_xenv);
|
||||
|
||||
keyboard_layout = XtNewString(key);
|
||||
@@ -2063,6 +2072,7 @@ static void PropsItemToggled(Widget w, c
|
||||
@@ -2119,6 +2128,7 @@ static void PropsItemToggled(Widget w, c
|
||||
XtVaGetValues(XtNameToWidget(props_panel, "*jump_pointer"),
|
||||
XtNstate, &appres.jump_pointer, NULL);
|
||||
|
||||
@ -288,7 +288,7 @@ Last-Update: 2015-05-07
|
||||
appres.key_click_duration = (int)XawToggleGetCurrent(click_buttons);
|
||||
appres.autoclick_delay = (int)XawToggleGetCurrent(autoclick_buttons);
|
||||
|
||||
@@ -2129,7 +2139,7 @@ static void PopupPropsPanel(void)
|
||||
@@ -2185,7 +2195,7 @@ static void PopupPropsPanel(void)
|
||||
if (props_panel == None) {
|
||||
Widget label, button;
|
||||
Widget form, w;
|
||||
@ -297,7 +297,7 @@ Last-Update: 2015-05-07
|
||||
int val;
|
||||
|
||||
props_panel = XtVaCreatePopupShell("props_panel", transientShellWidgetClass,
|
||||
@@ -2155,7 +2165,7 @@ static void PopupPropsPanel(void)
|
||||
@@ -2211,7 +2221,7 @@ static void PopupPropsPanel(void)
|
||||
click_buttons = button;
|
||||
for (val = 1; val <= 50; val *= 2) {
|
||||
char s1[10];
|
||||
@ -306,7 +306,7 @@ Last-Update: 2015-05-07
|
||||
button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
|
||||
form, XtNfromVert, w, XtNfromHoriz, button,
|
||||
XtNradioData, (XtPointer)val,
|
||||
@@ -2177,7 +2187,7 @@ static void PopupPropsPanel(void)
|
||||
@@ -2233,7 +2243,7 @@ static void PopupPropsPanel(void)
|
||||
autoclick_buttons = button;
|
||||
for (val = 500; val <= 1000; val += 100) {
|
||||
char s1[10];
|
||||
@ -315,7 +315,7 @@ Last-Update: 2015-05-07
|
||||
button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
|
||||
form, XtNfromVert, w, XtNfromHoriz, button,
|
||||
XtNradioData, (XtPointer)val,
|
||||
@@ -2239,7 +2249,7 @@ static void OpenRemoteDisplay(Widget w,
|
||||
@@ -2295,7 +2305,7 @@ static void OpenRemoteDisplay(Widget w,
|
||||
focused_subwindow = None;
|
||||
if (target_dpy != NULL && target_dpy != dpy) XCloseDisplay(target_dpy);
|
||||
|
||||
@ -324,16 +324,7 @@ Last-Update: 2015-05-07
|
||||
for (cp = name; isascii(*cp) && isprint(*cp); cp++) ;
|
||||
*cp = '\0';
|
||||
|
||||
@@ -2443,7 +2453,7 @@ static void IconifyWindow(Widget w, Bool
|
||||
}
|
||||
}
|
||||
|
||||
-static void SignalUser1(void)
|
||||
+static void SignalUser1(int sig)
|
||||
{
|
||||
XWindowAttributes attr;
|
||||
XGetWindowAttributes(dpy, XtWindow(toplevel), &attr);
|
||||
@@ -2752,7 +2762,7 @@ static Widget MakeKey(Widget parent, con
|
||||
@@ -2806,7 +2816,7 @@ static Widget MakeKey(Widget parent, con
|
||||
XtAddCallback(w, XtNcallback, (XtCallbackProc)KeyPressed, (XtPointer)name);
|
||||
|
||||
if (label != NULL) {
|
||||
@ -342,7 +333,7 @@ Last-Update: 2015-05-07
|
||||
if (strcmp(str, "space") == 0) strcpy(str, "");
|
||||
len = strlen(str);
|
||||
if (3 <= len) {
|
||||
@@ -2824,9 +2834,9 @@ static void MakeKeypad(Widget form, Widg
|
||||
@@ -2878,9 +2888,9 @@ static void MakeKeypad(Widget form, Widg
|
||||
|| (strncmp(keypad_shift[row][col], "KP_", 3) == 0
|
||||
&& isdigit(keypad_shift[row][col][3])))
|
||||
color = appres.general_background;
|
||||
@ -354,7 +345,7 @@ Last-Update: 2015-05-07
|
||||
key = MakeKey(keypad_box, XtNewString(name),
|
||||
keypad_label[row][col], color);
|
||||
XtVaSetValues(key, XtNfont, font, NULL);
|
||||
@@ -2928,12 +2938,12 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -2982,12 +2992,12 @@ static void MakeKeyboard(Boolean remake)
|
||||
Widget form, key, left;
|
||||
Pixel color;
|
||||
XFontStruct *font;
|
||||
@ -369,7 +360,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
#include "xvkbd.xbm"
|
||||
#include "iconify.xbm"
|
||||
@@ -2953,7 +2963,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -3007,7 +3017,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
for (row = first_row; row < NUM_KEY_ROWS; row++) {
|
||||
if (keys_normal[row][0] == NULL) continue;
|
||||
|
||||
@ -378,7 +369,7 @@ Last-Update: 2015-05-07
|
||||
key_box[row] = XtVaCreateManagedWidget(name, formWidgetClass, form, NULL);
|
||||
key_box[row + 1] = None;
|
||||
if (row != first_row)
|
||||
@@ -2963,7 +2973,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -3017,7 +3027,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
|
||||
left = None;
|
||||
for (col = 0; keys_normal[row][col] != NULL; col++) {
|
||||
@ -387,7 +378,7 @@ Last-Update: 2015-05-07
|
||||
if (strcmp(name, "MainMenu") == 0) {
|
||||
Widget iconify_button = None;
|
||||
|
||||
@@ -3005,11 +3015,11 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -3059,11 +3069,11 @@ static void MakeKeyboard(Boolean remake)
|
||||
color = appres.general_background;
|
||||
font = appres.general_font;
|
||||
if (isalpha(name[0])) font = appres.letter_font;
|
||||
@ -402,7 +393,7 @@ Last-Update: 2015-05-07
|
||||
/* keys can be removed by setting its width to 1 */
|
||||
XtDestroyWidget(key);
|
||||
key = None;
|
||||
@@ -3045,7 +3055,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -3099,7 +3109,7 @@ static void MakeKeyboard(Boolean remake)
|
||||
Window root;
|
||||
int x1, y1;
|
||||
unsigned int wd, ht, bd, dp;
|
||||
@ -411,7 +402,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
XGetGeometry(dpy, XtWindow(toplevel), &root, &x1, &y1, &wd, &ht, &bd, &dp);
|
||||
max_wd = XtScreen(toplevel)->width * appres.max_width_ratio;
|
||||
@@ -3063,16 +3073,16 @@ static void MakeKeyboard(Boolean remake)
|
||||
@@ -3118,16 +3128,16 @@ static void MakeKeyboard(Boolean remake)
|
||||
|
||||
if (!appres.debug && key_box[first_row] != None) {
|
||||
if (appres.keypad) {
|
||||
@ -433,7 +424,7 @@ Last-Update: 2015-05-07
|
||||
}
|
||||
}
|
||||
if (0 < strlen(appres.geometry)) {
|
||||
@@ -3180,11 +3190,11 @@ static void ReadProperty(void)
|
||||
@@ -3236,11 +3246,11 @@ static void ReadProperty(void)
|
||||
home = getenv("HOME");
|
||||
if (appres.key_file[0] != '/' && home != NULL
|
||||
&& strlen(home) + strlen(appres.key_file) + 1 < sizeof(fkey_filename))
|
||||
@ -448,16 +439,16 @@ Last-Update: 2015-05-07
|
||||
|
||||
fp = fopen(fkey_filename, "r");
|
||||
if (fp == NULL) return;
|
||||
@@ -3199,7 +3209,7 @@ static void ReadProperty(void)
|
||||
LayoutSelected(None, keyboard_layout, NULL);
|
||||
}
|
||||
@@ -3253,7 +3263,7 @@ static void ReadProperty(void)
|
||||
keyboard_layout, getenv("XENVIRONMENT"));
|
||||
if (getenv("XENVIRONMENT") == NULL) layout_selected = TRUE;
|
||||
} else if (sscanf(&str[1], "dict_file %s", key) == 1) {
|
||||
- strncpy(dict_filename, key, sizeof(dict_filename));
|
||||
+ snprintf(dict_filename, sizeof(dict_filename), "%s", key);
|
||||
} else if (sscanf(&str[1], "%s %d", key, &val) == 2) {
|
||||
if (strcmp(key, "quick_modifiers") == 0)
|
||||
appres.quick_modifiers = val;
|
||||
@@ -3273,9 +3283,9 @@ static void FKeyMenuSelected(Widget w, c
|
||||
@@ -3329,9 +3339,9 @@ static void FKeyMenuSelected(Widget w, c
|
||||
if (key == NULL)
|
||||
strcpy(key2, "");
|
||||
else if (strncmp(key, "Shift-", strlen("Shift-")) == 0)
|
||||
@ -469,7 +460,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
if (strcmp(cur_fkey, key2) != 0) {
|
||||
if (strlen(cur_fkey) != 0) {
|
||||
@@ -3298,7 +3308,7 @@ static void FKeyMenuSelected(Widget w, c
|
||||
@@ -3354,7 +3364,7 @@ static void FKeyMenuSelected(Widget w, c
|
||||
prefix = "";
|
||||
if (cur_fkey_value_mode[0] == 'c') prefix = "!";
|
||||
else if (fkey_value[0] == '!' || fkey_value[0] == '\\') prefix = "\\";
|
||||
@ -478,7 +469,7 @@ Last-Update: 2015-05-07
|
||||
} else { /* empty string - remove the entry for the function key */
|
||||
if (sp != NULL) {
|
||||
if (sp2 != NULL) sp2->next = sp->next;
|
||||
@@ -3318,10 +3328,10 @@ static void FKeyMenuSelected(Widget w, c
|
||||
@@ -3374,10 +3384,10 @@ static void FKeyMenuSelected(Widget w, c
|
||||
FKeyValueMenuSelected(None, (value[0] == '!') ? "command" : "string");
|
||||
|
||||
if (value[0] == '!' || value[0] == '\\') value = value + 1;
|
||||
@ -491,7 +482,7 @@ Last-Update: 2015-05-07
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3385,9 +3395,9 @@ static void PopupFunctionKeyEditor(void)
|
||||
@@ -3441,9 +3451,9 @@ static void PopupFunctionKeyEditor(void)
|
||||
for (j = 0; j <= 1; j++) {
|
||||
for (i = 1; i <= appres.editable_function_keys; i++) {
|
||||
if (j == 0)
|
||||
@ -503,7 +494,7 @@ Last-Update: 2015-05-07
|
||||
key = XtNewString(label);
|
||||
menu_entry = XtVaCreateManagedWidget(key, smeBSBObjectClass, menu, NULL);
|
||||
XtAddCallback(menu_entry, XtNcallback, (XtCallbackProc)FKeyMenuSelected,
|
||||
@@ -3449,8 +3459,8 @@ static const char *FindFunctionKeyValue(
|
||||
@@ -3514,8 +3524,8 @@ static const char *FindFunctionKeyValue(
|
||||
else if (shift_state & ControlMask) prefix = 'c';
|
||||
else if (shift_state & ShiftMask) prefix = 's';
|
||||
}
|
||||
@ -514,7 +505,7 @@ Last-Update: 2015-05-07
|
||||
len = strlen(label);
|
||||
|
||||
for (sp = fkey_list; sp != NULL; sp = sp->next) {
|
||||
@@ -3508,8 +3518,10 @@ static void Autoclick(void)
|
||||
@@ -3573,8 +3583,10 @@ static void Autoclick(void)
|
||||
{
|
||||
StopAutoclick();
|
||||
|
||||
@ -525,16 +516,7 @@ Last-Update: 2015-05-07
|
||||
}
|
||||
|
||||
static void ShowBalloon(Widget w, XEvent *event, String *pars, Cardinal *n_pars)
|
||||
@@ -3590,7 +3602,7 @@ static void SetIconBitmap(Widget w)
|
||||
static void VisibilityChanged(Widget w, XEvent *event,
|
||||
String *pars, Cardinal *n_pars)
|
||||
{
|
||||
- static cnt = 0;
|
||||
+ static int cnt = 0;
|
||||
static time_t t1 = 0;
|
||||
time_t t2;
|
||||
|
||||
@@ -3638,7 +3650,9 @@ int main(int argc, char *argv[])
|
||||
@@ -3703,7 +3715,9 @@ int main(int argc, char *argv[])
|
||||
Boolean open_keypad_panel = FALSE;
|
||||
char ch;
|
||||
Window child;
|
||||
@ -544,7 +526,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
argc1 = argc;
|
||||
argv1 = malloc(sizeof(char *) * (argc1 + 5));
|
||||
@@ -3841,14 +3855,14 @@ char *setlocale(int category, const char
|
||||
@@ -3905,14 +3919,14 @@ char *setlocale(int category, const char
|
||||
if (locale == NULL) {
|
||||
return cur_locale;
|
||||
} else if (category == LC_ALL) {
|
||||
|
@ -3,7 +3,7 @@ Forwarded: no
|
||||
Author: Peter Pentchev <roam@FreeBSD.org>
|
||||
Last-Update: 2015-05-07
|
||||
|
||||
--- xvkbd.man.orig 2015-09-12 07:21:58 UTC
|
||||
--- xvkbd.man.orig 2018-02-25 00:56:26 UTC
|
||||
+++ xvkbd.man
|
||||
@@ -29,7 +29,7 @@ which may make it easier to enter long w
|
||||
.PP
|
||||
@ -23,7 +23,7 @@ Last-Update: 2015-05-07
|
||||
or on the Property panel.
|
||||
|
||||
.SH " Main Menu"
|
||||
@@ -242,17 +242,17 @@ You may want to set \fIJump Pointer?\fP
|
||||
@@ -242,38 +242,38 @@ You may want to set \fIJump Pointer?\fP
|
||||
\fICompletion Dictionary\fP
|
||||
Set the filename to be used for word completion.
|
||||
This setting take precedence over the `\fBxvkbd.dictFile\fP' resource
|
||||
@ -45,7 +45,15 @@ Last-Update: 2015-05-07
|
||||
Make \fIxvkbd\fP to use \fIXSendEvent()\fP to simulate keyboard events,
|
||||
as it was in \fIxvkbd\fP version 1.0.
|
||||
\fIxvkbd\fP version 1.1 and later will try to use XTEST extension instead
|
||||
@@ -263,14 +263,14 @@ If XTEST extension is not supported by t
|
||||
in the default configuration.
|
||||
Because it is not unusual applications to ignore keyboard events
|
||||
-generated with \fB-xsendevent\fP,
|
||||
-you shouldn't use \fB-xsendevent\fP option unless it is really required.
|
||||
+generated with \fB\-xsendevent\fP,
|
||||
+you shouldn't use \fB\-xsendevent\fP option unless it is really required.
|
||||
.sp 0.5
|
||||
If XTEST extension is not supported by the X server,
|
||||
\fIxvkbd\fP will automatically switch to this mode.
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.xtest: false\fP' has the same function.
|
||||
.TP 4
|
||||
@ -63,7 +71,7 @@ Last-Update: 2015-05-07
|
||||
Make \fIxvkbd\fP not to jump the pointer when sending events.
|
||||
In the default, \fIxvkbd\fP will temporary jump the pointer to the focused window,
|
||||
if input focus is set explicitly via \fIFocus\fP button,
|
||||
@@ -278,14 +278,14 @@ and XTEST extension is to be used to sim
|
||||
@@ -281,14 +281,14 @@ and XTEST extension is to be used to sim
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.jumpPointer: false\fP' has the same function.
|
||||
.TP 4
|
||||
@ -80,7 +88,7 @@ Last-Update: 2015-05-07
|
||||
Make labels on keys in the \fIxvkbd\fP window
|
||||
to be set independently for each of four shift states,
|
||||
not shifted, \fIShift\fP, \fIAltGr\fP and \fIShift\fP-\fIAltGr\fP.
|
||||
@@ -296,27 +296,27 @@ and resouce files in the distribution.
|
||||
@@ -299,27 +299,27 @@ and resouce files in the distribution.
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.modalKeytop: true\fP' has the same function.
|
||||
.TP 4
|
||||
@ -99,24 +107,24 @@ Last-Update: 2015-05-07
|
||||
+by using \fB\-\fP instead of \fB+\fP,
|
||||
but please note that you must take account of size of the window border.
|
||||
-(If you specify `\fB-geometry -0-0\fP',
|
||||
+(If you specify `\fB\-geometry \-0\-0\fP',
|
||||
+(If you specify `\fB\-geometry -0-0\fP',
|
||||
the window will not fit in the screen.)
|
||||
.sp 0.5
|
||||
This can be set by \fBxvkbd.windowGeometry\fP resource
|
||||
(note that it is not \fBxvkbd.geometry\fP), too.
|
||||
.TP 4
|
||||
-.B "-no-resize"
|
||||
+.B "\-no\-resize"
|
||||
Disable resize of the \fIxvkbd\fP window.
|
||||
+.B "\-no-resize"
|
||||
Disable resize of the \fIxvkbd\fP window.
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.resizable: false\fP' has the same function.
|
||||
.TP 4
|
||||
-.B "-no-repeat"
|
||||
+.B "\-no\-repeat"
|
||||
+.B "\-no-repeat"
|
||||
Do not auto-repeat even if key is depressed long time.
|
||||
.sp 0.5
|
||||
If auto-repeat is enabled (this is the default),
|
||||
@@ -328,31 +328,31 @@ and period of repeat can be set as
|
||||
@@ -331,31 +331,31 @@ and period of repeat can be set as
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.autoRepeat: false\fP' has the same function.
|
||||
.TP 4
|
||||
@ -155,7 +163,7 @@ Last-Update: 2015-05-07
|
||||
.sp 0.5
|
||||
If this option is specified,
|
||||
\fIxvkbd\fP will not open its window
|
||||
@@ -399,28 +399,28 @@ will simulate press and release of the k
|
||||
@@ -402,28 +402,28 @@ will simulate press and release of the k
|
||||
.IP " - " 6
|
||||
\fB\\m\fP\fIdigit\fP - simulate click of the specified mouse button
|
||||
.TP 4
|
||||
@ -173,9 +181,9 @@ Last-Update: 2015-05-07
|
||||
and terminate soon after sending the string.
|
||||
.TP 4
|
||||
-.B "-utf16"
|
||||
- When used with \fB-file\fP option,
|
||||
-When used with \fB-file\fP option,
|
||||
+.B "\-utf16"
|
||||
+ When used with \fB\-file\fP option,
|
||||
+When used with \fB\-file\fP option,
|
||||
make \fIxvkbd\fP to accept UTF16 characters in the file.
|
||||
.TP 4
|
||||
-.BI "-delay " value
|
||||
@ -192,7 +200,7 @@ Last-Update: 2015-05-07
|
||||
Specify the ID
|
||||
(hexadecimal value leaded with `\fB0x\fP', or decimal value),
|
||||
the name (instance name or class name) of the window,
|
||||
@@ -438,10 +438,10 @@ or clear the input focus.
|
||||
@@ -441,10 +441,10 @@ or clear the input focus.
|
||||
If there are two or more windows which have the name specified with this option,
|
||||
the window which was found first will be selected.
|
||||
.TP 4
|
||||
@ -205,7 +213,7 @@ Last-Update: 2015-05-07
|
||||
.sp 0.5
|
||||
If you want to set input focus to the widget \fBfoo.bar.zot\fP,
|
||||
you can write \fBzot\fP, \fBbar.zot\fP or \fBfoo.bar.zot\fP
|
||||
@@ -452,24 +452,24 @@ with a single widget of the client.
|
||||
@@ -455,24 +455,24 @@ with a single widget of the client.
|
||||
For example,
|
||||
.sp
|
||||
.in +4
|
||||
@ -220,9 +228,9 @@ Last-Update: 2015-05-07
|
||||
+.BI "\-remote\-display " display
|
||||
Specify the display (in the meaning of the X Window System) to connect;
|
||||
see also \fIConnect to Remote Display...\fP.
|
||||
.TP 4
|
||||
.TP 4
|
||||
-.B "-true-keypad"
|
||||
+.B "\-true\-keypad"
|
||||
+.B "\-true-keypad"
|
||||
If this option is specified,
|
||||
\fIxvkbd\fP will attempt to use \fIkeysym\fPs such as
|
||||
\fIXK_KP_1\fP instead of \fIXK_1\fP.
|
||||
@ -234,7 +242,7 @@ Last-Update: 2015-05-07
|
||||
Specify the default dictionary (list of words) file to be used for
|
||||
word completion.
|
||||
The `\fICompletion Dictionary\fP' filename
|
||||
@@ -479,7 +479,7 @@ Resource `\fBxvkbd.dictFile: \fP\fIfilen
|
||||
@@ -482,7 +482,7 @@ Resource `\fBxvkbd.dictFile: \fP\fIfilen
|
||||
.sp 0.5
|
||||
See also ``Making your own completion dictionary''.
|
||||
.TP 4
|
||||
@ -243,7 +251,7 @@ Last-Update: 2015-05-07
|
||||
Make \fIxvkbd\fP window can be minimized (iconified)
|
||||
even if no window manager is in use.
|
||||
When this feature is enabled,
|
||||
@@ -488,7 +488,7 @@ and \fIxvkbd\fP window will be minimized
|
||||
@@ -491,7 +491,7 @@ and \fIxvkbd\fP window will be minimized
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.minimizable: true\fP' has the same function.
|
||||
.TP 4
|
||||
@ -252,7 +260,7 @@ Last-Update: 2015-05-07
|
||||
Disable invocation of external commands,
|
||||
including user assigned command and the online manual reader.
|
||||
Connection to another displays would also be disabled.
|
||||
@@ -496,25 +496,25 @@ This option may be useful when \fIxvkbd\
|
||||
@@ -499,25 +499,25 @@ This option may be useful when \fIxvkbd\
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.secure: true\fP' has the same function.
|
||||
.TP 4
|
||||
@ -283,7 +291,7 @@ Last-Update: 2015-05-07
|
||||
to apply this for those four modifiers.
|
||||
Maybe this can be useful when attempting to decorate
|
||||
the mouse operations with the modifiers.
|
||||
@@ -524,101 +524,101 @@ and which can prevent the correct operat
|
||||
@@ -527,105 +527,105 @@ and which can prevent the correct operat
|
||||
.sp 0.5
|
||||
Resource `\fBxvkbd.positiveModifiers: \fP\fImodifiers...\fP' has the same function.
|
||||
.TP 4
|
||||
@ -298,123 +306,128 @@ Last-Update: 2015-05-07
|
||||
+.B "\-version"
|
||||
Output version information and exit.
|
||||
|
||||
.SH "Screen Shot"
|
||||
.SH "Screenshot"
|
||||
.TP 4
|
||||
Default (US)
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-normal.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-normal.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-normal.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-normal.gif
|
||||
.TP 4
|
||||
Belgian
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-belgian.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-belgian.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-belgian.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-belgian.gif
|
||||
.TP 4
|
||||
Danish
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-danish.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-danish.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-danish.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-danish.gif
|
||||
.TP 4
|
||||
French
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-french.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-french.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-french.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-french.gif
|
||||
.sp 0.5
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-french2.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-french2.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-french2.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-french2.gif
|
||||
.TP 4
|
||||
German
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-german.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-german.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-german.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-german.gif
|
||||
.TP 4
|
||||
Icelandic
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-icelandic.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-icelandic.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-icelandic.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-icelandic.gif
|
||||
.TP 4
|
||||
Italian
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-italian.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-italian.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-italian.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-italian.gif
|
||||
.TP 4
|
||||
Japanese (JIS-X-6002)
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-jisx6002.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-jisx6002.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-jisx6002.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-jisx6002.gif
|
||||
.TP 4
|
||||
Japanese (JIS-X-6004)
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-jisx6004.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-jisx6004.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-jisx6004.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-jisx6004.gif
|
||||
.TP 4
|
||||
Norwegian
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-norwegian.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-norwegian.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-norwegian.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-norwegian.gif
|
||||
.TP 4
|
||||
Portuguese
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-portuguese.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-portuguese.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-portuguese.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-portuguese.gif
|
||||
.TP 4
|
||||
Spanish
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-spanish.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-spanish.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-spanish.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-spanish.gif
|
||||
.TP 4
|
||||
Swedish
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-swedish.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-swedish.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-swedish.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-swedish.gif
|
||||
.TP 4
|
||||
Swiss/German
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-swissgerman.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-swissgerman.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-swissgerman.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-swissgerman.gif
|
||||
.TP 4
|
||||
United Kingdom
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-uk.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-uk.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-uk.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-uk.gif
|
||||
.TP 4
|
||||
Latin-1
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-latin1.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-latin1.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-latin1.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-latin1.gif
|
||||
.TP 4
|
||||
Small Keyboard (maybe suitable for PDAs)
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-small.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-small.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-small.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-small.gif
|
||||
.TP 4
|
||||
Hebrew
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-hebrew.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-hebrew.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-hebrew.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-hebrew.gif
|
||||
.TP 4
|
||||
Greek
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-greek.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-greek.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-greek.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-greek.gif
|
||||
.TP 4
|
||||
Turkish
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-turkish.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-turkish.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-turkish.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-turkish.gif
|
||||
.TP 4
|
||||
Slovene
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-slovene.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-slovene.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-slovene.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-slovene.gif
|
||||
.TP 4
|
||||
Korean
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-korean.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-korean.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-korean.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-korean.gif
|
||||
.TP 4
|
||||
Russian (Cyrillic)
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-russian.gif
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-russian.gif
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-russian.gif
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-russian.gif
|
||||
|
||||
.SH "Download"
|
||||
.TP 4
|
||||
\fILatest Official Release\fP
|
||||
-\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.7.tar.gz\fP
|
||||
+\fIhttp://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.7.tar.gz\fP
|
||||
-\fIhttp://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz\fP
|
||||
+\fIhttp://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.9.tar.gz\fP
|
||||
.br
|
||||
- source of version 3.7 (2015-09-12)
|
||||
- source of version 3.9 (2018-02-25)
|
||||
.TP 4
|
||||
previous release
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.6.tar.gz
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.6.tar.gz
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.8.tar.gz
|
||||
.br
|
||||
- source of version 3.8 (2017-06-06)
|
||||
.sp 0.5
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.7.tar.gz
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.7.tar.gz
|
||||
.br
|
||||
- source of version 3.7 (2015-09-12)
|
||||
.sp 0.5
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.6.tar.gz
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-3.6.tar.gz
|
||||
.br
|
||||
- source of version 3.6 (2015-02-15)
|
||||
.sp 0.5
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.5.tar.gz
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-3.5.tar.gz
|
||||
.br
|
||||
- source of version 3.5 (2013-07-15)
|
||||
.PP
|
||||
@@ -655,8 +655,8 @@ load them via \fIxrdb\fP(1), or
|
||||
@@ -662,8 +662,8 @@ load them via \fIxrdb\fP(1), or
|
||||
.IP " o " 4
|
||||
set the filename to the \fB$XENVIRONMENT\fP environment variable, or
|
||||
.IP " o " 4
|
||||
@ -425,7 +438,7 @@ Last-Update: 2015-05-07
|
||||
.IP " o " 4
|
||||
put them in application default directory as \fBXVkbd\fP.
|
||||
.PP
|
||||
@@ -668,11 +668,11 @@ directories specified with \fB$XUSERFILE
|
||||
@@ -675,11 +675,11 @@ directories specified with \fB$XUSERFILE
|
||||
system's application default directory specified with
|
||||
\fB$XFILESEACHPATH\fP environment variable,
|
||||
or else the directory specified when compiling the X
|
||||
@ -439,7 +452,7 @@ Last-Update: 2015-05-07
|
||||
near top of the file.
|
||||
.PP
|
||||
\fIxvkbd\fP is distributed with some application default files,
|
||||
@@ -703,7 +703,7 @@ You may also want to set:
|
||||
@@ -710,7 +710,7 @@ You may also want to set:
|
||||
to display only the labels for the current shift state,
|
||||
instead of trying to always display all of them in the small keytop.
|
||||
.PP
|
||||
@ -448,7 +461,7 @@ Last-Update: 2015-05-07
|
||||
|
||||
.SH " Removing Unwanted Keys"
|
||||
Keys on \fIxvkbd\fP window can be removed by setting their width to 1.
|
||||
@@ -777,12 +777,12 @@ when \fBxvkbd.modalKeytop\fP resoruce is
|
||||
@@ -784,12 +784,12 @@ when \fBxvkbd.modalKeytop\fP resoruce is
|
||||
In all of those resources, each keys are separated by spaces,
|
||||
and rows of keys are terminated with `\fB \\n\\\fP'
|
||||
(note that `\fB\\n\fP' must have space before it).
|
||||
@ -464,7 +477,7 @@ Last-Update: 2015-05-07
|
||||
will make \fIxvkbd\fP to use the German layout.
|
||||
For another method to activate those settings, please refer
|
||||
"How to Customize \fIxvkbd\fP" above.
|
||||
@@ -844,7 +844,7 @@ You can use \fBxev\fP command to check w
|
||||
@@ -851,7 +851,7 @@ You can use \fBxev\fP command to check w
|
||||
.IP " o " 4
|
||||
If \fIAlt\fP or \fIMeta\fP is not defined as modifier,
|
||||
the key can't be used as modifier.
|
||||
@ -473,21 +486,20 @@ Last-Update: 2015-05-07
|
||||
.IP " o " 4
|
||||
\fINum Lock\fP (and maybe other modifiers) on the physical keyboard
|
||||
may not work correctly when \fIxvkbd\fP is in use.
|
||||
@@ -855,10 +855,10 @@ FAQ - Possible Problems and Solutions
|
||||
http://homepage3.nifty.com/tsato/xvkbd/faq.html
|
||||
@@ -862,10 +862,10 @@ FAQ - Possible Problems and Solutions
|
||||
http://t-sato.in.coocan.jp/xvkbd/faq.html
|
||||
.TP 4
|
||||
Making your own completion dictionary
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/make-dic.html
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/make\-dic.html
|
||||
-http://t-sato.in.coocan.jp/xvkbd/make-dic.html
|
||||
+http://t-sato.in.coocan.jp/xvkbd/make\-dic.html
|
||||
.TP 4
|
||||
-Hints to use \fBxvkbd -text\fP
|
||||
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-text.html
|
||||
+Hints to use \fBxvkbd \-text\fP
|
||||
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd\-text.html
|
||||
Hints to use \fBxvkbd -text\fP
|
||||
-http://t-sato.in.coocan.jp/xvkbd/xvkbd-text.html
|
||||
+http://t-sato.in.coocan.jp/xvkbd/xvkbd\-text.html
|
||||
.TP 4
|
||||
Note about how to send key events
|
||||
http://homepage3.nifty.com/tsato/xvkbd/events.html
|
||||
@@ -879,26 +879,26 @@ which can't be entered directly from key
|
||||
http://t-sato.in.coocan.jp/xvkbd/events.html
|
||||
@@ -886,26 +886,26 @@ which can't be entered directly from key
|
||||
can be entered using dedicated key combinations.
|
||||
.IP " - " 6
|
||||
Make keyboard layout not to be disturbed when
|
||||
@ -519,7 +531,7 @@ Last-Update: 2015-05-07
|
||||
.IP " - " 6
|
||||
\fIxvkbd\fP can now send keys
|
||||
with \fIMode_switch\fP (\fIAltGr\fP) modifier,
|
||||
@@ -906,9 +906,9 @@ which enables those characters in the po
|
||||
@@ -913,9 +913,9 @@ which enables those characters in the po
|
||||
.IP " - " 6
|
||||
\fIxvkbd\fP now support \fIAltGr\fP key
|
||||
so that German (and some other) keyboard layout can be used.
|
||||
@ -531,7 +543,7 @@ Last-Update: 2015-05-07
|
||||
in the distribution, which modifies keyboard layout
|
||||
and put some non-ASCII keys on the \fIxvkbd\fP window.
|
||||
.IP " - " 6
|
||||
@@ -924,7 +924,7 @@ Labels on keys can now be set independen
|
||||
@@ -931,7 +931,7 @@ Labels on keys can now be set independen
|
||||
not shifted, \fIShift\fP, \fIAltGr\fP and \fIShift\fP-\fIAltGr\fP.
|
||||
(thanks, Jim)
|
||||
.IP " - " 6
|
||||
@ -540,7 +552,7 @@ Last-Update: 2015-05-07
|
||||
.TP 4
|
||||
Version 1.2 (2001-02-18)
|
||||
.IP " - " 6
|
||||
@@ -952,7 +952,7 @@ so that it will not terminated accidentl
|
||||
@@ -959,7 +959,7 @@ so that it will not terminated accidentl
|
||||
.TP 4
|
||||
Version 1.3 (2001-03-19)
|
||||
.IP " - " 6
|
||||
@ -549,7 +561,7 @@ Last-Update: 2015-05-07
|
||||
(contributed from Marcel Portner)
|
||||
.IP " - " 6
|
||||
\fIxvkbd\fP now catches MappingNotify event and reload the new mapping.
|
||||
@@ -1002,7 +1002,7 @@ and older \fIxvkbd\fP may not work corre
|
||||
@@ -1009,7 +1009,7 @@ and older \fIxvkbd\fP may not work corre
|
||||
.TP 4
|
||||
Version 1.6 (2001-11-10)
|
||||
.IP " - " 6
|
||||
@ -558,7 +570,7 @@ Last-Update: 2015-05-07
|
||||
(thanks, Gregory)
|
||||
.IP " - " 6
|
||||
New entry `\fIUse XTEST Extension?\fP' is added
|
||||
@@ -1021,7 +1021,7 @@ after \fIxvkbd\fP is invoked.
|
||||
@@ -1028,7 +1028,7 @@ after \fIxvkbd\fP is invoked.
|
||||
Show/hide of the keypad and funcion keys on the main window
|
||||
can now be toggled from the main menu.
|
||||
.IP " - " 6
|
||||
@ -567,7 +579,7 @@ Last-Update: 2015-05-07
|
||||
(contributed from Jean-Pierre Demailly)
|
||||
.TP 4
|
||||
Version 2.1 (2002-01-27)
|
||||
@@ -1029,9 +1029,9 @@ Version 2.1 (2002-01-27)
|
||||
@@ -1036,9 +1036,9 @@ Version 2.1 (2002-01-27)
|
||||
When height of the \fIxvkbd\fP window is smaller than
|
||||
\fBXVkbd.modalThreshold\fP,
|
||||
\fIxvkbd\fP will now automatically switch the keytop
|
||||
@ -579,7 +591,7 @@ Last-Update: 2015-05-07
|
||||
would send wrong keys - this problem is now fixed.
|
||||
.IP " - " 6
|
||||
Target \fBdistclean\fP in the \fBImakefile\fP is renamed
|
||||
@@ -1044,8 +1044,8 @@ Version 2.2 (2002-03-17)
|
||||
@@ -1051,8 +1051,8 @@ Version 2.2 (2002-03-17)
|
||||
String assigned to function keys can now be edited on a panel popped up via
|
||||
"\fIEdit Function Keys...\fP" in the main menu.
|
||||
.IP " - " 6
|
||||
@ -590,7 +602,7 @@ Last-Update: 2015-05-07
|
||||
its standard input (stdin) to get the string to be sent.
|
||||
.IP " - " 6
|
||||
In the previous release,
|
||||
@@ -1074,7 +1074,7 @@ Swiss/German,
|
||||
@@ -1081,7 +1081,7 @@ Swiss/German,
|
||||
United Kingdom
|
||||
and Latin-1.
|
||||
.IP " - " 6
|
||||
@ -599,7 +611,7 @@ Last-Update: 2015-05-07
|
||||
- this problem is now fixed.
|
||||
.TP 4
|
||||
Version 2.4 (2002-10-02)
|
||||
@@ -1135,24 +1135,24 @@ Yet another Japanese keyboard layout, JI
|
||||
@@ -1142,24 +1142,24 @@ Yet another Japanese keyboard layout, JI
|
||||
.IP " - " 6
|
||||
It is now possible to minimize (iconify) the main window
|
||||
even if no window manager is in use.
|
||||
@ -631,7 +643,7 @@ Last-Update: 2015-05-07
|
||||
and maybe useful when run \fIxvkbd\fP from a display manager.
|
||||
.TP 4
|
||||
Version 2.7a (2005-05-07)
|
||||
@@ -1168,17 +1168,17 @@ where we must use \fIISO_Level3_Shift\fP
|
||||
@@ -1175,17 +1175,17 @@ where we must use \fIISO_Level3_Shift\fP
|
||||
Reference to the target bitmap is changed from
|
||||
\fB/usr/X11R6/include/X11/bitmaps/target\fP to \fB/usr/include/X11/bitmaps/target\fP.
|
||||
.IP " - " 6
|
||||
@ -653,7 +665,7 @@ Last-Update: 2015-05-07
|
||||
via \fB\\x\fP, \fB\\y\fP and \fB\\m\fP special sequences.
|
||||
.TP 4
|
||||
Version 3.0 (2008-05-05)
|
||||
@@ -1193,7 +1193,7 @@ Version 3.1 (2010-01-17)
|
||||
@@ -1200,7 +1200,7 @@ 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
|
||||
@ -662,7 +674,7 @@ Last-Update: 2015-05-07
|
||||
.IP " - " 6
|
||||
Up to 25x25 keys can now be supported both for the main keyboard and the keypad.
|
||||
.IP " - " 6
|
||||
@@ -1201,7 +1201,7 @@ Able to open the keypad panel when start
|
||||
@@ -1208,7 +1208,7 @@ Able to open the keypad panel when start
|
||||
.IP " - " 6
|
||||
Fixed errors in some keyboard layout files (Korean, Slovene, UK).
|
||||
.IP " - " 6
|
||||
@ -671,22 +683,22 @@ Last-Update: 2015-05-07
|
||||
.TP 4
|
||||
Version 3.2 (2010-03-14)
|
||||
.IP " - " 6
|
||||
@@ -1212,10 +1212,10 @@ New option `\fIBehave as Toolbar Window?
|
||||
@@ -1219,10 +1219,10 @@ such as Matchbox window manager. (Thanks
|
||||
`\fIAlways on Top\fP' will work rather better with window managers
|
||||
which support extended window manager hint \fB_NET_WM_STATE_ABOVE\fP.
|
||||
which support extended window manager hint \fB_NET_WM_STATE_ABOVE\fP.
|
||||
.IP " - " 6
|
||||
-\fB-window\fP option can now find window which have title match with
|
||||
+\fB\-window\fP option can now find window which have title match with
|
||||
the specified string.
|
||||
the specified string.
|
||||
.IP " - " 6
|
||||
-\fB-window\fP option now accept wildcard characters
|
||||
+\fB\-window\fP option now accept wildcard characters
|
||||
`\fB*\fP' and `\fB?\fP'.
|
||||
`\fB*\fP' and `\fB?\fP'.
|
||||
.IP " - " 6
|
||||
Word completion dictionary file to be used with `\fIWord Completion...\fP'
|
||||
@@ -1224,18 +1224,18 @@ Word completion dictionary file to be us
|
||||
@@ -1231,18 +1231,18 @@ can now be specified on the Property pan
|
||||
Only the words which have two or more characters will be appeared
|
||||
in the word completion list.
|
||||
in the word completion list.
|
||||
.IP " - " 6
|
||||
-New \fB-version\fP option to display version information.
|
||||
+New \fB\-version\fP option to display version information.
|
||||
@ -695,18 +707,18 @@ Last-Update: 2015-05-07
|
||||
.IP " - " 6
|
||||
-\fB-text\fP can now accept \fB\\{\fP\fIkeysym\fP\fB}\fP
|
||||
+\fB\-text\fP can now accept \fB\\{\fP\fIkeysym\fP\fB}\fP
|
||||
so that the specified key can be processed in more primitive manner,
|
||||
and so that modofier keys such as \fIControl_L\fP, \fIMeta_L\fP, etc.
|
||||
can also be simulated.
|
||||
Also, \fB\\{+\fP\fIkeysym\fP\fB}\fP and \fB\\{-\fP\fIkeysym\fP\fB}\fP
|
||||
will now simulate press and release of the key, respectively.
|
||||
so that the specified key can be processed in more primitive manner,
|
||||
and so that modofier keys such as \fIControl_L\fP, \fIMeta_L\fP, etc.
|
||||
can also be simulated.
|
||||
Also, \fB\\{+\fP\fIkeysym\fP\fB}\fP and \fB\\{-\fP\fIkeysym\fP\fB}\fP
|
||||
will now simulate press and release of the key, respectively.
|
||||
.IP " - " 6
|
||||
-New option \fB-remote-display\fP to make \fIxvkbd\fP connect to
|
||||
+New option \fB\-remote\-display\fP to make \fIxvkbd\fP connect to
|
||||
the specified display when startup.
|
||||
the specified display when startup.
|
||||
.IP " - " 6
|
||||
Bug fixed: \fBKP_0\fP now works.
|
||||
@@ -1251,7 +1251,7 @@ as it seems delay of 0 caused problems i
|
||||
@@ -1258,7 +1258,7 @@ as it seems delay of 0 caused problems i
|
||||
ISO_Left_Tab is assigned to the shifted position of the Tab key on the \fIxvkbd\fP window,
|
||||
so that Shift-Tab can be simulated.
|
||||
.IP " - " 6
|
||||
@ -715,7 +727,7 @@ Last-Update: 2015-05-07
|
||||
.TP 4
|
||||
Version 3.5 (2013-07-15)
|
||||
.IP " - " 6
|
||||
@@ -1262,8 +1262,8 @@ Fixed a problem that "Always on Top" not
|
||||
@@ -1269,8 +1269,8 @@ Fixed a problem that "Always on Top" not
|
||||
.TP 4
|
||||
Version 3.6 (2015-02-15)
|
||||
.IP " - " 6
|
||||
@ -726,3 +738,12 @@ Last-Update: 2015-05-07
|
||||
make \fIxvkbd\fP to accept UTF16 characters in the file.
|
||||
.IP " - " 6
|
||||
Keyboard layout selected with "Change Keyboard Layout..." will be kept
|
||||
@@ -1306,7 +1306,7 @@ A workaround for this problem is now imp
|
||||
.TP 4
|
||||
Version 3.9 (2018-02-25)
|
||||
.IP " - " 6
|
||||
-Modifiers (Alt, etc.) not working with \fB-text\fP option in the recent releases (Debian Bug#891082). This bug is now fixed.
|
||||
+Modifiers (Alt, etc.) not working with \fB\-text\fP option in the recent releases (Debian Bug#891082). This bug is now fixed.
|
||||
|
||||
|
||||
.SH "Author"
|
||||
|
@ -5,4 +5,4 @@ be used for systems without a hardware keyboard such as kiosk terminals
|
||||
or handheld devices. This program also has facility to send characters
|
||||
specified as the command line option to another client.
|
||||
|
||||
WWW: http://homepage3.nifty.com/tsato/xvkbd/
|
||||
WWW: http://t-sato.in.coocan.jp/xvkbd/
|
||||
|
@ -20,11 +20,12 @@ lib/X11/app-defaults/XVkbd-portuguese
|
||||
lib/X11/app-defaults/XVkbd-russian
|
||||
lib/X11/app-defaults/XVkbd-slovene
|
||||
lib/X11/app-defaults/XVkbd-small
|
||||
lib/X11/app-defaults/XVkbd-strip
|
||||
lib/X11/app-defaults/XVkbd-spanish
|
||||
lib/X11/app-defaults/XVkbd-strip
|
||||
lib/X11/app-defaults/XVkbd-swedish
|
||||
lib/X11/app-defaults/XVkbd-swissgerman
|
||||
lib/X11/app-defaults/XVkbd-turkish
|
||||
lib/X11/app-defaults/XVkbd-turkishF
|
||||
lib/X11/app-defaults/XVkbd-uk
|
||||
man/man1/xvkbd.1.gz
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README
|
||||
|
Loading…
Reference in New Issue
Block a user