v09i061: xicon, Patch1, Part01/01

[trost%REED.BITNET at CORNELLC.cit.cornell.edu]

Submitted-by: trost%REED.BITNET at CORNELLC.cit.cornell.edu
Posting-number: Volume 9, Issue 61
Archive-name: xicon/patch1
Patch-To: xicon: Volume 9, Issue 47

*** /tmp/,RCSt1007886   Fri Sep 28 11:37:13 1990
--- patchlevel.h        Fri Sep 28 11:28:53 1990
***************
*** 1
! #define PATCHLEVEL 0

--- 1 -----
! #define PATCHLEVEL 1
*** /tmp/,RCSt1007886   Fri Sep 28 11:37:15 1990
--- xicon.c     Fri Sep 28 11:36:56 1990
***************
*** 222,227
        *process = old->next;
        XUnmapWindow(display, old->window);
        XMapWindow(display, old->window);
        if (XFindContext(display, old->window, icons,
                         (caddr_t) &icon) != XCSUCCESS) {
            fprintf(stderr, "Programmer error --- lost an icon!\n");

--- 222,233 -----
        *process = old->next;
        XUnmapWindow(display, old->window);
        XMapWindow(display, old->window);
+
+       /*
+         Thanks to jik at pit-manager.mit.edu for the correct cast in
+         XFindContext.  I just *couldn't* figure out what gcc was
+         complaining about....
+        */
        if (XFindContext(display, old->window, icons,
                         (caddr_t*) &icon) != XCSUCCESS) {
            fprintf(stderr, "Programmer error --- lost an icon!\n");
***************
*** 223,229
        XUnmapWindow(display, old->window);
        XMapWindow(display, old->window);
        if (XFindContext(display, old->window, icons,
!                        (caddr_t) &icon) != XCSUCCESS) {
            fprintf(stderr, "Programmer error --- lost an icon!\n");
            abort();
        }

--- 229,235 -----
          complaining about....
         */
        if (XFindContext(display, old->window, icons,
!                        (caddr_t*) &icon) != XCSUCCESS) {
            fprintf(stderr, "Programmer error --- lost an icon!\n");
            abort();
        }
***************
*** 249,255
      XUnmapEvent sendEvent;

      if (XFindContext(event->display, event->window, icons,
!                    (caddr_t) &icon) != XCSUCCESS) {
        fprintf(stderr, "Programmer error --- lost an icon!\n");
        abort();
      }

--- 255,261 -----
      XUnmapEvent sendEvent;

      if (XFindContext(event->display, event->window, icons,
!                    (caddr_t*) &icon) != XCSUCCESS) {
        fprintf(stderr, "Programmer error --- lost an icon!\n");
        abort();
      }
***************
*** 314,320
  {
      switch (event->type) {
      case MapNotify:
!       AddProcess(event, icons);
        break;
      case UnmapNotify:
      case ReparentNotify:

--- 320,326 -----
  {
      switch (event->type) {
      case MapNotify:
!       AddProcess(&event->xmap, icons);
        break;
      case UnmapNotify:
      case ReparentNotify:
***************
*** 381,387
      /*
        Some machines (e.g., Tek 4317) start processes with some bogus
        sigmask.  If I were trying to port this program and sigsetmask
!       failed to link, I'd comment out the following line....
       */
      sigsetmask(0);


--- 387,393 -----
      /*
        Some machines (e.g., Tek 4317) start processes with some bogus
        sigmask.  If I were trying to port this program and sigsetmask
!       failed to link, I'd remove the following lines....
       */

  #ifndef SYSV
***************
*** 383,388
        sigmask.  If I were trying to port this program and sigsetmask
        failed to link, I'd comment out the following line....
       */
      sigsetmask(0);

      for (;;) {

--- 389,396 -----
        sigmask.  If I were trying to port this program and sigsetmask
        failed to link, I'd remove the following lines....
       */
+
+ #ifndef SYSV
      sigsetmask(0);
  #endif

***************
*** 384,389
        failed to link, I'd comment out the following line....
       */
      sigsetmask(0);

      for (;;) {
        int i;

--- 392,398 -----

  #ifndef SYSV
      sigsetmask(0);
+ #endif

      for (;;) {
        int i;


dan
----------------------------------------------------
O'Reilly && Associates   argv at sun.com / argv at ora.com
Opinions expressed reflect those of the author only.