xemacs-beta: src/frame-x.c comparison

comparison src/frame-x.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	a300bb07d72d
children	bbff43aa5eb7

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 struct device *d = get_device_from_display (dpy);
 Window w = XtWindow (widget);
 int need_delete = 1;
 int need_focus = 1;
-if (!XtIsWMShell (widget))
+assert (XtIsWMShell (widget));
-abort ();
 {
 Atom type, *atoms = 0;
 int format = 0;
 unsigned long nitems = 0;
 {
 if (dragData->protocol == DtDND_BUFFER_TRANSFER)
 	{
 	  for (i = 0; i < dragData->numItems; i++)
 	    {
-	      XtFree(dragData->data.buffers[i].bp);
+	      XtFree((char *) dragData->data.buffers[i].bp);
 	      if (dragData->data.buffers[i].name)
 		XtFree(dragData->data.buffers[i].name);
 	    }
 	}
 else
 	    }
 	  textlen += XSTRING_LENGTH (XCAR (item)) + 1;
 	  numItems++;
 	  item = XCDR (item);
 	}
 if (numItems)
 	{
 	  /*
 	   * concatenate all strings given to one large string, with
 	   * \0 as separator. List is ended by \0.
 	   */
 	  Ctext = (char *)xmalloc (textlen+1);
 	  Ctext[0] = 0;
 	  item = dragdata;
 	  while (!NILP (item))
 	    {
 	      if (!STRINGP (XCAR (item)))
 		{
 	      strcpy (Ctext+pos, (CONST char *)XSTRING_DATA (XCAR (item)));
 	      pos += XSTRING_LENGTH (XCAR (item)) + 1;
 	      item = XCDR (item);
 	    }
 	  Ctext[pos] = 0;
 	  dnd_convert_cb_rec[0].callback = x_cde_convert_callback;
 	  dnd_convert_cb_rec[0].closure  = (XtPointer) Ctext;
 	  dnd_convert_cb_rec[1].callback = NULL;
 	  dnd_convert_cb_rec[1].closure  = NULL;
 	  dnd_destroy_cb_rec[0].callback = x_cde_destroy_callback;
 	  dnd_destroy_cb_rec[0].closure  = (XtPointer) Ctext;
 	  dnd_destroy_cb_rec[1].callback = NULL;
 	  dnd_destroy_cb_rec[1].closure  = NULL;
 			    dnd_destroy_cb_rec,
 			    NULL, 0);
 	}
 UNGCPRO;
 return numItems?Qt:Qnil;
 }
 return Qnil;
 }
 	     path = (filePath == NULL) ? Qnil
 	     : make_string ((Bufbyte *)filePath, strlen (filePath)); */
 	  /* what, if the data is no text, and how can I tell it? */
 	  l_data = Fcons ( list3 ( list1 ( make_string ((Bufbyte *)"text/plain", 10) ),
 				   make_string ((Bufbyte *)"8bit", 4),
 				   make_string ((Bufbyte *)transferInfo->dropData->data.buffers[ii].bp,
 						transferInfo->dropData->data.buffers[ii].size) ),
 			   l_data );
 	}
 drag_not_done = 0;
 unbind_to(speccount, Qnil);
 }
 else /* the other cases: NOOP_TRANSFER */
 enqueue=0;
 /* The Problem: no button and mods from CDE... */
 if (enqueue)
 enqueue_misc_user_event_pos ( frame, Qdragdrop_drop_dispatch,
 				  Fcons (l_type, l_data),
 				  0 /* this is the button */,
 				  0 /* these are the mods */,
 				  transferInfo->x,
 else
 	{
 	  if (!STRINGP (data))
 	    return Qnil;
-	  /* and whats with MULE data ??? */
+	  /* and what's with MULE data ??? */
 	  dnd_data = (char *)XSTRING_DATA (data);
 	  dnd_len  = XSTRING_LENGTH (data) + 1; /* the zero */
 	}
-/*
+/* not so gross hack that converts an emacs event back to a XEvent */
-* not so cross hack that converts a emacs event back to a XEvent
-*/
 x_event.xbutton.type = ButtonPress;
 x_event.xbutton.send_event = False;
 x_event.xbutton.display = XtDisplayOfObject(wid);
 x_event.xbutton.window = XtWindowOfObject(wid);
 #endif /* EXTERNAL_WIDGET */
 {
 XtSetArg (al[ac], XtNinput, True);       ac++;
 XtSetArg (al[ac], XtNminWidthCells, 10); ac++;
 XtSetArg (al[ac], XtNminHeightCells, 1); ac++;
-XtSetArg (al[ac], XtNvisual, visual); ac++;
+XtSetArg (al[ac], XtNvisual, visual);    ac++;
-XtSetArg (al[ac], XtNdepth, depth);   ac++;
+XtSetArg (al[ac], XtNdepth, depth);      ac++;
-XtSetArg (al[ac], XtNcolormap, cmap); ac++;
+XtSetArg (al[ac], XtNcolormap, cmap);    ac++;
 }
 if (!NILP (parent))
 {
 parentwid = FRAME_X_SHELL_WIDGET (XFRAME (parent));
 When we first removed it we only kept the XtRealizeWidget call in
 XtPopup.  For everything except HP's that was enough.  For HP's,
 though, the failure to call the popup callbacks resulted in XEmacs
 not accepting any input.  Bizarre but true.  Stupid but true.
-So, in case there are any other gotches floating out there along
+So, in case there are any other gotchas floating out there along
 the same lines I've duplicated the majority of XtPopup here.  It
 assumes no grabs and that the widget is not already popped up, both
 valid assumptions for the one place this is called from. */
 static void
 xemacs_XtPopup (Widget widget)
 make absolutely sure... */
 Xt_SET_VALUE (widget, XtNmappedWhenManaged, False);
 XtRealizeWidget (widget);
 Xt_SET_VALUE (widget, XtNmappedWhenManaged, True);
 }
-#ifdef HAVE_CDE
-/* Does this have to be non-automatic? */
-/* hack frame to respond to dnd messages */
-static XtCallbackRec dnd_transfer_cb_rec[2];
-#endif /* HAVE_CDE */
 /* create the windows for the specified frame and display them.
 Note that the widgets have already been created, and any
 necessary geometry calculations have already been done. */
 static void
 XIM_init_frame (f);
 #endif /* HAVE_XIM */
 #ifdef HACK_EDITRES
 /* Allow XEmacs to respond to EditRes requests.  See the O'Reilly Xt */
-/* Instrinsics Programming Manual, Motif Edition, Aug 1993, Sect 14.14, */
+/* Intrinsics Programming Manual, Motif Edition, Aug 1993, Sect 14.14, */
 /* pp. 483-493. */
 XtAddEventHandler (shell_widget,           /* the shell widget in question */
 		     (EventMask) NoEventMask,/* OR with existing mask */
 		     True,                   /* called on non-maskable events? */
 		     (XtEventHandler) _XEditResCheckMessages, /* the handler */
 		     NULL);
 #endif /* HACK_EDITRES */
 #ifdef HAVE_CDE
 {
+XtCallbackRec dnd_transfer_cb_rec[2];
 dnd_transfer_cb_rec[0].callback = x_cde_transfer_callback;
 dnd_transfer_cb_rec[0].closure = (XtPointer) f;
 dnd_transfer_cb_rec[1].callback = NULL;
 dnd_transfer_cb_rec[1].closure = NULL;
 DtDndVaDropRegister (FRAME_X_TEXT_WIDGET (f),
 			 DtDND_FILENAME_TRANSFER | DtDND_BUFFER_TRANSFER,
 			 XmDROP_COPY, dnd_transfer_cb_rec,
 			 DtNtextIsBuffer, True,
 			 DtNregisterChildren, True,
 			 DtNpreserveRegistration, False,
 			 NULL);
 }
 #endif /* HAVE_CDE */
 *   modeline specs depend on the frame's device having a selected
 *   frame, and that may not have been set up yet.  The redisplay
 *   will update the frame title anyway, so nothing is lost.
 * JV:
 *   It turns out it gives problems with FVWMs name based mapping.
-*   We'll just  need to be carefull in the modeline specs.
+*   We'll just  need to be careful in the modeline specs.
 */
 update_frame_title (f);
 }
 static void
 x_init_frame_3 (struct frame *f)
 {
 }
 static void
 x_mark_frame (struct frame *f, void (*markobj) (Lisp_Object))
 {
-((markobj) (FRAME_X_ICON_PIXMAP (f)));
+markobj (FRAME_X_ICON_PIXMAP (f));
-((markobj) (FRAME_X_ICON_PIXMAP_MASK (f)));
+markobj (FRAME_X_ICON_PIXMAP_MASK (f));
 }
 static void
 x_set_frame_icon (struct frame *f)
 {
 /* Destroy the X window of frame S.  */
 static void
 x_delete_frame (struct frame *f)
 {
-Widget w = FRAME_X_SHELL_WIDGET (f);
-Display *dpy = XtDisplay (w);
 #ifndef HAVE_SESSION
 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
 x_wm_maybe_move_wm_command (f);
 #endif /* HAVE_SESSION */
-#ifdef EXTERNAL_WIDGET
+#ifdef HAVE_CDE
-expect_x_error (dpy);
+DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
-/* for obscure reasons having (I think) to do with the internal
+#endif /* HAVE_CDE */
-window-to-widget hierarchy maintained by Xt, we have to call
-XtUnrealizeWidget() here.  Xt can really suck. */
+assert (FRAME_X_SHELL_WIDGET (f));
-if (f->being_deleted)
+if (FRAME_X_SHELL_WIDGET (f))
-XtUnrealizeWidget (w);
+{
-XtDestroyWidget (w);
+Display *dpy = XtDisplay (FRAME_X_SHELL_WIDGET (f));
-x_error_occurred_p (dpy);
+expect_x_error (dpy);
-#else
+/* for obscure reasons having (I think) to do with the internal
-XtDestroyWidget (w);
+	 window-to-widget hierarchy maintained by Xt, we have to call
-XFlush (dpy);   /* make sure the windows are really gone! */
+	 XtUnrealizeWidget() here.  Xt can really suck. */
-#endif /* EXTERNAL_WIDGET */
+if (f->being_deleted)
+	XtUnrealizeWidget (FRAME_X_SHELL_WIDGET (f));
+XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
+x_error_occurred_p (dpy);
+/* make sure the windows are really gone! */
+/* ### Is this REALLY necessary? */
+XFlush (dpy);
+FRAME_X_SHELL_WIDGET (f) = 0;
+}
 if (FRAME_X_GEOM_FREE_ME_PLEASE (f))
-xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f));
+{
-xfree (f->frame_data);
+xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f));
-f->frame_data = 0;
+FRAME_X_GEOM_FREE_ME_PLEASE (f) = 0;
+}
+if (f->frame_data)
+{
+xfree (f->frame_data);
+f->frame_data = 0;
+}
 }
 static void
 x_update_frame_external_traits (struct frame* frm, Lisp_Object name)
 {
-Arg av[10];
+Arg al[10];
 int ac = 0;
-Lisp_Object frame = Qnil;
+Lisp_Object frame;
 XSETFRAME(frame, frm);
 if (EQ (name, Qforeground))
 {
 XColor fgc;
 if (!EQ (color, Vthe_null_color_instance))
 {
 	 fgc = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (color));
-	 XtSetArg (av[ac], XtNforeground, (void *) fgc.pixel); ac++;
+	 XtSetArg (al[ac], XtNforeground, (void *) fgc.pixel); ac++;
 }
 }
 else if (EQ (name, Qbackground))
 {
 Lisp_Object color = FACE_BACKGROUND (Vdefault_face, frame);
 XColor bgc;
 if (!EQ (color, Vthe_null_color_instance))
 {
 	 bgc = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (color));
-	 XtSetArg (av[ac], XtNbackground, (void *) bgc.pixel); ac++;
+	 XtSetArg (al[ac], XtNbackground, (void *) bgc.pixel); ac++;
 }
 /* Really crappy way to force the modeline shadows to be
 	redrawn.  But effective. */
 MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (frm);
 else if (EQ (name, Qfont))
 {
 Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii);
 if (!EQ (font, Vthe_null_font_instance))
-XtSetArg (av[ac], XtNfont,
+XtSetArg (al[ac], XtNfont,
 		 (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)));
 ac++;
 }
 else
 abort ();
-XtSetValues (FRAME_X_TEXT_WIDGET (frm), av, ac);
+XtSetValues (FRAME_X_TEXT_WIDGET (frm), al, ac);
 #ifdef HAVE_TOOLBARS
 /* Setting the background clears the entire frame area
 including the toolbar so we force an immediate redraw of
 it. */

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 380:8626e4521993 r21-2-5