Commit 3b07f107 authored by Axel Beckert's avatar Axel Beckert

Merge tag 'upstream/1.02+git2015.10.03+7dbb30'

Upstream version 1.02+git2015.10.03+7dbb30

# gpg: Signature made Mon Sep 12 23:52:42 2016 CEST
# gpg:                using RSA key 6BE663C75A35C975
# gpg: Good signature from "Axel Beckert <abe@deuxchevaux.org>" [ultimate]
# gpg:                 aka "Axel Beckert (E-Mail + Jabber) <abe@noone.org>" [ultimate]
# gpg:                 aka "Axel Beckert (Symlink) <xtaran@symlink.ch>" [ultimate]
# gpg:                 aka "[jpeg image of size 3155]" [ultimate]
# gpg:                 aka "Axel Stefan Beckert" [ultimate]
# gpg:                 aka "Axel Beckert (FSFE Fellow) <abe@fsfe.org>" [ultimate]
# gpg:                 aka "Axel Beckert (Debian Developer) <abe@debian.org>" [ultimate]
parents fd07faff 8cb50a6a
flwm
autom4te.cache
config.log
config.status
configure
htdocs
makedepend
makeinclude
*~
*.o
......@@ -437,10 +437,12 @@ int Frame::force_y_onscreen(int Y, int H) {
// The destructor is called on DestroyNotify, so I don't have to do anything
// to the contained window, which is already been destroyed.
#if FL_MAJOR_VERSION < 2 && FL_MINOR_VERSION < 3
// fltk bug: it does not clear these pointers when window is deleted,
// causing flwm to crash on window close sometimes:
extern Fl_Window *fl_xfocus;
extern Fl_Window *fl_xmousewin;
#endif
Frame::~Frame() {
......@@ -452,7 +454,7 @@ Frame::~Frame() {
// a legal state value to this location:
state_ = UNMAPPED;
#if FL_MAJOR_VERSION < 2
#if FL_MAJOR_VERSION < 2 && FL_MINOR_VERSION < 3
// fix fltk bug:
fl_xfocus = 0;
fl_xmousewin = 0;
......@@ -473,7 +475,7 @@ Frame::~Frame() {
delete[] window_Colormaps;
}
//if (iconlabel()) XFree((char*)iconlabel());
if (label()) XFree((char*)label());
if (label()) XFree((char*)label());
}
////////////////////////////////////////////////////////////////
......@@ -1284,9 +1286,10 @@ void Frame::draw() {
#endif
fl_color(labelcolor());
fl_font(TITLE_FONT_SLOT, TITLE_FONT_SIZE);
fl_draw(90, label(),
(left + fl_height() + 1)/2 - fl_descent(),
label_y+3+fl_width(label()));
if (label() && *label())
fl_draw(90, label(),
(left + fl_height() + 1)/2 - fl_descent(),
label_y+3+fl_width(label()));
fl_pop_clip();
}
}
......
SHELL=/bin/sh
PROGRAM = flwm
VERSION = 1.02+git2015.04.29
VERSION = 1.02
CXXFILES = main.C Frame.C Menu.C FrameWindow.C Desktop.C Hotkeys.C
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment