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

comparison src/frame-msw.c @ 276:6330739388db r21-0b36

Import from CVS: tag r21-0b36

author	cvs
date	Mon, 13 Aug 2007 10:30:37 +0200
parents	ca9a9ec9c1c1
children	90d73dddcdc4

comparison

equal deleted inserted replaced

-:a68ae4439f57
+:6330739388db
 #include "glyphs-msw.h"
 #include "events.h"
 #include "faces.h"
 #include "frame.h"
 #include "redisplay.h"
+#include "window.h"
 #define MSWINDOWS_FRAME_STYLE (WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW)
 #define MSWINDOWS_POPUP_STYLE (WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP \
 			       | WS_CAPTION | WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX)
 /* Lisp_Object Qname, Qheight, Qwidth, Qinitially_unmapped, Qpopup, Qtop, Qleft; */
 Lisp_Object Qinitially_unmapped, Qpopup;
 /* This does not need to be GC protected, as it holds a
 frame Lisp_Object already protected by Fmake_frame */
-Lisp_Object mswindows_frame_being_created;
+Lisp_Object Vmswindows_frame_being_created;
 /* Geometry, in characters, as specified by proplist during frame
 creation. Memebers are set to -1 for unspecified */
 XEMACS_RECT_WH mswindows_frame_target_rect;
 FRAME_MSWINDOWS_DATA(f)->button2_need_rbutton = 0;
 FRAME_MSWINDOWS_DATA(f)->button2_is_down = 0;
 FRAME_MSWINDOWS_DATA(f)->ignore_next_lbutton_up = 0;
 FRAME_MSWINDOWS_DATA(f)->ignore_next_rbutton_up = 0;
 FRAME_MSWINDOWS_DATA(f)->sizing = 0;
 FRAME_MSWINDOWS_MENU_HASHTABLE(f) = Qnil;
+#ifdef HAVE_TOOLBARS
+FRAME_MSWINDOWS_TOOLBAR_HASHTABLE(f) = Fmake_hashtable (make_int (50),
+							  Qequal);
+#endif
 /* Will initialize these in WM_SIZE handler. We cannot do it now,
 because we do not know what is CW_USEDEFAULT height and width */
 FRAME_WIDTH (f) = 0;
 FRAME_HEIGHT (f) = 0;
 AdjustWindowRectEx(&rect, style, ADJR_MENUFLAG, exstyle);
 XSETFRAME (frame_obj, f);
-mswindows_frame_being_created = frame_obj;
+Vmswindows_frame_being_created = frame_obj;
 hwnd = CreateWindowEx (exstyle,
 			 XEMACS_CLASS,
 			 STRINGP(f->name) ? XSTRING_DATA(f->name) :
 		    	   (STRINGP(name) ? XSTRING_DATA(name) : XEMACS_CLASS),
 			 style,
 			 rect_default.left, rect_default.top,
 			 rect_default.width, rect_default.height,
 			 hwnd_parent, NULL, NULL, NULL);
-mswindows_frame_being_created = Qnil;
+Vmswindows_frame_being_created = Qnil;
 if (hwnd == NULL)
 error ("System call to create frame failed");
 FRAME_MSWINDOWS_HANDLE(f) = hwnd;
 static void
 mswindows_mark_frame (struct frame *f, void (*markobj) (Lisp_Object))
 {
 ((markobj) (FRAME_MSWINDOWS_MENU_HASHTABLE (f)));
+#ifdef HAVE_TOOLBARS
+((markobj) (FRAME_MSWINDOWS_TOOLBAR_HASHTABLE (f)));
+#endif
 }
 static void
 mswindows_focus_on_frame (struct frame *f)
 {
 ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_HIDE);
 f->visible = -1;
 }
 static int
+mswindows_frame_totally_visible_p (struct frame *f)
+{
+RECT rc_me, rc_other, rc_temp;
+HWND hwnd = FRAME_MSWINDOWS_HANDLE(f);
+/* We test against not a whole window rectangle, only agaist its
+client part. So, if non-client are is covered and client area is
+not, we return true. */
+GetClientRect (hwnd, &rc_me);
+MapWindowPoints (hwnd, HWND_DESKTOP, (LPPOINT)&rc_me, 2);
+/* First see if we're off the desktop */
+GetWindowRect (GetDesktopWindow(), &rc_other);
+UnionRect(&rc_temp, &rc_me, &rc_other);
+if (!EqualRect (&rc_temp, &rc_other))
+return 0;
+/* Then see if any window above us obscures us */
+while ((hwnd = GetWindow (hwnd, GW_HWNDPREV)) != NULL)
+if (IsWindowVisible (hwnd))
+{
+	GetWindowRect (hwnd, &rc_other);
+	if (IntersectRect(&rc_temp, &rc_me, &rc_other))
+	  return 0;
+}
+return 1;
+}
+static int
 mswindows_frame_visible_p (struct frame *f)
 {
 return IsWindowVisible (FRAME_MSWINDOWS_HANDLE(f))
 && !IsIconic (FRAME_MSWINDOWS_HANDLE(f));
 }
 if (IMAGE_INSTANCEP (f->icon)
 && IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (f->icon)))
 {
 if (!XIMAGE_INSTANCE_MSWINDOWS_ICON (f->icon))
 	{
-	  ICONINFO x_icon;
+	  mswindows_create_icon_from_image(f->icon, f, 16);
-	  x_icon.fIcon=TRUE;
-	  x_icon.xHotspot=XIMAGE_INSTANCE_PIXMAP_HOTSPOT_X (f->icon);
-	  x_icon.yHotspot=XIMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (f->icon);
-	  x_icon.hbmMask=XIMAGE_INSTANCE_MSWINDOWS_BITMAP (f->icon);
-	  x_icon.hbmColor=XIMAGE_INSTANCE_MSWINDOWS_MASK (f->icon);
-	  XIMAGE_INSTANCE_MSWINDOWS_ICON (f->icon)=
-	    CreateIconIndirect (&x_icon);
 	}
 SetClassLong (FRAME_MSWINDOWS_HANDLE (f), GCL_HICON,
 		    (LONG) XIMAGE_INSTANCE_MSWINDOWS_ICON (f->icon));
 }
 XDefineCursor (XtDisplay (FRAME_X_TEXT_WIDGET (f)),
 		 XtWindow (FRAME_X_TEXT_WIDGET (f)),
 		 XIMAGE_INSTANCE_X_CURSOR (f->pointer));
 XSync (XtDisplay (FRAME_X_TEXT_WIDGET (f)), 0);
 #endif
