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

comparison src/frame-x.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	ec9a17fef872
children	c0c698873ce1

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 {
 Atom encoding = XA_STRING;
 String new_XtValue = (String) value;
 String old_XtValue = NULL;
 Arg av[2];
+#ifdef MULE
+Bufbyte *ptr;
+/* Optimize for common ASCII case */
+for (ptr = value; *ptr; ptr++)
+if (!BYTE_ASCII_P (*ptr))
+{
+CONST char * tmp;
+encoding = DEVICE_XATOM_COMPOUND_TEXT (XDEVICE (FRAME_DEVICE (f)));
+GET_C_CHARPTR_EXT_CTEXT_DATA_ALLOCA ((CONST char *) value, tmp);
+new_XtValue = (String) tmp;
+break;
+}
+#endif /* MULE */
 /* ### Caching is device-independent - belongs in update_frame_title. */
 XtSetArg (av[0], Xt_resource_name, &old_XtValue);
 XtGetValues (FRAME_X_SHELL_WIDGET (f), av, 1);
 if (!old_XtValue || strcmp (new_XtValue, old_XtValue))
 unsigned int keys_and_buttons;
 if (XQueryPointer (display, RootWindow (display, DefaultScreen (display)),
 			 &root_window, &child_window, &root_x, &root_y,
 			 &win_x, &win_y, &keys_and_buttons) == False)
-	return Qnil;
+	  return Qnil;
 Ctext = xstrdup ((char *) XSTRING_DATA (text));
 /*
 * Eek - XEmacs doesn't keep the old X event around so we have to
 dnd_destroy_cb_rec[0].closure  = (XtPointer) Ctext;
 dnd_destroy_cb_rec[1].callback = NULL;
 dnd_destroy_cb_rec[1].closure  = NULL;
 CurrentDragWidget =
-DtDndDragStart (Wuh, &event, DtDND_BUFFER_TRANSFER, 1, XmDROP_COPY,
+	DtDndDragStart (Wuh, &event, DtDND_BUFFER_TRANSFER, 1, XmDROP_COPY,
-		      dnd_convert_cb_rec,
+			dnd_convert_cb_rec,
-		      dnd_destroy_cb_rec,
+			dnd_destroy_cb_rec,
-		      NULL, 0);
+			NULL, 0);
 return Qt;
 }
 return Qnil;
 }
 if (transferInfo->dropData->protocol == DtDND_FILENAME_TRANSFER)
 {
 for (ii = 0; ii < transferInfo->dropData->numItems; ii++)
 	{
 	  filePath = transferInfo->dropData->data.files[ii];
-	  /* ### Mule-izing required */
+/* ### Mule-izing required */
-	  path = make_string ((Bufbyte *)filePath, strlen (filePath));
+	  path = make_string (filePath, strlen (filePath));
 	  va_run_hook_with_args (Qdrag_and_drop_functions, 2, frame, path);
 	}
 }
 else if (transferInfo->dropData->protocol == DtDND_BUFFER_TRANSFER)
 {
 drag_not_done = 1;
 for (ii = 0; ii < transferInfo->dropData->numItems; ii++)
 	{
 	  filePath = transferInfo->dropData->data.buffers[ii].name;
 	  /* ### Mule-izing required */
 	  path = (filePath == NULL) ? Qnil
-	    : make_string ((Bufbyte *)filePath, strlen (filePath));
+	    : make_string (filePath, strlen (filePath));
 	  buf = transferInfo->dropData->data.buffers[ii].bp;
-	  data = make_string ((Bufbyte *)buf,
+	  data = make_string(buf,
-			      transferInfo->dropData->data.buffers[ii].size);
+			     transferInfo->dropData->data.buffers[ii].size);
 	  va_run_hook_with_args(Qdrag_and_drop_functions, 3, frame, path,
 				data);
 	}
-	drag_not_done = 0;
+drag_not_done = 0;
-	unbind_to(speccount, Qnil);
+unbind_to(speccount, Qnil);
 }
 UNGCPRO;
 return;
 }
 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')
 	{
 	x_wm_store_class_hints (shell_widget, XtName (frame_widget));
 	x_wm_maybe_store_wm_command (f);
 	x_wm_hack_wm_protocols (shell_widget);
 }
