Remove unused HP_EXTENSIONS code blocks

diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c
index 753456c23fcd5fd0676f8c3ef4d0696a1314e23c..b1581194fd68b954782f44acdb19d4e4683a67cf 100644 (file)
--- a/cde/programs/dtcalc/motif.c
+++ b/cde/programs/dtcalc/motif.c
@@ -48,19 +48,6 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
-
-/*
-  #include <wchar.h>
-  #include <mbstr.h>
-  */
-
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-#include <X11/XHPlib.h>
-#include <X11/HPkeysym.h>
-#include <X11/Xutil.h>
-#endif
-
 #include <Xm/XmP.h>
 #include <Xm/Xm.h>
 #include <Xm/DrawingA.h>
@@ -206,11 +193,6 @@ void move_cf          P((Widget, XtPointer, XtPointer)) ;
 void FocusInCB        P((Widget, XtPointer, XtPointer)) ;
 void map_popup        P((Widget, XtPointer, XtPointer)) ;
 
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-static int GetKeyboardID           P(()) ;
-#endif
-
 static int event_is_keypad         P((XEvent *)) ;
 static int get_next_event          P((Widget, int, XEvent *)) ;
 static int is_window_showing       P((Widget)) ;
@@ -339,11 +321,6 @@ main(int argc, char **argv)
   /*  Get the dt path created and initialized  */
   dt_path = _DtCreateDtDirs (X->dpy);
 
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-  v->keybdID = GetKeyboardID();
-#endif
-
   init_colors() ;             /* get the pixels for the default colors in DT */
   if(pixels[0].bg == white_pixel || pixels[0].bg == black_pixel)
     BlackWhite = True;
@@ -1961,13 +1938,6 @@ get_next_event(Widget widget, int ev_action, XEvent *xevent)
       else if (ksym == XK_F10  && up) return(F4_PRESS);
       else if (ksym == XK_Tab  && down) return(TAB);
       else if (ksym == XK_Tab  && up) return(TAB);
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-      else if (ksym == XK_BackTab  && down) return(SHIFT);
-      else if (ksym == XK_BackTab  && up) return(SHIFT);
-      else if (ksym == hpXK_DeleteChar  && down) cval = 127;
-      else if (ksym == hpXK_DeleteChar  && up) cval = 127;
-#endif
       else if (ksym == XK_Return && down) cval = KEY_EQ;
       else if (ksym == XK_Return && up) cval = KEY_EQ;
       else if (ksym == XK_Escape && down) return(ESCAPE);
@@ -4567,63 +4537,6 @@ TimerEvent( XtPointer client_data, XtIntervalId *id)
   }
 }
 
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-static int
-GetKeyboardID(void)
-{
-    XHPDeviceList *list, *slist;
-    int ndevices = 0, i, kbd = 0;
-
-    slist = XHPListInputDevices(X->dpy, &ndevices);
-    for (i = 0, list = slist; i < ndevices; i++, list++)
-    {
-       if (list->type != KEYBOARD && strcmp(list->name, PS2_DIN_NAME))
-          continue;
-       if (list->detailed_id & (HP_ITF_KBD | HP_HIL) == (HP_ITF_KBD | HP_HIL))
-       {
-          kbd = HIL_ITF_KBD;
-          return(kbd);
-       }
-       else if (list->detailed_id & (PC101_KBD|HP_HIL) == (PC101_KBD|HP_HIL))
-       {
-          kbd = HIL_PC101_KBD;
-          return(kbd);
-       }
-       else if (list->detailed_id & (PC101_KBD|SERIAL) == (PC101_KBD|SERIAL))
-       {
-          kbd = SERIAL_PC101_KBD;
-          return(kbd);
-       }
-
-       if (!kbd)
-       {
-          if (strcmp(list->name, PS2_DIN_NAME) == 0)
-          {
-             kbd = SERIAL_PC101_KBD;
-             return(kbd);
-          }
-         else if (list->hil_id >= FIRST_HIL_KBD &&
-                                            list->hil_id <= LAST_HIL_KBD)
-          {
-             if (list->io_byte & LED_BITS)
-            {
-               kbd = HIL_PC101_KBD;
-                return(kbd);
-            }
-            else
-            {
-               kbd = HIL_ITF_KBD;
-                return(kbd);
-            }
-          }
-       }
-    }
-    XHPFreeDeviceList (slist);
-    return(0);
-}
-#endif
-
 static char *
 _DtcalcStripSpaces(char *file)
 {

diff --git a/cde/programs/dtcalc/text.c b/cde/programs/dtcalc/text.c
index bd64772048d0a0cf3fc0cf7bb0680170b74e8788..9afc6ca8390b2865258c0671544ed961e78a18a0 100644 (file)
--- a/cde/programs/dtcalc/text.c
+++ b/cde/programs/dtcalc/text.c
@@ -232,16 +232,7 @@ init_text(void)   /* Setup text strings depending upon language. */
   read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 69, "^h - Bsp"))) ;
 
 /* del */
-/* #ifdef hpux */
-#ifdef HP_EXTENSIONS
-  if(v->keybdID == HIL_ITF_KBD)
-     read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 512, "clr disp"))) ;
-  else
-     read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 70, "del - Clr"))) ;
-#else
   read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 70, "del - Clr"))) ;
-#endif
-
 
   read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 71, "d"))) ;
   read_str(&buttons[i++].str2, LGET(GETMESSAGE(3, 72, "e"))) ;

diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c
index 1dbaee1b29dae5b24f4810ecace1c55ea33ebf61..323478b3f15c5e19cf857bc543250225e9acddc3 100644 (file)
--- a/cde/programs/dtlogin/vgmain.c
+++ b/cde/programs/dtlogin/vgmain.c
@@ -482,9 +482,6 @@ main( int argc, char **argv )
     /*
      * prevent the toolkit from starting the NLIO server...
      */
-#ifdef HP_EXTENSIONS
-    _XHPNlioctl(0,0,-1,0);
-#endif
 #ifdef VG_TRACE
     vg_TRACE_EXECUTION("main:  exited _XHPNlioctl ...");
 #endif /* VG_TRACE */