[Squeak-Commits] squeak/platforms/unix/vm-display-X11 sqUnixX11.c,1.12,1.12.2.1

[Ned K. <ne...@us...>]

Update of /cvsroot/squeak/squeak/platforms/unix/vm-display-X11
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/vm-display-X11

Modified Files:
      Tag: ned-branch
	sqUnixX11.c 
Log Message:

Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz


Index: sqUnixX11.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm-display-X11/sqUnixX11.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** sqUnixX11.c	16 Sep 2003 07:55:04 -0000	1.12
--- sqUnixX11.c	21 Nov 2003 02:40:18 -0000	1.12.2.1
***************
*** 83,86 ****
--- 83,87 ----
  #undef	FULL_UPDATE_ON_EXPOSE
  
+ /*
  #undef	DEBUG_CONV
  #undef	DEBUG_EVENTS
***************
*** 88,91 ****
--- 89,93 ----
  #undef	DEBUG_BROWSER
  #undef	DEBUG_WINDOW
+ */
  
  #if defined(HAVE_LIBXEXT)
***************
*** 608,615 ****
         * Qt/KDE apps) don't accept pastes from Squeak. Of course, they'll use
         * UTF8_STRING anyway... */
!       Atom targets[]= {
! 	xaTargets,    xaMultiple, xaTimestamp,	        /* required by ICCCM */
! 	xaUTF8String, XA_STRING,  xaCompoundText
!       };
  
        xError= XChangeProperty(requestEv->display, requestEv->requestor,
--- 610,620 ----
         * Qt/KDE apps) don't accept pastes from Squeak. Of course, they'll use
         * UTF8_STRING anyway... */
!       Atom targets[6];
!       targets[0]= xaTargets;
!       targets[1]= xaMultiple;
!       targets[2]= xaTimestamp;	        /* required by ICCCM */
!       targets[3]= xaUTF8String;
!       targets[4]= XA_STRING;
!       targets[5]= xaCompoundText;
  
        xError= XChangeProperty(requestEv->display, requestEv->requestor,
***************
*** 622,627 ****
        int	    len=    strlen(stPrimarySelection);
        char	   *buf=    (char *)malloc(len * 3 + 1);
-       char	   *list[]= { buf, NULL };
        XTextProperty textProperty;
  
        /* convert our locale text to CTEXT */
--- 627,635 ----
        int	    len=    strlen(stPrimarySelection);
        char	   *buf=    (char *)malloc(len * 3 + 1);
        XTextProperty textProperty;
+       char	   *list[2];
+ 
+       list[0]= buf;
+       list[1]= NULL;
  
        /* convert our locale text to CTEXT */
***************
*** 670,674 ****
  				      &numberOfItems,
  				      &bytesAfter,
! 				      (unsigned char **)&multipleAtoms);
  	  if ((xError != Success) || (bytesAfter != 0)
  	      || (format != 32) || (type == None))
--- 678,682 ----
  				      &numberOfItems,
  				      &bytesAfter,
! 				      (void *)&multipleAtoms);
  	  if ((xError != Success) || (bytesAfter != 0)
  	      || (format != 32) || (type == None))
***************
*** 678,682 ****
  	  else
  	    {
! 	      int i;
  	      for (i= 0; i < numberOfItems; i+= 2)
  		{
--- 686,690 ----
  	  else
  	    {
! 	      unsigned long i;
  	      for (i= 0; i < numberOfItems; i+= 2)
  		{
***************
*** 766,770 ****
    XEvent  ev;
    fd_set  fdMask;
-   int	  xreturn;
    Time	  timestamp= getXTimestamp();
  
--- 774,777 ----
***************
*** 857,866 ****
  		       True, AnyPropertyType,
  		       &type, &format, &nitems, &bytesAfter,
! 		       (unsigned char **)&data);
  
  #  if defined(DEBUG_SELECTIONS)
      fprintf(stderr, "getprop type ");
      printAtomName(type);
!     fprintf(stderr, " format %d nitems %d bytesAfter %d\ndata=",
  	    format, nitems, bytesAfter);
      dumpSelectionData(data, nitems, 1);
--- 864,873 ----
  		       True, AnyPropertyType,
  		       &type, &format, &nitems, &bytesAfter,
! 		       (void *)&data);
  
  #  if defined(DEBUG_SELECTIONS)
      fprintf(stderr, "getprop type ");
      printAtomName(type);
!     fprintf(stderr, " format %d nitems %ld bytesAfter %ld\ndata=",
  	    format, nitems, bytesAfter);
      dumpSelectionData(data, nitems, 1);
***************
*** 3979,3985 ****
  static void listVisuals();
  
- static glRenderer *current= NULL;
- static glRenderer allRenderer[MAX_RENDERER];
- 
  static int visualAttributes[]= {
    GLX_STENCIL_SIZE,     0,  /* filled in later - must be first item! */
--- 3986,3989 ----
***************
*** 4009,4013 ****
  {
    XVisualInfo* visinfo= 0;
-   int index= -1;
  
    if (flags & B3D_STENCIL_BUFFER)
--- 4013,4016 ----
***************
*** 4160,4166 ****
  
        if (slow != GLX_SLOW_CONFIG)
! 	DPRINTF(3, (fp,"===> OpenGL visual\r"))
        else
! 	DPRINTF(3, (fp,"---> slow OpenGL visual\r"));
  
        DPRINTF(3, (fp,"rgbaBits = %i+%i+%i+%i\r", red, green, blue, alpha));
--- 4163,4169 ----
  
        if (slow != GLX_SLOW_CONFIG)
!         { DPRINTF(3, (fp,"===> OpenGL visual\r")) }
        else
!         { DPRINTF(3, (fp,"---> slow OpenGL visual\r")) }
  
        DPRINTF(3, (fp,"rgbaBits = %i+%i+%i+%i\r", red, green, blue, alpha));
***************
*** 4230,4235 ****
  static void display_winOpen(void)
  {
-   int sws= getSavedWindowSize();
  #if defined(DEBUG_WINDOW)
    fprintf(stderr, "saved window size is %d %d\n", sws >> 16, sws & 0xffff);
  #endif
--- 4233,4238 ----
  static void display_winOpen(void)
  {
  #if defined(DEBUG_WINDOW)
+   int sws= getSavedWindowSize();
    fprintf(stderr, "saved window size is %d %d\n", sws >> 16, sws & 0xffff);
  #endif
***************
*** 4333,4337 ****
        else if (!strcmp(arg, "-browserWindow"))
  	{
! 	  sscanf(argv[1], "%li", &browserWindow);
  	  if (browserWindow == 0)
  	    {
--- 4336,4340 ----
        else if (!strcmp(arg, "-browserWindow"))
  	{
! 	  sscanf(argv[1], "%lu", (unsigned long *)&browserWindow);
  	  if (browserWindow == 0)
  	    {