mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-25 16:02:33 +01:00
Define TITLEBAR_HEIGHT in default configuration file
...and use it in src/placement.c And while we are at it, clean up a bit the visual of wconfig.h.in
This commit is contained in:
Carlos R. Mafra
@@ -324,7 +324,7 @@ static void set_width_height(WWindow *wwin, unsigned int *width, unsigned int *h
|
||||
*height += wwin->frame->top_width + wwin->frame->bottom_width;
|
||||
} else {
|
||||
if (HAS_TITLEBAR(wwin))
|
||||
*height += 18;
|
||||
*height += TITLEBAR_HEIGHT;
|
||||
if (HAS_RESIZEBAR(wwin))
|
||||
*height += RESIZEBAR_HEIGHT;
|
||||
}
|
||||
|
||||
272
src/wconfig.h.in
272
src/wconfig.h.in
@@ -28,54 +28,35 @@
|
||||
/*** Change this file (wconfig.h) *after* you ran configure ***/
|
||||
|
||||
/*
|
||||
*--------------------------------------------------------------------
|
||||
* Feature Selection
|
||||
*
|
||||
* Comment out the following #defines if you want to
|
||||
* disable a feature.
|
||||
* Also check the features you can enable through configure.
|
||||
*--------------------------------------------------------------------
|
||||
* Comment out the following #defines if you want to disable a feature.
|
||||
* Also check the features you can enable through configure.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* #undefine if you dont want texture plugin support or your system have
|
||||
* some sort of problem with them.
|
||||
*/
|
||||
#define TEXTURE_PLUGIN
|
||||
|
||||
#ifdef TEXTURE_PLUGIN
|
||||
#undef DRAWSTRING_PLUGIN
|
||||
#ifdef TEXTURE_PLUGIN
|
||||
#undef DRAWSTRING_PLUGIN
|
||||
#endif
|
||||
|
||||
|
||||
/* undefine ANIMATIONS if you don't want animations for iconification,
|
||||
* shading, icon arrangement etc. */
|
||||
/* If you want animations for iconification, shading, icon arrangement etc. */
|
||||
#define ANIMATIONS
|
||||
|
||||
|
||||
/*
|
||||
* undefine USECPP if you don't want your config files to be preprocessed
|
||||
* by cpp
|
||||
*/
|
||||
/* undefine it if you don't want your config files to be preprocessed by cpp */
|
||||
#define USECPP
|
||||
|
||||
/* #define CPP_PATH @CPP_PATH@ */
|
||||
|
||||
|
||||
#define NETWM_HINTS
|
||||
|
||||
/*
|
||||
* support for XDND drop in the Dock. Experimental
|
||||
*/
|
||||
/* support for XDND drop in the Dock. Experimental */
|
||||
/*#define XDND*/
|
||||
|
||||
/*
|
||||
* support for Motif window manager (mwm) window hints
|
||||
*/
|
||||
/* support for Motif window manager (mwm) window hints */
|
||||
#define MWM_HINTS
|
||||
|
||||
|
||||
/*
|
||||
* Undefine BALLOON_TEXT if you don't want balloons for showing extra
|
||||
* information, like window titles that are not fully visible.
|
||||
@@ -89,7 +70,6 @@
|
||||
*/
|
||||
#define SHAPED_BALLOON
|
||||
|
||||
|
||||
/*
|
||||
* Turn on a hack to make mouse and keyboard actions work even if
|
||||
* the NumLock or ScrollLock modifiers are turned on. They might
|
||||
@@ -100,8 +80,6 @@
|
||||
*/
|
||||
#define NUMLOCK_HACK
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* define OPTIMIZE_SHAPE if you want the shape setting code to be optimized
|
||||
* for applications that change their shape frequently (like xdaliclock
|
||||
@@ -118,20 +96,15 @@
|
||||
*/
|
||||
#undef CONFIGURE_WINDOW_WHILE_MOVING
|
||||
|
||||
|
||||
/*
|
||||
* disable/enable workspace indicator in the dock
|
||||
*/
|
||||
/* disable/enable workspace indicator in the dock */
|
||||
#undef WS_INDICATOR
|
||||
|
||||
|
||||
/*
|
||||
* define HIDDENDOT if you want a dot to be shown in the application icon
|
||||
* of applications that are hidden.
|
||||
*/
|
||||
#define HIDDENDOT
|
||||
|
||||
|
||||
/*
|
||||
* Ignores the PPosition hint from clients. This is needed for some
|
||||
* programs that have buggy implementations of such hint and place
|
||||
@@ -139,28 +112,14 @@
|
||||
*/
|
||||
#undef IGNORE_PPOSITION
|
||||
|
||||
|
||||
/*
|
||||
* Do not scale application icon and miniwindow icon images.
|
||||
*/
|
||||
/* Do not scale application icon and miniwindow icon images */
|
||||
#undef DONT_SCALE_ICONS
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#define SILLYNESS
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
*..........................................................................
|
||||
* The following options WILL NOT BE MADE RUN-TIME. Please do not request.
|
||||
* They will only add unneeded bloat.
|
||||
*..........................................................................
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -189,40 +148,26 @@
|
||||
* is enabled. Only enable one of them.
|
||||
*/
|
||||
#undef WINDOW_BIRTH_ZOOM
|
||||
|
||||
#undef WINDOW_BIRTH_ZOOM2
|
||||
|
||||
/*
|
||||
* whether arrow drawing in clip buttons should be gradiented
|
||||
*/
|
||||
/* whether arrow drawing in clip buttons should be gradiented */
|
||||
#undef GRADIENT_CLIP_ARROWS
|
||||
|
||||
|
||||
/*
|
||||
*--------------------------------------------------------------------
|
||||
* Default Configuration
|
||||
*
|
||||
* Some of the following options can be configured in
|
||||
* the preference files, but if for some reason, they can't
|
||||
* be used, these defaults will be.
|
||||
* There are also some options that can only be configured here,
|
||||
* at compile time.
|
||||
*--------------------------------------------------------------------
|
||||
* Some of the following options can be configured in the preference files,
|
||||
* but if for some reason they can't, these are their defaults.
|
||||
*
|
||||
* There are also some options that can only be configured here, at compile time.
|
||||
*/
|
||||
|
||||
/* list of paths to look for the config files, searched in order
|
||||
* of appearance */
|
||||
#define DEF_CONFIG_PATHS \
|
||||
"~/GNUstep/Library/WindowMaker:"PKGDATADIR
|
||||
|
||||
#define DEF_MENU_FILE "menu"
|
||||
/* list of paths to look for the config files, searched in order of appearance */
|
||||
#define DEF_CONFIG_PATHS "~/GNUstep/Library/WindowMaker:"PKGDATADIR
|
||||
#define DEF_MENU_FILE "menu"
|
||||
|
||||
/* name of the script to execute at startup */
|
||||
#define DEF_INIT_SCRIPT "autostart"
|
||||
|
||||
#define DEF_EXIT_SCRIPT "exitscript"
|
||||
|
||||
#define DEFAULTS_DIR "Defaults"
|
||||
#define DEFAULTS_DIR "Defaults"
|
||||
|
||||
#ifdef USE_TIFF
|
||||
#define DEF_BUTTON_IMAGES PKGDATADIR"/buttons.tiff"
|
||||
@@ -234,7 +179,6 @@
|
||||
#define GLOBAL_PREAMBLE_MENU_FILE "GlobalMenu.pre"
|
||||
#define GLOBAL_EPILOGUE_MENU_FILE "GlobalMenu.post"
|
||||
|
||||
|
||||
/* pixmap path */
|
||||
#define DEF_PIXMAP_PATHS \
|
||||
"(\"~/pixmaps\",\"~/GNUstep/Library/WindowMaker/Pixmaps\",\""PIXMAPDIR"\")"
|
||||
@@ -249,36 +193,34 @@
|
||||
#define DEF_ICON_PATHS \
|
||||
"(\"~/pixmaps\",\"~/GNUstep/Library/Icons\",\"/usr/include/X11/pixmaps/\",\""PIXMAPDIR"\")"
|
||||
|
||||
|
||||
/* window title to use for untitled windows */
|
||||
#define DEF_WINDOW_TITLE "Untitled"
|
||||
|
||||
/* default style */
|
||||
#define DEF_FRAME_COLOR "white"
|
||||
|
||||
|
||||
#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
|
||||
#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
|
||||
#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
|
||||
#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\""
|
||||
#define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\""
|
||||
#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
|
||||
|
||||
/* default fonts */
|
||||
#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
|
||||
#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
|
||||
#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
|
||||
#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\""
|
||||
#define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\""
|
||||
#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
|
||||
#define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=24\""
|
||||
|
||||
|
||||
#define DEF_FRAME_THICKNESS 1 /* linewidth of the move/resize frame */
|
||||
/* line width of the move/resize frame */
|
||||
#define DEF_FRAME_THICKNESS 1
|
||||
|
||||
#define DEF_WINDOW_TITLE_EXTEND_SPACE "0"
|
||||
#define DEF_MENU_TITLE_EXTEND_SPACE "0"
|
||||
#define DEF_MENU_TEXT_EXTEND_SPACE "0"
|
||||
#define TITLEBAR_EXTEND_SPACE 4
|
||||
#define TITLEBAR_EXTEND_SPACE 4
|
||||
|
||||
#define DEF_XPM_CLOSENESS 40000
|
||||
#define DEF_XPM_CLOSENESS 40000
|
||||
|
||||
/* default position of application menus */
|
||||
#define DEF_APPMENU_X 10
|
||||
#define DEF_APPMENU_Y 10
|
||||
#define DEF_APPMENU_X 10
|
||||
#define DEF_APPMENU_Y 10
|
||||
|
||||
/* calculate window edge resistance from edge resistance */
|
||||
#define WIN_RESISTANCE(x) (((x)*20)/30)
|
||||
@@ -294,8 +236,7 @@
|
||||
* time exceeds this value, it is immediately finished. Usefull for
|
||||
* moments of high-load.
|
||||
*/
|
||||
#define MAX_ANIMATION_TIME 1
|
||||
|
||||
#define MAX_ANIMATION_TIME 1
|
||||
/* Zoom animation */
|
||||
#define MINIATURIZE_ANIMATION_FRAMES_Z 5
|
||||
#define MINIATURIZE_ANIMATION_STEPS_Z 12
|
||||
@@ -311,21 +252,14 @@
|
||||
#define MINIATURIZE_ANIMATION_DELAY_F 20000
|
||||
#define MINIATURIZE_ANIMATION_TWIST_F 0.5
|
||||
|
||||
|
||||
#define HIDE_ANIMATION_STEPS (MINIATURIZE_ANIMATION_STEPS*2/3)
|
||||
|
||||
/* delay before balloon is shown (ms) */
|
||||
#define BALLOON_DELAY 1000
|
||||
/* delays in ms...*/
|
||||
#define BALLOON_DELAY 1000 /* ...before balloon is shown */
|
||||
#define MENU_SELECT_DELAY 200 /* ...for menu item selection hysteresis */
|
||||
#define MENU_JUMP_BACK_DELAY 400 /* ...for jumpback of scrolled menus */
|
||||
|
||||
/* delay for menu item selection hysteresis (ms) */
|
||||
#define MENU_SELECT_DELAY 200
|
||||
|
||||
/* delay for jumpback of scrolled menus (ms) */
|
||||
#define MENU_JUMP_BACK_DELAY 400
|
||||
|
||||
/* *** animation speed constants *** */
|
||||
|
||||
/* icon slide */
|
||||
/* animation speed constants */
|
||||
#define ICON_SLIDE_SLOWDOWN_UF 1
|
||||
#define ICON_SLIDE_DELAY_UF 0
|
||||
#define ICON_SLIDE_STEPS_UF 50
|
||||
@@ -362,7 +296,6 @@
|
||||
#define MENU_SCROLL_STEPS_US 1
|
||||
#define MENU_SCROLL_DELAY_US 8
|
||||
|
||||
|
||||
/* shade animation */
|
||||
#define SHADE_STEPS_UF 5
|
||||
#define SHADE_DELAY_UF 0
|
||||
@@ -379,7 +312,6 @@
|
||||
#define SHADE_STEPS_US 40
|
||||
#define SHADE_DELAY_US 10
|
||||
|
||||
|
||||
/* workspace name on switch display */
|
||||
#define WORKSPACE_NAME_FADE_DELAY 30
|
||||
|
||||
@@ -389,34 +321,32 @@
|
||||
#define VIRTUALEDGE_SCROLL_HSTEP 30
|
||||
#endif
|
||||
|
||||
#define WORKSPACE_NAME_DELAY 400
|
||||
#define WORKSPACE_NAME_DELAY 400
|
||||
|
||||
/* window birth animation steps (DO NOT MAKE IT RUN-TIME) */
|
||||
#define WINDOW_BIRTH_STEPS 20
|
||||
#define WINDOW_BIRTH_STEPS 20
|
||||
|
||||
/* number of steps for icon dematerialization. */
|
||||
#define DEMATERIALIZE_STEPS 16
|
||||
#define DEMATERIALIZE_STEPS 16
|
||||
|
||||
/* Delay when cycling colors of selected icons. */
|
||||
#define COLOR_CYCLE_DELAY 200
|
||||
#define COLOR_CYCLE_DELAY 200
|
||||
|
||||
/* size of the pieces in the undocked icon explosion */
|
||||
#define ICON_KABOOM_PIECE_SIZE 4
|
||||
|
||||
|
||||
/* Position increment for smart placement. >= 1 raise these values if it's
|
||||
* too slow for you */
|
||||
#define PLACETEST_HSTEP 8
|
||||
#define PLACETEST_VSTEP 8
|
||||
#define ICON_KABOOM_PIECE_SIZE 4
|
||||
|
||||
/*
|
||||
* Position increment for smart placement: >= 1
|
||||
* Raise these values if it's too slow for you
|
||||
*/
|
||||
#define PLACETEST_HSTEP 8
|
||||
#define PLACETEST_VSTEP 8
|
||||
|
||||
#define DOCK_EXTRA_SPACE 0
|
||||
|
||||
/* Vicinity in which an icon can be attached to the clip */
|
||||
#define CLIP_ATTACH_VICINITY 1
|
||||
|
||||
#define CLIP_BUTTON_SIZE 23
|
||||
|
||||
#define CLIP_BUTTON_SIZE 23
|
||||
|
||||
/* The amount of space (in multiples of the icon size)
|
||||
* a docked icon must be dragged out to detach it */
|
||||
@@ -436,105 +366,76 @@
|
||||
* Set this to zero if you want instant raise. */
|
||||
#define AUTO_RAISE_DELAY 600
|
||||
|
||||
|
||||
/* Max. number of icons the clip can have */
|
||||
#define CLIP_MAX_ICONS 32
|
||||
|
||||
/* blink interval when invoking a menu item */
|
||||
#define MENU_BLINK_DELAY 60000
|
||||
#define MENU_BLINK_COUNT 2
|
||||
|
||||
#define CURSOR_BLINK_RATE 300
|
||||
|
||||
#define MOVE_THRESHOLD 5 /* how many pixels to move before dragging windows
|
||||
* and other objects */
|
||||
|
||||
#define KEY_CONTROL_WINDOW_WEIGHT 1
|
||||
|
||||
/* how many pixels to move before dragging windows and other objects */
|
||||
#define MOVE_THRESHOLD 5
|
||||
#define HRESIZE_THRESHOLD 3
|
||||
|
||||
#define MAX_WORKSPACENAME_WIDTH 64
|
||||
#define MAX_WINDOWLIST_WIDTH 160 /* max width of window title in
|
||||
* window list */
|
||||
/* max width of window title in window list */
|
||||
#define MAX_WINDOWLIST_WIDTH 160
|
||||
|
||||
#define KEY_CONTROL_WINDOW_WEIGHT 1
|
||||
|
||||
/* if your keyboard don't have arrow keys */
|
||||
#undef ARROWLESS_KBD
|
||||
|
||||
|
||||
/* don't put titles in miniwindows */
|
||||
#undef NO_MINIWINDOW_TITLES
|
||||
|
||||
|
||||
#define FRAME_BORDER_COLOR "black"
|
||||
|
||||
|
||||
/* for boxes with high mouse sampling rates (SGI) */
|
||||
#define DELAY_BETWEEN_MOUSE_SAMPLING 10
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* You should not modify the following values, unless you know
|
||||
* what you're doing.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
/* number of window shortcuts */
|
||||
#define MAX_WINDOW_SHORTCUTS 10
|
||||
|
||||
|
||||
#define WM_PI 3.14159265358979323846
|
||||
|
||||
#define FRAME_BORDER_WIDTH 1 /* width of window border for frames */
|
||||
|
||||
#define RESIZEBAR_HEIGHT 8 /* height of the resizebar */
|
||||
#define RESIZEBAR_MIN_WIDTH 20 /* min. width of handles-corner_width */
|
||||
#define RESIZEBAR_CORNER_WIDTH 28 /* width of the corner of resizebars */
|
||||
|
||||
#define MENU_INDICATOR_SPACE 12
|
||||
|
||||
/* minimum size for windows */
|
||||
#define MIN_WINDOW_SIZE 5
|
||||
|
||||
#define MAX_WINDOW_SHORTCUTS 10
|
||||
#define WM_PI 3.14159265358979323846
|
||||
#define MIN_TITLEFONT_HEIGHT(h) ((h)>14 ? (h) : 14)
|
||||
|
||||
#define ICON_WIDTH 64 /* size of the icon window */
|
||||
#define ICON_HEIGHT 64
|
||||
#define ICON_BORDER_WIDTH 2
|
||||
|
||||
#define MAX_ICON_WIDTH 60 /* size of the icon pixmap */
|
||||
#define MAX_ICON_HEIGHT 48
|
||||
|
||||
#define MAX_WORKSPACES 100
|
||||
|
||||
#define MAX_MENU_TEXT_LENGTH 512
|
||||
|
||||
#define MAX_RESTART_ARGS 16
|
||||
|
||||
#define MAX_DEAD_PROCESSES 128
|
||||
|
||||
|
||||
#define MAXLINE 1024
|
||||
|
||||
#define TITLEBAR_HEIGHT 18 /* window's titlebar height */
|
||||
#define RESIZEBAR_HEIGHT 8 /* height of the resizebar */
|
||||
#define FRAME_BORDER_WIDTH 1 /* width of window border for frames */
|
||||
#define RESIZEBAR_MIN_WIDTH 20 /* min width of handles-corner_width */
|
||||
#define RESIZEBAR_CORNER_WIDTH 28 /* width of the corner of resizebars */
|
||||
#define MENU_INDICATOR_SPACE 12
|
||||
#define MIN_WINDOW_SIZE 5 /* minimum size for windows */
|
||||
#define ICON_WIDTH 64 /* size of the icon window */
|
||||
#define ICON_HEIGHT 64
|
||||
#define ICON_BORDER_WIDTH 2
|
||||
#define MAX_ICON_WIDTH 60 /* size of the icon pixmap */
|
||||
#define MAX_ICON_HEIGHT 48
|
||||
#define MAX_WORKSPACES 100
|
||||
#define MAX_MENU_TEXT_LENGTH 512
|
||||
#define MAX_RESTART_ARGS 16
|
||||
#define MAX_DEAD_PROCESSES 128
|
||||
#define MAXLINE 1024
|
||||
|
||||
#ifdef _MAX_PATH
|
||||
# define DEFAULT_PATH_MAX _MAX_PATH
|
||||
# define DEFAULT_PATH_MAX _MAX_PATH
|
||||
#else
|
||||
# define DEFAULT_PATH_MAX 512
|
||||
# define DEFAULT_PATH_MAX 512
|
||||
#endif
|
||||
|
||||
|
||||
#define DEBUG0
|
||||
|
||||
/* some rules */
|
||||
|
||||
#ifndef SHAPE
|
||||
#undef SHAPED_BALLOON
|
||||
#endif
|
||||
|
||||
#ifdef XKB_MODELOCK
|
||||
#ifdef XKB_MODELOCK
|
||||
#define KEEP_XKB_LOCK_STATUS
|
||||
/* This is a hidden feature.
|
||||
* Choose just one of LANGUAGE_* hints.
|
||||
@@ -542,26 +443,25 @@
|
||||
* More icons are welcome.
|
||||
*/
|
||||
#define XKB_BUTTON_HINT
|
||||
#undef LANGUAGE_TH
|
||||
#undef LANGUAGE_SK
|
||||
#undef LANGUAGE_TH
|
||||
#undef LANGUAGE_SK
|
||||
#endif
|
||||
|
||||
#ifndef DEMATERIALIZE_ICON
|
||||
# define NORMAL_ICON_KABOOM
|
||||
#ifndef DEMATERIALIZE_ICON
|
||||
#define NORMAL_ICON_KABOOM
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LIBINTL_H) && defined(I18N)
|
||||
# include <libintl.h>
|
||||
# define _(text) gettext(text)
|
||||
#include <libintl.h>
|
||||
#define _(text) gettext(text)
|
||||
#else
|
||||
# define _(text) (text)
|
||||
#define _(text) (text)
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
# define INLINE inline
|
||||
#define INLINE inline
|
||||
#else
|
||||
# define INLINE
|
||||
#define INLINE
|
||||
#endif
|
||||
|
||||
#endif /* WMCONFIG_H_ */
|
||||
|
||||
Reference in New Issue
Block a user