mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-22 22:28:02 +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>
61 lines
2.2 KiB
C
61 lines
2.2 KiB
C
/*
|
|
* Window Maker window manager
|
|
*
|
|
* Copyright (c) 1997-2003 Alfredo K. Kojima
|
|
*
|
|
* 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 WMDEFAULTS_H_
|
|
#define WMDEFAULTS_H_
|
|
|
|
typedef struct WDDomain {
|
|
const char *domain_name;
|
|
WMPropList *dictionary;
|
|
const char *path;
|
|
time_t timestamp;
|
|
} WDDomain;
|
|
|
|
WDDomain * wDefaultsInitDomain(const char *domain, Bool requireDictionary);
|
|
|
|
void wDefaultsMergeGlobalMenus(WDDomain *menuDomain);
|
|
|
|
void wReadDefaults(WScreen *scr, WMPropList *new_dict);
|
|
void wDefaultUpdateIcons(WScreen *scr);
|
|
void wReadStaticDefaults(WMPropList *dict);
|
|
void wDefaultsCheckDomains(void *arg);
|
|
void wSaveDefaults(WScreen *scr);
|
|
void wDefaultFillAttributes(const char *instance, const char *class,
|
|
WWindowAttributes *attr, WWindowAttributes *mask,
|
|
Bool useGlobalDefault);
|
|
|
|
char *get_default_image_path(void);
|
|
RImage *get_default_image(WScreen *scr);
|
|
|
|
char *wDefaultGetIconFile(const char *instance, const char *class, Bool default_icon);
|
|
|
|
RImage *get_icon_image(WScreen *scr, const char *winstance, const char *wclass, int max_size);
|
|
char *get_icon_filename(const char *winstance, const char *wclass, const char *command,
|
|
Bool default_icon);
|
|
|
|
|
|
int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char *class);
|
|
void wDefaultChangeIcon(const char *instance, const char* class, const char *file);
|
|
RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int max_size);
|
|
|
|
void wDefaultPurgeInfo(const char *instance, const char *class);
|
|
|
|
#endif /* WMDEFAULTS_H_ */
|