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

comparison src/frame-x.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	2f8bb876ab1d
children	da8ed4261e83

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 #include "events.h"
 #include "extents.h"
 #include "faces.h"
 #include "frame.h"
 #include "window.h"
-#include "gutter.h"
 #ifdef HAVE_DRAGNDROP
 #include "dragdrop.h"
 #endif
 /* Like x_window_to_frame but also compares the window with the widget's
 windows */
 struct frame *
 x_any_window_to_frame (struct device *d, Window wdesc)
 {
-Widget w;
-assert (DEVICE_X_P (d));
-w = XtWindowToWidget (DEVICE_X_DISPLAY (d), wdesc);
-if (!w)
-return 0;
-/* We used to map over all frames here and then map over all widgets
-belonging to that frame. However it turns out that this was very fragile
-as it requires our display stuctures to be in sync _and_ that the
-loop is told about every new widget somebody adds. Therefore we
-now let Xt find it for us (which does a bottom-up search which
-could even be faster) */
-return  x_any_widget_or_parent_to_frame (d, w);
-}
-static struct frame *
-x_find_frame_for_window (struct device *d, Window wdesc)
-{
 Lisp_Object tail, frame;
 struct frame *f;
+assert (DEVICE_X_P (d));
 /* This function was previously written to accept only a window argument
 (and to loop over all devices looking for a matching window), but
 that is incorrect because window ID's are not unique across displays. */
 for (tail = DEVICE_FRAME_LIST (d); CONSP (tail); tail = XCDR (tail))
 {
+int i;
 frame = XCAR (tail);
 f = XFRAME (frame);
 /* This frame matches if the window is any of its widgets. */
 if (wdesc == XtWindow (FRAME_X_SHELL_WIDGET (f)) ||
 	  wdesc == XtWindow (FRAME_X_CONTAINER_WIDGET (f)) ||
 	 for this statement is that, in the old (broken) event loop, where
 	 not all events went through XtDispatchEvent(), psheet events
 	 would incorrectly get sucked away by Emacs if this function matched
 	 on psheet widgets. */
-/* Note: that this called only from
+for (i = 0; i < FRAME_X_NUM_TOP_WIDGETS (f); i++)
-x_any_widget_or_parent_to_frame it is unnecessary to iterate
+	{
-over the top level widgets. */
+	  Widget wid = FRAME_X_TOP_WIDGETS (f)[i];
+	  if (wid && XtIsManaged (wid) && wdesc == XtWindow (wid))
-/* Note:  we use to special case scrollbars but this turns out to be a bad idea
+	    return f;
-because
+	}
-1. We sometimes get events for _unmapped_ scrollbars and our
-callers don't want us to fail.
+#ifdef HAVE_SCROLLBARS
-2. Starting with the 21.2 widget stuff there are now loads of
+/* Match if the window is one of this frame's scrollbars. */
-widgets to check and it is easy to forget adding them in a loop here.
+if (x_window_is_scrollbar (f, wdesc))
-See x_any_window_to_frame
+	return f;
-3. We pick up all widgets now anyway. */
+#endif
 }
 return 0;
 }
 struct frame *
 x_any_widget_or_parent_to_frame (struct device *d, Widget widget)
 {
 while (widget)
 {
-struct frame *f = x_find_frame_for_window (d, XtWindow (widget));
+struct frame *f = x_any_window_to_frame (d, XtWindow (widget));
 if (f)
 	return f;
 widget = XtParent (widget);
 }
 classhint.res_name = frame_name;
 classhint.res_class = app_class;
 XSetClassHint (dpy, XtWindow (shell), &classhint);
 }
-#ifndef HAVE_WMCOMMAND
+#ifndef HAVE_SESSION
 static void
 x_wm_maybe_store_wm_command (struct frame *f)
 {
 Widget w = FRAME_X_SHELL_WIDGET (f);
 struct device *d = XDEVICE (FRAME_DEVICE (f));
 x_wm_maybe_store_wm_command (f);
 }
 }
