unifdef -Unotyet

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 0 insertions, 243 deletions

diff --git a/printev.c b/printev.c
index a66237f..f90fd38 100644
--- a/printev.c
+++ b/printev.c
@@ -324,241 +324,6 @@ do_XkbExtensionDeviceNotify(FILE *file, XkbEvent *xkbev)
     return;
 }
 
-#ifdef notyet
-static	char keyState[XkbMaxLegalKeyCode];
-
-static void
-do_KeyEvent(XkbEvent *eventp, int compose, int repeat)
-{
-    XKeyEvent *e = &eventp->core.xkey;
-    KeySym ks;
-    char *ksname,*kname;
-    int nbytes;
-    char str[256+1];
-    static XComposeStatus status;
-
-    nbytes = XLookupString (e, str, 256, &ks, (compose?&status:NULL));
-    if (ks == NoSymbol)
-	ksname = "NoSymbol";
-    else if (!(ksname = XKeysymToString (ks)))
-	ksname = "(no name)";
-    printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
-	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
-
-    if (xkb && xkb->names && xkb->names->keys)
-	 kname= XkbKeyNameText(xkb->names->keys[e->keycode].name,XkbMessage);
-    else kname= "<???""?>";	/* XXX break trigraph */
-
-    printf ("    state 0x%x, group= %d, key %s (keycode %u, keysym 0x%x, %s)\n",
-	    	e->state&0x1FFF, (e->state>>13)&0x7, kname,
-		e->keycode, (unsigned int)ks, ksname);
-    printf ("    same_screen %s, autorepeat %s,\n",ynText(e->same_screen),
-			(detectableRepeat ? ynText(repeat) : "UNKNOWN"));
-    if (nbytes < 0) nbytes = 0;
-    if (nbytes > 256) nbytes = 256;
-    str[nbytes] = '\0';
-    printf ("    XLookupString gives %d characters:  \"%s\"\n", nbytes, str);
-
-    return;
-}
-
-static void
-do_KeyPress(XkbEvent *eventp)
-{
-int	repeat;
-
-    repeat= keyState[eventp->core.xkey.keycode]!=0;
-    keyState[eventp->core.xkey.keycode]= 1;
-    do_KeyEvent (eventp, 1,repeat);
-    return;
-}
-
-static void
-do_KeyRelease(XkbEvent *eventp)
-{
-    keyState[eventp->core.xkey.keycode]= 0;
-    do_KeyEvent (eventp,0,False);
-    return;
-}
-
-static void
-do_ButtonPress(XkbEvent *eventp)
-{
-    XButtonEvent *e = &eventp->core.xbutton;
-
-    printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
-	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
-    printf ("    state 0x%x, group= %d, button %u, same_screen %s\n",
-	    e->state&0x1FFF, (e->state>>13)&0x7, e->button,
-	    ynText(e->same_screen));
-
-    return;
-}
-
-static void
-do_ButtonRelease(XkbEvent *eventp)
-{
-    do_ButtonPress (eventp);		/* since it has the same info */
-    return;
-}
-
-static void
-do_MotionNotify(XkbEvent *eventp)
-{
-    XMotionEvent *e = &eventp->core.xmotion;
-
-    printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
-	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
-    printf ("    state 0x%x, group= %d, is_hint %u, same_screen %s\n",
-	    e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
-	    ynText(e->same_screen));
-
-    return;
-}
-
-static void
-do_EnterNotify(XkbEvent *eventp)
-{
-    XCrossingEvent *e = &eventp->core.xcrossing;
-    char *mode, *detail;
-    char dmode[10], ddetail[10];
-
-    switch (e->mode) {
-      case NotifyNormal:  mode = "NotifyNormal"; break;
-      case NotifyGrab:  mode = "NotifyGrab"; break;
-      case NotifyUngrab:  mode = "NotifyUngrab"; break;
-      case NotifyWhileGrabbed:  mode = "NotifyWhileGrabbed"; break;
-      default:  mode = dmode, sprintf (dmode, "%u", e->mode); break;
-    }
-
-    switch (e->detail) {
-      case NotifyAncestor:  detail = "NotifyAncestor"; break;
-      case NotifyVirtual:  detail = "NotifyVirtual"; break;
-      case NotifyInferior:  detail = "NotifyInferior"; break;
-      case NotifyNonlinear:  detail = "NotifyNonlinear"; break;
-      case NotifyNonlinearVirtual:  detail = "NotifyNonlinearVirtual"; break;
-      case NotifyPointer:  detail = "NotifyPointer"; break;
-      case NotifyPointerRoot:  detail = "NotifyPointerRoot"; break;
-      case NotifyDetailNone:  detail = "NotifyDetailNone"; break;
-      default:  detail = ddetail; sprintf (ddetail, "%u", e->detail); break;
-    }
-
-    printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
-	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
-    printf ("    mode %s, detail %s, same_screen %s,\n",
-	    mode, detail, ynText(e->same_screen));
-    printf ("    focus %s, state %u, group= %d\n", ynText(e->focus),
-	    e->state&0x1FFF, (e->state>>13)&7 );
-
-    return;
-}
-
-static void
-do_LeaveNotify(XkbEvent *eventp)
-{
-    do_EnterNotify (eventp);		/* since it has same information */
-    return;
-}
-
-static void
-do_KeymapNotify(XkbEvent *eventp)
-{
-    XKeymapEvent *e = &eventp->core.xkeymap;
-    int i;
-
-    printf ("    keys:  ");
-    for (i = 0; i < 32; i++) {
-	if (i == 16) printf ("\n           ");
-	printf ("%-3u ", (unsigned int) e->key_vector[i]);
-    }
-    printf ("\n");
-    return;
-}
-
-static void
-do_ClientMessage(XkbEvent *eventp)
-{
-    XClientMessageEvent *e = &eventp->core.xclient;
-    char *mname = XGetAtomName (dpy, e->message_type);
-
-    printf ("    message_type 0x%lx (%s), format %d\n",
-	    e->message_type, mname ? mname : Unknown, e->format);
-
-    if (mname) XFree (mname);
-    return;
-}
-
-static void
-do_MappingNotify(XkbEvent *eventp)
-{
-    XMappingEvent *e = &eventp->core.xmapping;
-    char *r;
-    char rdummy[10];
-
-    switch (e->request) {
-      case MappingModifier:  r = "MappingModifier"; break;
-      case MappingKeyboard:  r = "MappingKeyboard"; break;
-      case MappingPointer:  r = "MappingPointer"; break;
-      default:  r = rdummy; sprintf (rdummy, "%d", e->request); break;
-    }
-
-    printf ("    request %s, first_keycode %d, count %d\n",
-	    r, e->first_keycode, e->count);
-    XRefreshKeyboardMapping(e);
-    return;
-}
-
-
-static void
-set_sizehints(XSizeHints *hintp, int min_width, int min_height,
-	      int defwidth, int defheight, int defx, int defy, char *geom)
-{
-    int geom_result;
-
-    /* set the size hints, algorithm from xlib xbiff */
-
-    hintp->width = hintp->min_width = min_width;
-    hintp->height = hintp->min_height = min_height;
-    hintp->flags = PMinSize;
-    hintp->x = hintp->y = 0;
-    geom_result = NoValue;
-    if (geom != NULL) {
-        geom_result = XParseGeometry (geom, &hintp->x, &hintp->y,
-				      (unsigned int *)&hintp->width,
-				      (unsigned int *)&hintp->height);
-	if ((geom_result & WidthValue) && (geom_result & HeightValue)) {
-#define max(a,b) ((a) > (b) ? (a) : (b))
-	    hintp->width = max (hintp->width, hintp->min_width);
-	    hintp->height = max (hintp->height, hintp->min_height);
-	    hintp->flags |= USSize;
-	}
-	if ((geom_result & XValue) && (geom_result & YValue)) {
-	    hintp->flags += USPosition;
-	}
-    }
-    if (!(hintp->flags & USSize)) {
-	hintp->width = defwidth;
-	hintp->height = defheight;
-	hintp->flags |= PSize;
-    }
-/*
-    if (!(hintp->flags & USPosition)) {
-	hintp->x = defx;
-	hintp->y = defy;
-	hintp->flags |= PPosition;
-    }
- */
-    if (geom_result & XNegative) {
-	hintp->x = DisplayWidth (dpy, DefaultScreen (dpy)) + hintp->x -
-		    hintp->width;
-    }
-    if (geom_result & YNegative) {
-	hintp->y = DisplayHeight (dpy, DefaultScreen (dpy)) + hintp->y -
-		    hintp->height;
-    }
-    return;
-}
-#endif
 
 void
 PrintXkbEvent(FILE *file, XkbEvent *ev)
diff --git a/utils.h b/utils.h
index d4273ef..9c05b87 100644
--- a/utils.h
+++ b/utils.h
@@ -76,14 +76,6 @@ typedef	int		Comparison;
 #define	comparisonText(c)	((c)?((c)<0?"Less":"Greater"):"Equal")
 #endif
 
-#ifdef notyet
-typedef union {
-	int		 i;
-	unsigned	 u;
-	void		*p;
-	void		*(*fp)();
-} Union;
-#endif
 
 /***====================================================================***/