rpms/xvkbd/devel xvkbd-3.2-fix-warn-64bit.patch, NONE, 1.1 xvkbd-3.2-fix-warn.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.7, 1.8 sources, 1.3, 1.4 xvkbd.spec, 1.7, 1.8 xvkbd-3.1-fix-warn-64bit.patch, 1.2, NONE xvkbd-3.1-fix-warn.patch, 1.3, NONE
idak
idak at fedoraproject.org
Sat May 22 02:18:10 UTC 2010
- Previous message: File xvkbd-3.2.tar.gz uploaded to lookaside cache by idak
- Next message: rpms/xvkbd/F-13 xvkbd-3.2-fix-warn-64bit.patch, NONE, 1.1 xvkbd-3.2-fix-warn.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.8, 1.9 sources, 1.3, 1.4 xvkbd.spec, 1.7, 1.8 xvkbd-3.1-fix-warn-64bit.patch, 1.2, NONE xvkbd-3.1-fix-warn.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: idak
Update of /cvs/pkgs/rpms/xvkbd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25443/devel
Modified Files:
.cvsignore import.log sources xvkbd.spec
Added Files:
xvkbd-3.2-fix-warn-64bit.patch xvkbd-3.2-fix-warn.patch
Removed Files:
xvkbd-3.1-fix-warn-64bit.patch xvkbd-3.1-fix-warn.patch
Log Message:
* Thu May 18 2010 Akio Idehara <zbe64533 at gmail.com> 3.2-1
- Update to 3.2
xvkbd-3.2-fix-warn-64bit.patch:
resources.h | 5 +++--
xvkbd.c | 20 ++++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
--- NEW FILE xvkbd-3.2-fix-warn-64bit.patch ---
diff --git a/resources.h b/resources.h
index 98c6679..7297b14 100644
--- a/resources.h
+++ b/resources.h
@@ -18,6 +18,7 @@
#ifndef PROGRAM_NAME
# define PROGRAM_NAME "xvkbd"
#endif
+#include <inttypes.h>
struct appres_struct {
String description;
@@ -100,8 +101,8 @@ struct appres_struct {
float max_height_ratio;
int text_delay;
int key_click_pitch;
- int key_click_duration;
- int autoclick_delay;
+ intptr_t key_click_duration;
+ intptr_t autoclick_delay;
} appres;
diff --git a/xvkbd.c b/xvkbd.c
index 894fb58..50b9f6f 100644
--- a/xvkbd.c
+++ b/xvkbd.c
@@ -376,9 +376,9 @@ static XtResource application_resources[] = {
{ "keyClickPitch", "KeyClickPitch", XtRInt, sizeof(int),
Offset(key_click_pitch), XtRImmediate, (XtPointer)1000 },
- { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(int),
+ { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(intptr_t),
Offset(key_click_duration), XtRImmediate, (XtPointer)1 },
- { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(int),
+ { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(intptr_t),
Offset(autoclick_delay), XtRImmediate, (XtPointer)0 },
};
#undef Offset
@@ -1923,8 +1923,8 @@ static void PropsItemToggled(Widget w, char *key, char *data)
XtVaGetValues(XtNameToWidget(props_panel, "*jump_pointer"),
XtNstate, &appres.jump_pointer, NULL);
- appres.key_click_duration = (int)XawToggleGetCurrent(click_buttons);
- appres.autoclick_delay = (int)XawToggleGetCurrent(autoclick_buttons);
+ appres.key_click_duration = (intptr_t)XawToggleGetCurrent(click_buttons);
+ appres.autoclick_delay = (intptr_t)XawToggleGetCurrent(autoclick_buttons);
SaveFunctionKey();
SetWindowManagerHint(FALSE);
@@ -1990,7 +1990,7 @@ static void PopupPropsPanel(void)
Widget label, button;
Widget form, w;
int i;
- int val;
+ intptr_t val;
props_panel = XtVaCreatePopupShell("props_panel", transientShellWidgetClass,
toplevel, NULL);
@@ -2015,7 +2015,7 @@ static void PopupPropsPanel(void)
click_buttons = button;
for (val = 1; val <= 50; val *= 2) {
char s1[10];
- sprintf(s1, "%dms", val);
+ sprintf(s1, "%"PRIdPTR"ms", val);
button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
form, XtNfromVert, w, XtNfromHoriz, button,
XtNradioData, (XtPointer)val,
@@ -2037,7 +2037,7 @@ static void PopupPropsPanel(void)
autoclick_buttons = button;
for (val = 500; val <= 1000; val += 100) {
char s1[10];
- sprintf(s1, "%dms", val);
+ sprintf(s1, "%"PRIdPTR"ms", val);
button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
form, XtNfromVert, w, XtNfromHoriz, button,
XtNradioData, (XtPointer)val,
@@ -3188,8 +3188,8 @@ static void SaveFunctionKey(void)
fprintf(fp, "#shift_lock %d\n", appres.shift_lock);
fprintf(fp, "#altgr_lock %d\n", appres.altgr_lock);
fprintf(fp, "#modifiers_lock %d\n", appres.modifiers_lock);
- fprintf(fp, "#key_click %d\n", appres.key_click_duration);
- fprintf(fp, "#autoclick %d\n", appres.autoclick_delay);
+ fprintf(fp, "#key_click %"PRIdPTR"\n", appres.key_click_duration);
+ fprintf(fp, "#autoclick %"PRIdPTR"\n", appres.autoclick_delay);
fprintf(fp, "#always_on_top %d\n", appres.always_on_top);
fprintf(fp, "#wm_toolbar %d\n", appres.wm_toolbar);
fprintf(fp, "#jump_pointer %d\n", appres.jump_pointer);
@@ -3363,7 +3363,7 @@ static void ShowBalloon(Widget w, XEvent *event, String *pars, Cardinal *n_pars)
autoclick_id = XtAppAddTimeOut(app_con, (long)appres.autoclick_delay,
(XtTimerCallbackProc)Autoclick, (XtPointer)w);
- if (appres.debug) fprintf(stderr, "ShowBalloon: auto click triggerd: %lx, %d\n",
+ if (appres.debug) fprintf(stderr, "ShowBalloon: auto click triggerd: %lx, %"PRIdPTR"\n",
(long)autoclick_id, appres.autoclick_delay);
}
value = FindFunctionKeyValue(XtName(w), TRUE);
xvkbd-3.2-fix-warn.patch:
xvkbd.c | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
--- NEW FILE xvkbd-3.2-fix-warn.patch ---
diff --git a/xvkbd.c b/xvkbd.c
index 19da912..59f3d49 100644
--- a/xvkbd.c
+++ b/xvkbd.c
@@ -52,9 +52,7 @@
# include <X11/Xlocale.h>
#endif
-#ifdef USE_XTEST
# include <X11/extensions/XTest.h>
-#endif
#include "resources.h"
#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.2)"
@@ -472,7 +470,7 @@ static Window focused_subwindow = None;
static Pixmap xvkbd_pixmap = None;
static int AddKeysym(KeySym keysym, Boolean top); /* forward */
-static void SendString(const unsigned char *str);
+static void SendString(const char *str);
static void MakeKeyboard(Boolean remake);
static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);
static void MakeSunFunctionKey(Widget form, Widget from_vert, Widget from_horiz);
@@ -774,7 +772,9 @@ static int MyErrorHandler(Display *my_dpy, XErrorEvent *event)
*/
static void SendEvent(XKeyEvent *event)
{
+#ifdef USE_XTEST
static Boolean first = TRUE;
+#endif
if (!appres.no_sync) {
XSync(event->display, FALSE);
@@ -1379,9 +1379,9 @@ static void PopupCompletionPanel(void)
*/
static void KeyPressed(Widget w, char *key, char *data);
-static void SendString(const unsigned char *str)
+static void SendString(const char *str)
{
- const unsigned char *cp, *cp2; /* I remember "unsigned" might be required for some systems */
+ const char *cp, *cp2; /* I remember "unsigned" might be required for some systems */
char key[50];
int len;
int val;
@@ -1781,7 +1781,7 @@ static void SetWindowManagerHint(Boolean initial)
FALSE, SubstructureNotifyMask | SubstructureRedirectMask,
(XEvent *)&ev);
if (appres.debug)
- fprintf(stderr, "SetWindowManagerHint: _NET_WM_STATE_ABOVE = %d\n", ev.data.l[0]);
+ fprintf(stderr, "SetWindowManagerHint: _NET_WM_STATE_ABOVE = %ld\n", ev.data.l[0]);
}
}
@@ -2132,7 +2132,10 @@ static void MenuSelected(Widget w, char *key)
Widget form;
if (strcmp(key, "man") == 0) {
- if (!appres.secure) system(appres.show_manual_command);
+ if (!appres.secure) {
+ int ret = system(appres.show_manual_command);
+ (void) ret;
+ }
} else if (strcmp(key, "about") == 0) {
if (about_panel == None) {
about_panel = XtVaCreatePopupShell("about_panel", transientShellWidgetClass,
@@ -2292,7 +2295,7 @@ static void IconifyWindow(Widget w, Boolean iconify)
}
}
-static void SignalUser1(void)
+static void SignalUser1(int ignore)
{
XWindowAttributes attr;
XGetWindowAttributes(dpy, XtWindow(toplevel), &attr);
@@ -2325,7 +2328,7 @@ static void KeyPressed(Widget w, char *key, char *data)
if (appres.debug) fprintf(stderr, "Assigned string: %s\n", value);
if (value[0] == '!') {
if (appres.debug) fprintf(stderr, "Launching: %s\n", value + 1);
- if (!appres.secure) system(value + 1);
+ if (!appres.secure) { int ret = system(value + 1); (void) ret; }
} else {
if (value[0] == '\\') value = value + 1;
if (appres.debug) fprintf(stderr, "Sending: %s\n", value);
@@ -2489,9 +2492,15 @@ static void KeyPressed(Widget w, char *key, char *data)
if ((cur_shift & ControlMask) && (cur_shift & alt_mask)) {
if (strstr(XServerVendor(dpy), "XFree86") != NULL) {
if (strcmp(key1, "KP_Add") == 0) {
- if (!appres.secure) system("xvidtune -next");
+ if (!appres.secure) {
+ int ret = system("xvidtune -next");
+ (void) ret;
+ }
} else if (strcmp(key1, "KP_Subtract") == 0) {
- if (!appres.secure) system("xvidtune -prev");
+ if (!appres.secure) {
+ int ret = system("xvidtune -prev");
+ (void) ret;
+ }
}
}
}
@@ -3046,7 +3055,7 @@ static void ReadFuncionKeys(void)
else if (strcmp(key, "jump_pointer") == 0)
appres.jump_pointer = val;
else if (strcmp(key, "dict_file") == 0) {
- sscanf(&str[1], "%*s %s", &key);
+ sscanf(&str[1], "%*s %s", (char *)&key);
strncpy(dict_filename, key, sizeof(dict_filename));
}
} else if (isalpha(str[0])) {
@@ -3418,7 +3427,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;
@@ -3466,7 +3475,9 @@ int main(int argc, char *argv[])
Boolean open_keypad_panel = FALSE;
char ch;
Window child;
+#ifdef USE_XTEST
int op, ev, err;
+#endif
argc1 = argc;
argv1 = malloc(sizeof(char *) * (argc1 + 5));
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 Feb 2010 15:07:28 -0000 1.3
+++ .cvsignore 22 May 2010 02:18:10 -0000 1.4
@@ -1 +1 @@
-xvkbd-3.1.tar.gz
+xvkbd-3.2.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log 28 Feb 2010 06:39:38 -0000 1.7
+++ import.log 22 May 2010 02:18:10 -0000 1.8
@@ -5,3 +5,4 @@ xvkbd-3_1-2_fc12:HEAD:xvkbd-3.1-2.fc12.s
xvkbd-3_1-3_fc12:HEAD:xvkbd-3.1-3.fc12.src.rpm:1265392876
xvkbd-3_1-4_fc12:HEAD:xvkbd-3.1-4.fc12.src.rpm:1265457434
xvkbd-3_1-5_fc12:HEAD:xvkbd-3.1-5.fc12.src.rpm:1267339155
+xvkbd-3_2-1_fc13:HEAD:xvkbd-3.2-1.fc13.src.rpm:1274494642
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Feb 2010 15:07:28 -0000 1.3
+++ sources 22 May 2010 02:18:10 -0000 1.4
@@ -1 +1 @@
-d1905b22bf134b9abba27444adc2bec0 xvkbd-3.1.tar.gz
+1bce8d6c27e6e7df92ec09b414f82dad xvkbd-3.2.tar.gz
Index: xvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/xvkbd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xvkbd.spec 28 Feb 2010 06:39:39 -0000 1.7
+++ xvkbd.spec 22 May 2010 02:18:10 -0000 1.8
@@ -1,7 +1,7 @@
Summary: Virtual Keyboard for X Window System
Name: xvkbd
-Version: 3.1
-Release: 5%{?dist}
+Version: 3.2
+Release: 1%{?dist}
License: GPLv2+
Group: User Interface/X
Source0: http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
@@ -16,21 +16,21 @@ BuildRequires: imake
Source1: %{name}.desktop
# The following icon is licensed under CC BY-SA 3.0.
Source2: http://jaist.dl.sourceforge.jp/xvkbd-fedora/45742/%{name}.png
-Patch0: %{name}-3.1-fix-warn.patch
-Patch1: %{name}-3.1-fix-warn-64bit.patch
+Patch0: %{name}-3.2-fix-warn.patch
+Patch1: %{name}-3.2-fix-warn-64bit.patch
%description
xvkbd is a virtual (graphical) keyboard program for X Window System
which provides facility to enter characters onto other clients
-(softwares) by clicking on a keyboard displayed on the screen. This
+(software) by clicking on a keyboard displayed on the screen. This
may be used for systems without a hardware keyboard such as kiosk
-terminals or handheld devices. This program also has facility to send
+terminals or hand-held devices. This program also has facility to send
characters specified as the command line option to another client.
%prep
%setup -q
-%patch0 -p1 -b .3.1-fix-warn
-%patch1 -p1 -b .3.1-fix-warn-64bit
+%patch0 -p1 -b .3.2-fix-warn
+%patch1 -p1 -b .3.2-fix-warn-64bit
%build
xmkmf -a
@@ -63,6 +63,9 @@ desktop-file-install --dir=%{buildroot}%
%{_datadir}/applications/%{name}.desktop
%changelog
+* Thu May 18 2010 Akio Idehara <zbe64533 at gmail.com> 3.2-1
+- Update to 3.2
+
* Sun Feb 28 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-5
- Rebuild for F13
--- xvkbd-3.1-fix-warn-64bit.patch DELETED ---
--- xvkbd-3.1-fix-warn.patch DELETED ---
- Previous message: File xvkbd-3.2.tar.gz uploaded to lookaside cache by idak
- Next message: rpms/xvkbd/F-13 xvkbd-3.2-fix-warn-64bit.patch, NONE, 1.1 xvkbd-3.2-fix-warn.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.8, 1.9 sources, 1.3, 1.4 xvkbd.spec, 1.7, 1.8 xvkbd-3.1-fix-warn-64bit.patch, 1.2, NONE xvkbd-3.1-fix-warn.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list