-#endif /* !HAVE_WMCOMMAND */
+#endif /* !HAVE_SESSION */
 static int
 x_frame_iconified_p (struct frame *f)
 {
 Atom actual_type;
 static void
 init_x_prop_symbols (void)
 {
 #define def(sym, rsrc) \
-Fput (sym, Qx_resource_name, build_string (rsrc))
+pure_put (sym, Qx_resource_name, build_string (rsrc))
 #define defi(sym,rsrc) \
-def (sym, rsrc); Fput (sym, Qintegerp, Qt)
+def (sym, rsrc); pure_put (sym, Qintegerp, Qt)
 #if 0 /* this interferes with things. #### fix this right */
 def (Qminibuffer, XtNminibuffer);
 def (Qunsplittable, XtNunsplittable);
 #endif
 Bufbyte *ptr;
 /* Optimize for common ASCII case */
 for (ptr = value; *ptr; ptr++)
 if (!BYTE_ASCII_P (*ptr))
 {
-const char * tmp;
+CONST char * tmp;
 encoding = DEVICE_XATOM_COMPOUND_TEXT (XDEVICE (FRAME_DEVICE (f)));
-	TO_EXTERNAL_FORMAT (C_STRING, value,
+GET_C_CHARPTR_EXT_CTEXT_DATA_ALLOCA ((CONST char *) value, tmp);
-			    C_STRING_ALLOCA, tmp,
-			    Qctext);
 new_XtValue = (String) tmp;
 break;
 }
 #endif /* MULE */
-/* #### Caching is device-independent - belongs in update_frame_title. */
+/* ### Caching is device-independent - belongs in update_frame_title. */
 Xt_GET_VALUE (FRAME_X_SHELL_WIDGET (f), Xt_resource_name, &old_XtValue);
 if (!old_XtValue || strcmp (new_XtValue, old_XtValue))
 {
 Arg al[2];
 XtSetArg (al[0], Xt_resource_name, new_XtValue);
 Lisp_Object prop = Fcar (tail);
 Lisp_Object val = Fcar (Fcdr (tail));
 if (STRINGP (prop))
 	{
-	  const char *extprop;
+	  CONST char *extprop;
 	  if (XSTRING_LENGTH (prop) == 0)
 	    continue;
-	  TO_EXTERNAL_FORMAT (LISP_STRING, prop,
+	  GET_C_STRING_CTEXT_DATA_ALLOCA (prop, extprop);
-			      C_STRING_ALLOCA, extprop,
-			      Qctext);
 	  if (STRINGP (val))
 	    {
-	      const Extbyte *extval;
+	      CONST Extbyte *extval;
 	      Extcount extvallen;
-	      TO_EXTERNAL_FORMAT (LISP_STRING, val,
+	      GET_STRING_CTEXT_DATA_ALLOCA (val, extval, extvallen);
-				  ALLOCA, (extval, extvallen),
-				  Qctext);
 	      XtVaSetValues (w, XtVaTypedArg, extprop,
 			     XtRString, extval, extvallen + 1,
 			     (XtArgVal) NULL);
 	    }
 	  else
 struct x_device *xd = DEVICE_X_DATA (d);
 XWindowAttributes win_attrib;
 unsigned int modifier = 0, state = 0;
 char *Ctext;
 int numItems = 0, textlen = 0, pos = 0;
-Lisp_Event *lisp_event = XEVENT (event);
+struct Lisp_Event *lisp_event = XEVENT(event);
 Lisp_Object item = Qnil;
 struct gcpro gcpro1;
 /* only drag if this is really a press */
 if (EVENT_TYPE(lisp_event) != button_press_event
 	{
 	  x_event.xbutton.x_root = lisp_event->event.button.x; /* this is wrong */
 	  x_event.xbutton.y_root = lisp_event->event.button.y;
 	}
 modifier = lisp_event->event.button.modifiers;
-if (modifier & XEMACS_MOD_SHIFT)   state |= ShiftMask;
+if (modifier & MOD_SHIFT)   state |= ShiftMask;
-if (modifier & XEMACS_MOD_CONTROL) state |= ControlMask;
+if (modifier & MOD_CONTROL) state |= ControlMask;
-if (modifier & XEMACS_MOD_META)    state |= xd->MetaMask;
+if (modifier & MOD_META)    state |= xd->MetaMask;
-if (modifier & XEMACS_MOD_SUPER)   state |= xd->SuperMask;
+if (modifier & MOD_SUPER)   state |= xd->SuperMask;
-if (modifier & XEMACS_MOD_HYPER)   state |= xd->HyperMask;
+if (modifier & MOD_HYPER)   state |= xd->HyperMask;
-if (modifier & XEMACS_MOD_ALT)     state |= xd->AltMask;
+if (modifier & MOD_ALT)     state |= xd->AltMask;
 state |= Button1Mask << (lisp_event->event.button.button-1);
 x_event.xbutton.state = state;
 x_event.xbutton.button = lisp_event->event.button.button;
 x_event.xkey.same_screen = True;
 		  numItems=0;
 		  xfree(Ctext);
 		  Ctext=NULL;
 		  break;
 		}
-	      strcpy (Ctext+pos, (const char *)XSTRING_DATA (XCAR (item)));
+	      strcpy (Ctext+pos, (CONST char *)XSTRING_DATA (XCAR (item)));
 	      pos += XSTRING_LENGTH (XCAR (item)) + 1;
 	      item = XCDR (item);
 	    }
 	  Ctext[pos] = 0;
 for (ii = 0; ii < transferInfo->dropData->numItems; ii++)
 	{
 	  filePath = transferInfo->dropData->data.files[ii];
 	  hurl = dnd_url_hexify_string ((char *)filePath, "file:");
-/* #### Mule-izing required */
+/* ### Mule-izing required */
 	  l_data = Fcons (make_string ((Bufbyte* )hurl,
 				       strlen (hurl)),
 			  l_data);
 	  xfree (hurl);
 	}
 XWindowAttributes win_attrib;
 unsigned int modifier = 0, state = 0;
 char *dnd_data = NULL;
 unsigned long dnd_len = 0;
 int dnd_typ = DndText, dnd_dealloc = 0;
-Lisp_Event *lisp_event = XEVENT (event);
+struct Lisp_Event *lisp_event = XEVENT(event);
 /* only drag if this is really a press */
 if (EVENT_TYPE(lisp_event) != button_press_event)
 	return Qnil;
 		  xfree (dnd_data);
 		  return Qnil;
 		}
 	      len = XSTRING_LENGTH (XCAR (run)) + 1;
 	      dnd_data = (char *) xrealloc (dnd_data, dnd_len + len);
-	      strcpy (dnd_data + dnd_len - 1, (const char *)XSTRING_DATA (XCAR (run)));
+	      strcpy (dnd_data + dnd_len - 1, (CONST char *)XSTRING_DATA (XCAR (run)));
 	      dnd_len += len;
 	      run = XCDR (run);
 	    }
 	  dnd_data[dnd_len - 1] = 0; /* the list-ending zero */
 	  x_event.xbutton.x_root = lisp_event->event.button.x; /* this is wrong */
 	  x_event.xbutton.y_root = lisp_event->event.button.y;
 	}
 modifier = lisp_event->event.button.modifiers;