+#ifdef HAVE_XIM
+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, */
 /* pp. 483-493. */
 XtAddEventHandler (shell_widget,           /* the shell widget in question */
 x_get_frame_parent (struct frame *f)
 {
 Widget parentwid = 0;
 Arg av[1];
-/* We may be passed a dangling deleted frame */
-/* I do not know how to test for this. -sb */
 XtSetArg (av[0], XtNtransientFor, &parentwid);
 XtGetValues (FRAME_X_SHELL_WIDGET (f), av, 1);
 /* find the frame whose wid is parentwid */
 if (parentwid)
 {
 XtVaSetValues (w,
 		 XtNwinGravity, win_gravity,
 		 XtNx, xoff,
 		 XtNy, yoff,
 		 0);
 /* Sometimes you will find that
 (set-frame-position (selected-frame) -50 -50)
 doesn't put the frame where you expect it to: i.e. it's closer to
 Window emacs_window;
 XWindowChanges xwc;
 unsigned int flags;
 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
-if (FRAME_VISIBLE_P(f) || force)
+if (f->visible || force)
 {
 emacs_window = XtWindow (FRAME_X_SHELL_WIDGET (f));
 /* first raises all the dialog boxes, then put emacs just below the
 * bottom most dialog box */
 bottom_dialog = lw_raise_all_pop_up_widgets ();
 {
 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
 XWindowChanges xwc;
 unsigned int flags;
-if (FRAME_VISIBLE_P(f))
+if (f->visible)
 {
 xwc.stack_mode = Below;
 flags = CWStackMode;
 if (!XReconfigureWMWindow (display, XtWindow (FRAME_X_SHELL_WIDGET (f)),
 				 DefaultScreen (display), flags, &xwc))
 static void
 x_make_frame_visible (struct frame *f)
 {
 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
-if (!FRAME_VISIBLE_P(f))
+if (!f->visible)
 XMapRaised (display, XtWindow (FRAME_X_SHELL_WIDGET (f)));
 else
 x_raise_frame_1 (f, 0);
 }
 static void
 x_make_frame_invisible (struct frame *f)
 {
 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
-if (!FRAME_VISIBLE_P(f))
+if (!f->visible)
 return;
 if (!XWithdrawWindow (display,
 			XtWindow (FRAME_X_SHELL_WIDGET (f)),
 			DefaultScreen (display)))
 {
 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
 XWindowAttributes xwa;
 int result;
-/* JV:
-This is bad, very bad :-(
-It is not compatible with our tristate visible and
-it should never ever change the visibility for us, this leads to
-the frame-freeze problem under fvwm because with the pager
-Mappedness != Viewability != Visibility != Emacs f->visible
-This first unequalness is the reason for the frame freezing problem
-under fvwm (it happens when the frame is another fvwm-page)
-The second unequalness happen when it is on the same fvwm-page
-but in an invisible part of the visible screen.
-For now we just return the XEmacs internal value --- which might not be up
-to date. Is that a problem? ---. Otherwise we should
-use async visibility like in standard Emacs.
-*/
-#if 0
 if (!XGetWindowAttributes (display,
 			     XtWindow (FRAME_X_SHELL_WIDGET (f)),
 			     &xwa))
 result = 0;
 else
 result = xwa.map_state == IsViewable;
-/* In this implementation it should at least be != IsUnmapped
-JV */
 f->visible = result;
 return result;
-#endif
-return f->visible;
 }
 static int
 x_frame_totally_visible_p (struct frame *f)
 {
 static void
 x_focus_on_frame (struct frame *f)
 {
 XWindowAttributes xwa;
 Widget shell_widget;
-int viewable;
 assert (FRAME_X_P (f));
 shell_widget = FRAME_X_SHELL_WIDGET (f);
 if (!XtWindow (shell_widget))
 */
 XGrabServer (XtDisplay (shell_widget));
 if (XGetWindowAttributes (XtDisplay (shell_widget),
 			    XtWindow (shell_widget),
 			    &xwa))
-/* JV: it is bad to change the visibility like this, so we don't for the
+f->visible = xwa.map_state == IsViewable;
-moment, at least change_frame_visibility should be called
-Note also that under fvwm a frame can me Viewable (and thus Mapped)
-but still X-invisible
-f->visible = xwa.map_state == IsViewable; */
-viewable = xwa.map_state == IsViewable;
-if (viewable)
+if (f->visible)
 {
 Window focus;
 int revert_to;
 XGetInputFocus (XtDisplay (shell_widget), &focus, &revert_to);
 /* Don't explicitly set the focus on this window unless the focus

Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 70:131b0175ea99 r20-0b30