mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-31 10:46:16 +00:00
94abe2a5a9
Work around an incompatibility between fltk (a dependency) and libXft version 2 which results in flwm getting a SIGSEGV at startup. This basically prevents the vertical labels from being drawn in the vertical title bar on the left of the window. Otherwise there is no change in functionality. I tried using newer versions of fltk but they either had the same problem or were so new that flwm could not be linked.
27 lines
730 B
C
27 lines
730 B
C
--- Rotated.C.orig Fri Aug 27 21:53:28 2004
|
|
+++ Rotated.C Fri Aug 27 12:02:59 2004
|
|
@@ -27,6 +27,7 @@
|
|
/* ********************************************************************** */
|
|
|
|
#include <FL/x.H>
|
|
+#include <X11/Xft/Xft.h>
|
|
#include <FL/fl_draw.H>
|
|
#include "Rotated.H"
|
|
#include <stdlib.h>
|
|
@@ -352,6 +353,7 @@
|
|
static XRotFontStruct* font;
|
|
|
|
void draw_rotated(const char* text, int n, int x, int y, int angle) {
|
|
+#if XFT_MAJOR < 2
|
|
if (!text || !*text) return;
|
|
/* make angle positive ... */
|
|
if (angle < 0) do angle += 360; while (angle < 0);
|
|
@@ -365,6 +367,7 @@
|
|
font = XRotLoadFont(fl_display, fl_xfont, dir);
|
|
}
|
|
XRotDrawString(fl_display, font, fl_window, fl_gc, x, y, text, n);
|
|
+#endif
|
|
}
|
|
|
|
#ifndef FLWM
|