Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ta/dv ifdev #630

Merged
merged 7 commits into from
Nov 14, 2021
Merged

ta/dv ifdev #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c28e61a
Remove ICON_DBG.
domivogt Nov 14, 2021
1048b73
Remove NO_ICONS.
domivogt Nov 14, 2021
43f6e3c
Remove duplicate code.
domivogt Nov 14, 2021
f0e7122
Remove MINI_ICON ifdef that wasn't used anyway.
domivogt Nov 14, 2021
c070822
Remove undefined FOCUS_EXPANFS_TITLE stuff.
domivogt Nov 14, 2021
5d32940
Hard code EXPERIMENTAL_ROU_HANDLING_V2.
domivogt Nov 14, 2021
3371987
Ifdef go away.
domivogt Nov 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions fvwm/add_window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,14 +1416,10 @@ static void setup_icon(FvwmWindow *fw, window_style *pstyle)
if (SHAS_ICON(&pstyle->flags) &&
S_ICON_OVERRIDE(SCF(*pstyle)) == ICON_OVERRIDE)
{
ICON_DBG((stderr,"si: iwh ignored '%s'\n",
fw->name.name));
fw->icon_bitmap_file = SGET_ICON_NAME(*pstyle);
}
else
{
ICON_DBG((stderr,"si: using iwh '%s'\n",
fw->name.name));
fw->icon_bitmap_file = NULL;
}
}
Expand All @@ -1432,27 +1428,21 @@ static void setup_icon(FvwmWindow *fw, window_style *pstyle)
if (SHAS_ICON(&pstyle->flags) &&
S_ICON_OVERRIDE(SCF(*pstyle)) != NO_ICON_OVERRIDE)
{
ICON_DBG((stderr,"si: iph ignored '%s'\n",
fw->name.name));
fw->icon_bitmap_file = SGET_ICON_NAME(*pstyle);
}
else
{
ICON_DBG((stderr,"si: using iph '%s'\n",
fw->name.name));
fw->icon_bitmap_file = NULL;
}
}
else if (SHAS_ICON(&pstyle->flags))
{
/* an icon was specified */
ICON_DBG((stderr,"si: using style '%s'\n", fw->name.name));
fw->icon_bitmap_file = SGET_ICON_NAME(*pstyle);
}
else
{
/* use default icon */
ICON_DBG((stderr,"si: using default '%s'\n", fw->name.name));
fw->icon_bitmap_file = Scr.DefaultIcon;
}

Expand Down Expand Up @@ -1618,16 +1608,6 @@ static void destroy_mini_icon(FvwmWindow *fw)

static void setup_key_and_button_grabs(FvwmWindow *fw)
{
#ifdef BUGS_ARE_COOL
/* dv (29-May-2001): If keys are grabbed separately for C_WINDOW and
* the other contexts, new windows have problems when bindings are
* removed. Therefore, grab all keys in a single pass through the
* list. */
GrabAllWindowKeys(
dpy, FW_W_FRAME(fw), Scr.AllBindings,
C_WINDOW|C_TITLE|C_RALL|C_LALL|C_SIDEBAR, GetUnusedModifiers(),
True);
#endif
GrabAllWindowKeys(
dpy, FW_W_FRAME(fw), Scr.AllBindings,
C_TITLE|C_RALL|C_LALL|C_SIDEBAR|C_WINDOW, GetUnusedModifiers(),
Expand Down Expand Up @@ -2228,8 +2208,6 @@ void increase_icon_hint_count(FvwmWindow *fw)
default:
break;
}
ICON_DBG((stderr,"icon hint count++ (%d) '%s'\n",
(int)WAS_ICON_HINT_PROVIDED(fw), fw->name.name));
}

return;
Expand Down Expand Up @@ -3503,9 +3481,7 @@ void destroy_window(FvwmWindow *fw)

/****** destroy mini icon ******/

#ifdef MINI_ICON
destroy_mini_icon(fw);
#endif

/****** free strings ******/

Expand Down
Loading