+}
+static void
+mswindows_set_mouse_position (struct window *w, int x, int y)
+{
+struct frame *f = XFRAME (w->frame);
+POINT pt;
+pt.x = w->pixel_left + x;
+pt.y = w->pixel_top  + y;
+ClientToScreen (FRAME_MSWINDOWS_HANDLE(f), &pt);
+SetCursorPos (pt.x, pt.y);
+}
+static int
+mswindows_get_mouse_position (struct device *d, Lisp_Object *frame, int *x, int *y)
+{
+POINT pt;
+HWND hwnd;
+GetCursorPos (&pt);
+/* What's under cursor? */
+hwnd = WindowFromPoint (pt);
+if (hwnd == NULL)
+return 0;
+/* Get grandest parent of the window */
+{
+HWND hwnd_parent;
+while ((hwnd_parent = GetParent (hwnd)) != NULL)
+hwnd = hwnd_parent;
+}
+/* Make sure it belongs to us */
+if (GetWindowThreadProcessId (hwnd, NULL) != GetCurrentThreadId ())
+return 0;
+/* And that the window is an XEmacs frame */
+{
+char class_name [sizeof(XEMACS_CLASS) + 1];
+if (!GetClassName (hwnd, class_name, sizeof(XEMACS_CLASS))
+	|| strcmp (class_name, XEMACS_CLASS) != 0)
+return 0;
+}
+/* Yippie! */
+ScreenToClient (hwnd, &pt);
+VOID_TO_LISP (*frame, GetWindowLong (hwnd, XWL_FRAMEOBJ));
+*x = pt.x;
+*y = pt.y;
+return 1;
 }
 static void
 mswindows_raise_frame (struct frame *f)
 {
 CONSOLE_HAS_METHOD (mswindows, init_frame_3);
 CONSOLE_HAS_METHOD (mswindows, after_init_frame);
 CONSOLE_HAS_METHOD (mswindows, mark_frame);
 CONSOLE_HAS_METHOD (mswindows, focus_on_frame);
 CONSOLE_HAS_METHOD (mswindows, delete_frame);
-/*  CONSOLE_HAS_METHOD (mswindows, get_mouse_position); */
+CONSOLE_HAS_METHOD (mswindows, get_mouse_position);
-/*  CONSOLE_HAS_METHOD (mswindows, set_mouse_position); */
+CONSOLE_HAS_METHOD (mswindows, set_mouse_position);
 CONSOLE_HAS_METHOD (mswindows, raise_frame);
 CONSOLE_HAS_METHOD (mswindows, lower_frame);
 CONSOLE_HAS_METHOD (mswindows, make_frame_visible);
 CONSOLE_HAS_METHOD (mswindows, make_frame_invisible);
 CONSOLE_HAS_METHOD (mswindows, iconify_frame);
 CONSOLE_HAS_METHOD (mswindows, frame_properties);
 CONSOLE_HAS_METHOD (mswindows, set_frame_properties);
 CONSOLE_HAS_METHOD (mswindows, set_title_from_bufbyte);
 /*  CONSOLE_HAS_METHOD (mswindows, set_icon_name_from_bufbyte); */
 CONSOLE_HAS_METHOD (mswindows, frame_visible_p);
-/*  CONSOLE_HAS_METHOD (mswindows, frame_totally_visible_p); */
+CONSOLE_HAS_METHOD (mswindows, frame_totally_visible_p);
 CONSOLE_HAS_METHOD (mswindows, frame_iconified_p);
 CONSOLE_HAS_METHOD (mswindows, set_frame_pointer);
 CONSOLE_HAS_METHOD (mswindows, set_frame_icon);
 CONSOLE_HAS_METHOD (mswindows, get_frame_parent);
 CONSOLE_HAS_METHOD (mswindows, update_frame_external_traits);
 }
 void
 vars_of_frame_mswindows (void)
 {
-mswindows_frame_being_created = Qnil;
+/* Needn't staticpro -- see comment above.  */
-staticpro (&mswindows_frame_being_created);
+Vmswindows_frame_being_created = Qnil;
 DEFVAR_LISP ("default-mswindows-frame-plist", &Vdefault_mswindows_frame_plist /*
 Plist of default frame-creation properties for mswindows frames.
 These override what is specified in `default-frame-plist', but are
 overridden by the arguments to the particular call to `make-frame'.

Mercurial > hg > xemacs-beta

comparison src/frame-msw.c @ 276:6330739388db r21-0b36