oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

CTRL conflict

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@296 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-03-15 08:38:38 +00:00
parent 07d360d5a0
commit 5d0c95a028
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/xnlock/xnlock.c
View File

@@ -55,8 +55,8 @@ char STRING[] = "****************";
#define FRONT 020 #define FRONT 020
#define X_INCR 3 #define X_INCR 3
#define Y_INCR 2 #define Y_INCR 2
#define CTRL 1 #define XNLOCK_CTRL 1
#define NOCTRL 0 #define XNLOCK_NOCTRL 0
XtAppContext app; XtAppContext app;
Display *dpy; Display *dpy;
@@ -540,7 +540,7 @@ GetPasswd(Widget w, XEvent *_event, String *_s, Cardinal *_n)
XKeyEvent *event = (XKeyEvent *)_event; XKeyEvent *event = (XKeyEvent *)_event;
static char passwd[MAX_PASSWD_LENGTH]; static char passwd[MAX_PASSWD_LENGTH];
static int cnt; static int cnt;
static int is_ctrl = NOCTRL; static int is_ctrl = XNLOCK_NOCTRL;
char c; char c;
KeySym keysym; KeySym keysym;
@@ -563,14 +563,14 @@ GetPasswd(Widget w, XEvent *_event, String *_s, Cardinal *_n)
if (event->type == KeyRelease) { if (event->type == KeyRelease) {
keysym = XLookupKeysym(event, 0); keysym = XLookupKeysym(event, 0);
if (keysym == XK_Control_L || keysym == XK_Control_R) { if (keysym == XK_Control_L || keysym == XK_Control_R) {
is_ctrl = NOCTRL; is_ctrl = XNLOCK_NOCTRL;
} }
} }
if (event->type != KeyPress) if (event->type != KeyPress)
return; return;
keysym = XLookupKeysym(event, 0); keysym = XLookupKeysym(event, 0);
if (keysym == XK_Control_L || keysym == XK_Control_R) { if (keysym == XK_Control_L || keysym == XK_Control_R) {
is_ctrl = CTRL; is_ctrl = XNLOCK_CTRL;
return; return;
} }
if (!XLookupString(event, &c, 1, &keysym, 0)) if (!XLookupString(event, &c, 1, &keysym, 0))
@@ -644,7 +644,7 @@ GetPasswd(Widget w, XEvent *_event, String *_s, Cardinal *_n)
if (keysym == XK_BackSpace || keysym == XK_Delete || keysym == XK_Left) { if (keysym == XK_BackSpace || keysym == XK_Delete || keysym == XK_Left) {
if (cnt) if (cnt)
passwd[cnt--] = ' '; passwd[cnt--] = ' ';
} else if (keysym == XK_u && is_ctrl == CTRL) { } else if (keysym == XK_u && is_ctrl == XNLOCK_CTRL) {
while (cnt) { while (cnt) {
passwd[cnt--] = ' '; passwd[cnt--] = ' ';
XDrawImageString(dpy, XtWindow(w), gc, XDrawImageString(dpy, XtWindow(w), gc,