-if (modifier & XEMACS_MOD_SHIFT)   state |= ShiftMask;
+if (modifier & MOD_SHIFT)   state |= ShiftMask;
-if (modifier & XEMACS_MOD_CONTROL) state |= ControlMask;
+if (modifier & MOD_CONTROL) state |= ControlMask;
-if (modifier & XEMACS_MOD_META)    state |= xd->MetaMask;
+if (modifier & MOD_META)    state |= xd->MetaMask;
-if (modifier & XEMACS_MOD_SUPER)   state |= xd->SuperMask;
+if (modifier & MOD_SUPER)   state |= xd->SuperMask;
-if (modifier & XEMACS_MOD_HYPER)   state |= xd->HyperMask;
+if (modifier & MOD_HYPER)   state |= xd->HyperMask;
-if (modifier & XEMACS_MOD_ALT)     state |= xd->AltMask;
+if (modifier & MOD_ALT)     state |= xd->AltMask;
 state |= Button1Mask << (lisp_event->event.button.button-1);
 x_event.xbutton.state = state;
 x_event.xbutton.button = lisp_event->event.button.button;
 x_event.xkey.same_screen = True;
 /* set the position of the frame's root window now.  When the
 frame was created, the position was initialized to (0,0). */
 {
 struct window *win = XWINDOW (f->root_window);
-WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f)
+WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f);
-+ FRAME_LEFT_GUTTER_BOUNDS (f);
+WINDOW_TOP (win) = FRAME_TOP_BORDER_END (f);
-WINDOW_TOP (win) = FRAME_TOP_BORDER_END (f)
-+ FRAME_TOP_GUTTER_BOUNDS (f);
 if (!NILP (f->minibuffer_window))
 {
 	win = XWINDOW (f->minibuffer_window);
-	WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f)
+	WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f);
-	  + FRAME_LEFT_GUTTER_BOUNDS (f);
 }
 }
 #ifdef EXTERNAL_WIDGET
 /* If we're an external widget, then the size of the frame is predetermined
 int depth = DEVICE_X_DEPTH (d);
 Colormap cmap = DEVICE_X_COLORMAP (d);
 #ifdef EXTERNAL_WIDGET
 Window window_id = 0;
 #endif
-const char *name;
+CONST char *name;
 Arg al [25];
 int ac = 0;
 Widget text, container, shell;
 Widget parentwid = 0;
 #ifdef HAVE_MENUBARS
 int menubar_visible;
 Widget menubar;
 #endif
 if (STRINGP (f->name))
-TO_EXTERNAL_FORMAT (LISP_STRING, f->name,
+GET_C_STRING_CTEXT_DATA_ALLOCA (f->name, name);
-			C_STRING_ALLOCA, name,
-			Qctext);
 else
 name = "emacs";
 /* The widget hierarchy is
 if (!NILP (lisp_window_id))
 {
 char *string;
 CHECK_STRING (lisp_window_id);
-string = (char *) XSTRING_DATA (lisp_window_id);
+string = (char *) (XSTRING_DATA (lisp_window_id));
 if (string[0] == '0' && (string[1] == 'x' || string[1] == 'X'))
 	sscanf (string+2, "%lxu", &window_id);
 #if 0
 else if (string[0] == 'w')
 	{
 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
 {
 	/* tell the window manager about us. */
 	x_wm_store_class_hints (shell_widget, XtName (frame_widget));
