mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-08 06:44:11 +01:00
cb3702559a
Revert patches that moved variables from WMScreen to global level because this broke X displays with multiple independent screens and caused dock and clip icons to become mixed up. When managing multiple screens each screen used to have it's own state/dock and clip. This commit restores that by reverting mainly the commits listed below (and those that are invalidated by reverting these) and fixing up later commits to apply after the revert. Reverted commits:f60e65001bMoved 'workspace_name_font' from the Screen to a Workspace object in the global namespace9e103a46e9Variable workspace_count moved to the workspace object in the global namespacee5ae684d02Variable last_workspace moved to workspace object in global namespacec610b8d7ceVariable current_workspace moved to workspace object in global namespacef0c5073600Array of workspaces moved to the workspace object in the global namespace9c252988f8Variable workspace_menu moved to workspace object in global namespacee86b8dcb2fClip, Dock and Drawers menu moved to appropriate global namespace074092f319Removed WScreen args not used4a7daf2322AppIcon list moved out of WScreen2103fe390bVariable clip_icon moved to clip object in the global namespace014bc52531wClipIconPaint appicon argument removed40e1ea08b8Varible session_state moved to global namespace6987d4aa40Removed WScreen argument0de3e590ceshortcutWindows moved to w_global2e64831fb6Removed unused variable wapp_listb6423a7b4fwmaker: Moved variable Screen Count into the global namespace Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
128 lines
4.0 KiB
C
128 lines
4.0 KiB
C
/* dock.h- built-in Dock module for WindowMaker
|
|
*
|
|
* Window Maker window manager
|
|
*
|
|
* Copyright (c) 1997-2003 Alfredo K. Kojima
|
|
* Copyright (c) 1998-2003 Dan Pascu
|
|
*
|
|
* 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
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef WMDOCK_H_
|
|
#define WMDOCK_H_
|
|
|
|
#include "appicon.h"
|
|
|
|
typedef struct WDock {
|
|
WScreen *screen_ptr;
|
|
int x_pos, y_pos; /* position of the first icon */
|
|
|
|
WAppIcon **icon_array; /* array of docked icons */
|
|
int max_icons;
|
|
|
|
int icon_count;
|
|
|
|
#define WM_DOCK 0
|
|
#define WM_CLIP 1
|
|
#define WM_DRAWER 2
|
|
int type;
|
|
|
|
WMagicNumber auto_expand_magic;
|
|
WMagicNumber auto_collapse_magic;
|
|
WMagicNumber auto_raise_magic;
|
|
WMagicNumber auto_lower_magic;
|
|
unsigned int auto_collapse:1; /* if clip auto-collapse itself */
|
|
unsigned int auto_raise_lower:1; /* if clip should raise/lower when
|
|
* entered/leaved */
|
|
unsigned int on_right_side:1;
|
|
unsigned int collapsed:1;
|
|
unsigned int mapped:1;
|
|
unsigned int lowered:1;
|
|
unsigned int attract_icons:1; /* If clip should attract app-icons */
|
|
|
|
unsigned int lclip_button_pushed:1;
|
|
unsigned int rclip_button_pushed:1;
|
|
|
|
struct WMenu *menu;
|
|
|
|
struct WDDomain *defaults;
|
|
} WDock;
|
|
|
|
|
|
|
|
|
|
|
|
WDock *wDockCreate(WScreen *scr, int type, const char *name);
|
|
WDock *wDockRestoreState(WScreen *scr, WMPropList *dock_state, int type);
|
|
|
|
void wDockDestroy(WDock *dock);
|
|
void wDockHideIcons(WDock *dock);
|
|
void wDockShowIcons(WDock *dock);
|
|
void wDockLower(WDock *dock);
|
|
void wDockRaise(WDock *dock);
|
|
void wDockRaiseLower(WDock *dock);
|
|
void wDockSaveState(WScreen *scr, WMPropList *old_state);
|
|
|
|
Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y, Bool update_icon);
|
|
Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
|
|
int *ret_x, int *ret_y, int redocking);
|
|
Bool wDockFindFreeSlot(WDock *dock, int *req_x, int *req_y);
|
|
void wDockDetach(WDock *dock, WAppIcon *icon);
|
|
Bool wDockMoveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int y);
|
|
void wDockReattachIcon(WDock *dock, WAppIcon *icon, int x, int y);
|
|
|
|
void wSlideAppicons(WAppIcon **appicons, int n, int to_the_left);
|
|
void wDrawerFillTheGap(WDock *drawer, WAppIcon *aicon, Bool redocking);
|
|
|
|
void wDockFinishLaunch(WAppIcon *icon);
|
|
void wDockTrackWindowLaunch(WDock *dock, Window window);
|
|
WAppIcon *wDockFindIconForWindow(WDock *dock, Window window);
|
|
void wDockDoAutoLaunch(WDock *dock, int workspace);
|
|
void wDockLaunchWithState(WAppIcon *btn, WSavedState *state);
|
|
|
|
#ifdef XDND
|
|
int wDockReceiveDNDDrop(WScreen *scr, XEvent *event);
|
|
#endif
|
|
|
|
void wClipIconPaint(WAppIcon *aicon);
|
|
void wClipSaveState(WScreen *scr);
|
|
WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace);
|
|
WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state);
|
|
|
|
void wDrawerIconPaint(WAppIcon *dicon);
|
|
void wDrawersSaveState(WScreen *scr);
|
|
void wDrawersRestoreState(WScreen *scr);
|
|
int wIsADrawer(WAppIcon *aicon);
|
|
|
|
void wClipUpdateForWorkspaceChange(WScreen *scr, int workspace);
|
|
|
|
RImage *wClipMakeTile(RImage *normalTile);
|
|
RImage* wDrawerMakeTile(WScreen *scr, RImage *normalTile);
|
|
|
|
#define WO_FAILED 0
|
|
#define WO_NOT_APPLICABLE 1
|
|
#define WO_SUCCESS 2
|
|
|
|
typedef enum
|
|
{
|
|
P_NORMAL = 0,
|
|
P_AUTO_RAISE_LOWER,
|
|
P_KEEP_ON_TOP,
|
|
} dockPosition;
|
|
|
|
int wClipMakeIconOmnipresent(WAppIcon *aicon, int omnipresent);
|
|
|
|
#endif
|