Attachment 1599 Details for Bug 2165 – Patch for chooser.c and Chooser.ad

[patch] Patch for chooser.c and Chooser.ad

xdm.diff (text/plain), 5.05 KB, created by Thomas Reifferscheid on 2004-12-28 09:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Reifferscheid

Created: 2004-12-28 09:13:27 UTC

Size: 5.05 KB

patch

obsolete

>--- xc.orig/programs/xdm/Chooser.ad	2004-04-23 21:54:42.000000000 +0200
>+++ xc.new/programs/xdm/Chooser.ad	2004-12-28 16:50:46.000000000 +0100
>@@ -17,8 +17,13 @@
> *viewport.allowResize:	true
> 
> *list.translations:	#override \
>-	<BtnDown>:	Set() CheckWilling() \n\
>-	<BtnUp>(2):	Accept()
>+	<Key>Return:    Accept() \n\
>+	<Key>:          KeySwitch() \n\
>+	<Btn1Down>:     Store() Set() CheckWilling() Setold() \n\
>+	<Btn1Up>(2):    Accept() \n\
>+	<Btn4Down>:     BtnSwitch() \n\
>+	<Btn5Down>:     BtnSwitch()
>+
> *list.defaultColumns:	1
> *list.forceColumns:	true
> 
>--- xc.orig/programs/xdm/chooser.c	2004-04-23 21:54:42.000000000 +0200
>+++ xc.new/programs/xdm/chooser.c	2004-12-28 16:03:58.000000000 +0100
>@@ -135,8 +135,10 @@
> #endif /* hpux */
> 
> #include    <netdb.h>
>+#include    <X11/keysym.h>
> 
> static int FromHex (char *s, char *d, int len);
>+static int oldline;
> 
> Widget	    toplevel, label, viewport, paned, list, box, cancel, acceptit, ping;
> 
>@@ -996,6 +998,173 @@
>     }
> }
> 
>+/*
>+  next_line returns the next line in a list
>+  across the list end.
>+  (0, 1, 2, 3, 0, 1, 2, 3 ....)
>+*/
>+
>+static int 
>+next_line(unsigned int current, unsigned int size, int event)
>+{
>+  switch(event) {
>+    case Button5:
>+      return (current + 1) % size;
>+    case Button4:
>+      return (current + size - 1) % size;
>+    case XK_Down:
>+      return (current + 1) % size;
>+    case XK_Up:
>+      return (current + size - 1) % size;
>+  }  
>+  return -1;
>+}
>+
>+/* 
>+  Hostselect selects a given chooser line.
>+  Returns 1 when host is willing and 0 if not
>+*/
>+
>+static int
>+Hostselect (int line)
>+{
>+  XawListReturnStruct	*r;
>+  HostName		*h;
>+  r = XawListShowCurrent (list);
>+  /* Assume the next host is willing */
>+  XawListHighlight (list,line);
>+  r = XawListShowCurrent (list);
>+  /* copied from DoCheckWilling */
>+  for (h = hostNamedb; h; h = h->next)
>+  {
>+    if (!strcmp (r->string, h->fullname))
>+    {
>+      if (!h->willing)
>+	XawListUnhighlight (list);
>+      else
>+        return 1;
>+    }
>+  } 
>+  return 0; 
>+}
>+
>+/* 
>+  Selectfirst selects the first willing host
>+  in the chooser list (so you can select a host without
>+  presence of mouse, but with pressing space or return,
>+  or XK_Down / XK_Up
>+*/
>+
>+static void
>+Selectfirst (void)
>+{
>+  int line;
>+  
>+  for (line = 0; line < NameTableSize; line++)
>+  {
>+    if (Hostselect(line))
>+      return;
>+  }        
>+  return;
>+}
>+
>+/*
>+  Storeold stores the selected line into global int oldentry
>+*/
>+
>+static void
>+Storeold (Widget w, XEvent *event, String *params, Cardinal *num_params)
>+{
>+  oldline = (XawListShowCurrent(list))->list_index;
>+}
>+
>+/*
>+  Setold restores the global int oldentry 
>+  when you try to select a host with your mouse
>+  who is unwilling as follows:
>+  <Btn1Down>:     Store() Set() CheckWilling() Setold() \n\
>+*/
>+
>+static void
>+Setold (Widget w, XEvent *event, String *params, Cardinal *num_params)
>+{
>+
>+  if ( (XawListShowCurrent(list))->list_index == XAW_LIST_NONE && oldline != XAW_LIST_NONE)
>+    XawListHighlight (list, oldline);
>+}
>+
>+/*
>+  HostCycle tries to select the next willing host across
>+  the list end and will stop at the first found willing host
>+  or after trying all entries.
>+*/
>+
>+static void
>+HostCycle(unsigned int line, unsigned int size, KeySym keysym)
>+{
>+  unsigned int newline = line;
>+  /* Do it only once around the chooser list, either direction */
>+  while ( (newline = next_line(newline,size,keysym)) != line && newline != -1)
>+  {
>+    if (Hostselect(newline))
>+      return;
>+  }
>+  /* No other willing host could be found, stay at the old one*/
>+  XawListHighlight (list, line);
>+  return;
>+}
>+
>+/*
>+  Switch_Key handles XK_Up and XK_Down
>+  and highlights an appropriate line in the chooser list.
>+*/
>+
>+static void
>+Switch_Key (Widget w, XEvent *event, String *params, Cardinal *num_params)
>+{
>+  char strbuf[128];
>+  KeySym keysym = 0;
>+  static XComposeStatus compose_status = {NULL, 0};
>+  XawListReturnStruct	*r;
>+
>+  XLookupString (&event->xkey, strbuf, sizeof (strbuf),
>+                           &keysym, &compose_status);    
>+
>+  if (keysym != XK_Up && keysym != XK_Down)
>+    return;
>+
>+  r = XawListShowCurrent (list);
>+    
>+  if (r->list_index == XAW_LIST_NONE)
>+    Selectfirst();
>+  else
>+    HostCycle(r->list_index,NameTableSize,keysym);
>+
>+  return;
>+}
>+
>+
>+
>+/*
>+  Switch_Btn handles ScrollWheel Forward (Button5) and Backward
>+  (Button4) and highlights an appropriate line in the chooser list.
>+*/
>+
>+static void
>+Switch_Btn (Widget w, XEvent *event, String *params, Cardinal *num_params)
>+{
>+    XawListReturnStruct	*r;
>+    r = XawListShowCurrent (list);
>+    
>+    if (r->list_index == XAW_LIST_NONE)
>+      Selectfirst();
>+    else
>+      HostCycle(r->list_index,NameTableSize,event->xbutton.button);
>+
>+  return;
>+}
>+
>+
> /* ARGSUSED */
> static void
> DoAccept (Widget w, XEvent *event, String *params, Cardinal *num_params)
>@@ -1058,6 +1227,10 @@
>     { "Cancel",	      DoCancel },
>     { "CheckWilling", DoCheckWilling },
>     { "Ping",	      DoPing },
>+    { "KeySwitch",    Switch_Key },
>+    { "BtnSwitch",    Switch_Btn },
>+    { "Store",	      Storeold },
>+    { "Setold",	      Setold },    
> };
> 
> int

Actions: View | Splinter Review

Attachments on bug 2165: 1599 | 2754

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.