-#ifndef HAVE_WMCOMMAND
+#ifndef HAVE_SESSION
 	x_wm_maybe_store_wm_command (f);
-#endif /* HAVE_WMCOMMAND */
+#endif /* HAVE_SESSION */
 	x_wm_hack_wm_protocols (shell_widget);
 }
 #ifdef HAVE_XIM
 x_popup_frame (f);
 }
 static void
-x_mark_frame (struct frame *f)
+x_mark_frame (struct frame *f, void (*markobj) (Lisp_Object))
 {
-mark_object (FRAME_X_ICON_PIXMAP (f));
+markobj (FRAME_X_ICON_PIXMAP (f));
-mark_object (FRAME_X_ICON_PIXMAP_MASK (f));
+markobj (FRAME_X_ICON_PIXMAP_MASK (f));
 }
 static void
 x_set_frame_icon (struct frame *f)
 {
 static void
 x_delete_frame (struct frame *f)
 {
 Display *dpy;
-#ifndef HAVE_WMCOMMAND
+#ifndef HAVE_SESSION
 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
 x_wm_maybe_move_wm_command (f);
-#endif /* HAVE_WMCOMMAND */
+#endif /* HAVE_SESSION */
 #ifdef HAVE_CDE
 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
 #endif /* HAVE_CDE */
 XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
 x_error_occurred_p (XtDisplay (FRAME_X_SHELL_WIDGET (f)));
 #else
 XtDestroyWidget (FRAME_X_SHELL_WIDGET (f));
 /* make sure the windows are really gone! */
-/* #### Is this REALLY necessary? */
+/* ### Is this REALLY necessary? */
 XFlush (dpy);
 #endif /* EXTERNAL_WIDGET */
 FRAME_X_SHELL_WIDGET (f) = 0;

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 412:697ef44129c6 r21-2-14