Commit 8cb50a6a authored by Axel Beckert's avatar Axel Beckert

New upstream version 1.02+git2015.10.03+7dbb30

parent 91a02b6e
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) { ...@@ -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 // The destructor is called on DestroyNotify, so I don't have to do anything
// to the contained window, which is already been destroyed. // 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, // fltk bug: it does not clear these pointers when window is deleted,
// causing flwm to crash on window close sometimes: // causing flwm to crash on window close sometimes:
extern Fl_Window *fl_xfocus; extern Fl_Window *fl_xfocus;
extern Fl_Window *fl_xmousewin; extern Fl_Window *fl_xmousewin;
#endif
Frame::~Frame() { Frame::~Frame() {
...@@ -452,7 +454,7 @@ Frame::~Frame() { ...@@ -452,7 +454,7 @@ Frame::~Frame() {
// a legal state value to this location: // a legal state value to this location:
state_ = UNMAPPED; state_ = UNMAPPED;
#if FL_MAJOR_VERSION < 2 #if FL_MAJOR_VERSION < 2 && FL_MINOR_VERSION < 3
// fix fltk bug: // fix fltk bug:
fl_xfocus = 0; fl_xfocus = 0;
fl_xmousewin = 0; fl_xmousewin = 0;
...@@ -473,7 +475,7 @@ Frame::~Frame() { ...@@ -473,7 +475,7 @@ Frame::~Frame() {
delete[] window_Colormaps; delete[] window_Colormaps;
} }
//if (iconlabel()) XFree((char*)iconlabel()); //if (iconlabel()) XFree((char*)iconlabel());
if (label()) XFree((char*)label()); if (label()) XFree((char*)label());
} }
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
...@@ -1284,9 +1286,10 @@ void Frame::draw() { ...@@ -1284,9 +1286,10 @@ void Frame::draw() {
#endif #endif
fl_color(labelcolor()); fl_color(labelcolor());
fl_font(TITLE_FONT_SLOT, TITLE_FONT_SIZE); fl_font(TITLE_FONT_SLOT, TITLE_FONT_SIZE);
fl_draw(90, label(), if (label() && *label())
(left + fl_height() + 1)/2 - fl_descent(), fl_draw(90, label(),
label_y+3+fl_width(label())); (left + fl_height() + 1)/2 - fl_descent(),
label_y+3+fl_width(label()));
fl_pop_clip(); fl_pop_clip();
} }
} }
......
SHELL=/bin/sh SHELL=/bin/sh
PROGRAM = flwm PROGRAM = flwm
VERSION = 1.02+git2015.04.29 VERSION = 1.02
CXXFILES = main.C Frame.C Menu.C FrameWindow.C Desktop.C Hotkeys.C CXXFILES = main.C Frame.C Menu.C FrameWindow.C Desktop.C Hotkeys.C
......
This diff is collapsed.
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