pidgin3: comparison pidgin/plugins/win32/winprefs/gtkappbar.c

-:7552faacabb6
+:78ddac185d80
 * gaim - WinGaim Options Plugin
 *
 * File: gtkappbar.c
 * Date: August 2, 2003
 * Description: Appbar functionality for Windows GTK+ applications
 *
 * Copyright (C) 2003, Herman Bloggs <hermanator12002@yahoo.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 		rect->right = GetSystemMetrics(SM_CXSCREEN);
 	}
 }
 /* Retrieve the rectangle of the active work area at a point */
-static RECT get_rect_at_point(POINT pt) {
+static void get_rect_at_point(POINT pt, RECT *rc) {
-	RECT rc;
+	if (!get_rect_at_point_multimonitor(pt, rc)) {
-	if (!get_rect_at_point_multimonitor(pt, &rc)) {
+		get_default_workarea(rc);
-		get_default_workarea(&rc);
+	}
-	}
-	return rc;
 }
 /* Retrieve the rectangle of the active work area of a window*/
-static RECT get_rect_of_window(HWND window) {
+static void get_rect_of_window(HWND window, RECT *rc) {
-	RECT rc;
+	if (!get_rect_of_window_multimonitor(window, rc)) {
-	if (!get_rect_of_window_multimonitor(window, &rc)) {
+		get_default_workarea(rc);
-		get_default_workarea(&rc);
+	}
-	}
-	return rc;
 }
 static void get_window_normal_rc(HWND hwnd, RECT *rc) {
 WINDOWPLACEMENT wplc;
 GetWindowPlacement(hwnd, &wplc);
 	SetWindowPos(hwnd, 0, 0, 0, 0, 0,
 		SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
 /*	This really should be the following, but SWP_FRAMECHANGED strangely causes initermittent problems "Show Desktop" done more than once.
 *	Not having SWP_FRAMECHANGED *should* cause the Style not to be applied, but i haven't noticed any problems
 *			SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
 */
 }
 /** Register the window as an appbar */
 static gboolean gtk_appbar_register(GtkAppBar *ab, HWND hwnd) {
 	APPBARDATA abd;
 static void gtk_appbar_querypos(GtkAppBar *ab, HWND hwnd, RECT rcWorkspace) {
 	APPBARDATA abd;
 	guint iWidth = 0;
-if(!ab->registered)
+	if(!ab->registered)
-gtk_appbar_register(ab, hwnd);
+		gtk_appbar_register(ab, hwnd);
 	abd.hWnd = hwnd;
 	abd.cbSize = sizeof(APPBARDATA);
 	abd.uEdge = ab->side;
 	iWidth = ab->docked_rect.right - ab->docked_rect.left;
 	abd.rc.top = rcWorkspace.top;
 	abd.rc.bottom = rcWorkspace.bottom;
 	switch (abd.uEdge)
 	{
 		case ABE_LEFT:
 	long dockAreaWidth = 0;
 gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "wnd_moving\n");
 GetCursorPos(&cp);
-	monRect = get_rect_at_point(cp);
+	get_rect_at_point(cp, &monRect);
 	dockAreaWidth = (monRect.right - monRect.left) / 10;
 /* Which part of the screen are we in ? */
 	if (cp.x > (monRect.right - dockAreaWidth)) {
 side = ABE_RIGHT;
 else if(side < 0) {
 gtk_appbar_unregister(ab, msg->hwnd);
 rc->bottom = rc->top + ab->undocked_height;
 }
 /* Switch to toolbar/regular caption*/
 if(ab->docking)
 set_toolbar(msg->hwnd, TRUE);
 else if(!ab->docked)
 set_toolbar(msg->hwnd, FALSE);
 return GDK_FILTER_CONTINUE;
 }
 static GdkFilterReturn wnd_nchittest(GtkAppBar *ab, GdkXEvent *xevent) {
 MSG *msg = (MSG*)xevent;
 if(ab->docked) {
 UINT ret = DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
 switch(ret) {
 case HTBOTTOM:
 case HTBOTTOMLEFT:
 case HTBOTTOMRIGHT:
 case HTTOP:
 case HTTOPLEFT:
 case HTTOPRIGHT:
 return GDK_FILTER_REMOVE;
 case HTLEFT:
 if(ab->side == ABE_LEFT)
 return GDK_FILTER_REMOVE;
 break;
 }
 #endif
 static GdkFilterReturn gtk_appbar_callback(GtkAppBar *ab, GdkXEvent *xevent) {
 MSG *msg = (MSG*)xevent;
-	RECT orig;
+	RECT orig, windowRect;
 switch (msg->wParam) {
 case ABN_STATECHANGE:
 gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "gtk_appbar_callback: ABN_STATECHANGE\n");
 	        break;
 				SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_FRAMECHANGED);
 		}
 		}
 break;
+	case ABN_POSCHANGED:
-	case ABN_POSCHANGED:
+		gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "gtk_appbar_callback: ABN_POSCHANGED\n");
-gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "gtk_appbar_callback: ABN_POSCHANGED\n");
+		CopyRect(&orig, &(ab->docked_rect));
-	CopyRect(&orig, &(ab->docked_rect));
+		get_rect_of_window(msg->hwnd, &windowRect);
-		gtk_appbar_querypos(ab, msg->hwnd, get_rect_of_window(msg->hwnd));
+		gtk_appbar_querypos(ab, msg->hwnd, windowRect);
 		if (EqualRect(&orig, &(ab->docked_rect)) == 0) {
 			MoveWindow(msg->hwnd, ab->docked_rect.left, ab->docked_rect.top,
 				ab->docked_rect.right - ab->docked_rect.left,
 				ab->docked_rect.bottom - ab->docked_rect.top, TRUE);
 		}
 gtk_appbar_setpos(ab, msg->hwnd);
-	break;
+		break;
 #if 0
 	default:
 		gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "gtk_appbar_callback: %d\n", msg->wParam);
 #endif
 }
 }
 return GDK_FILTER_CONTINUE;
 }
 void gtk_appbar_dock(GtkAppBar *ab, UINT side) {
-RECT orig;
+	RECT orig, windowRect;
 gaim_debug(GAIM_DEBUG_INFO, "gtkappbar", "gtk_appbar_dock\n");
 if(!ab || !IsWindow(GDK_WINDOW_HWND(ab->win->window)))
 return;
 ab->side = side;
 get_window_normal_rc(GDK_WINDOW_HWND(ab->win->window), &(ab->docked_rect));
 CopyRect(&orig, &(ab->docked_rect));
-	gtk_appbar_querypos(ab, GDK_WINDOW_HWND(ab->win->window),
+	get_rect_of_window(GDK_WINDOW_HWND(ab->win->window), &windowRect);
-			get_rect_of_window(GDK_WINDOW_HWND(ab->win->window)));
+	gtk_appbar_querypos(ab, GDK_WINDOW_HWND(ab->win->window), windowRect);
 if(EqualRect(&orig, &(ab->docked_rect)) == 0)
 MoveWindow(GDK_WINDOW_HWND(ab->win->window),
 ab->docked_rect.left,
 ab->docked_rect.top,
 ab->docked_rect.right - ab->docked_rect.left,
 ab->docked_rect.bottom - ab->docked_rect.top, TRUE);
 gtk_appbar_setpos(ab, GDK_WINDOW_HWND(ab->win->window));
 set_toolbar(GDK_WINDOW_HWND(ab->win->window), TRUE);
 ab->docked = TRUE;

Mercurial > pidgin3 / file comparison

comparison: pidgin/plugins/win32/winprefs/gtkappbar.c

pidgin/plugins/win32/winprefs/gtkappbar.c