Author: matt
Date: 2011-05-26 14:18:08 -0700 (Thu, 26 May 2011)
New Revision: 8743
Log:
123: fixed all errors for Linux/X11/Unix compilation
Modified:
branches/branch-3.0/src/Fl_Gl_Choice.cxx
branches/branch-3.0/src/fl_draw_image.cxx
branches/branch-3.0/src/fl_font_xft.cxx
branches/branch-3.0/src/fl_read_image.cxx
branches/branch-3.0/test/color_chooser.cxx
branches/branch-3.0/test/hello.cxx
branches/branch-3.0/test/image.cxx
branches/branch-3.0/test/list_visuals.cxx
branches/branch-3.0/test/sudoku.cxx
branches/branch-3.0/test/tiled_image.cxx
Modified: branches/branch-3.0/src/Fl_Gl_Choice.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Gl_Choice.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/src/Fl_Gl_Choice.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -111,7 +111,7 @@
XVisualInfo *visp = glXChooseVisual(fl_display, fl_screen, (int *)blist);
if (!visp) {
# if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
- if (m&fltk3::MULTISAMPLE) return find(m&~FL_MULTISAMPLE,0);
+ if (m&fltk3::MULTISAMPLE) return find(m&~fltk3::MULTISAMPLE,0);
# endif
return 0;
}
Modified: branches/branch-3.0/src/fl_draw_image.cxx
===================================================================
--- branches/branch-3.0/src/fl_draw_image.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/src/fl_draw_image.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -355,10 +355,10 @@
fl_xpixel(fltk3::WHITE); // also make sure white is allocated
static XPixmapFormatValues *pfvlist;
- static int fltk3::NUM_pfv;
- if (!pfvlist) pfvlist = XListPixmapFormats(fl_display,&fltk3::NUM_pfv);
+ static int NUM_pfv;
+ if (!pfvlist) pfvlist = XListPixmapFormats(fl_display,&NUM_pfv);
XPixmapFormatValues *pfv;
- for (pfv = pfvlist; pfv < pfvlist+fltk3::NUM_pfv; pfv++)
+ for (pfv = pfvlist; pfv < pfvlist+NUM_pfv; pfv++)
if (pfv->depth == fl_visual->depth) break;
xi.format = ZPixmap;
xi.byte_order = ImageByteOrder(fl_display);
@@ -543,17 +543,17 @@
}
}
-void Fl_Xlib_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int
w, int h, int d, int l){
+void fltk3::XlibGraphicsDriver::draw_image(const uchar* buf, int x, int y, int
w, int h, int d, int l){
innards(buf,x,y,w,h,d,l,(d<3&&d>-3),0,0);
}
-void Fl_Xlib_Graphics_Driver::draw_image(fltk3::DrawImageCb cb, void* data,
+void fltk3::XlibGraphicsDriver::draw_image(fltk3::DrawImageCb cb, void* data,
int x, int y, int w, int h,int d) {
innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data);
}
-void Fl_Xlib_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y,
int w, int h, int d, int l){
+void fltk3::XlibGraphicsDriver::draw_image_mono(const uchar* buf, int x, int
y, int w, int h, int d, int l){
innards(buf,x,y,w,h,d,l,1,0,0);
}
-void Fl_Xlib_Graphics_Driver::draw_image_mono(fltk3::DrawImageCb cb, void*
data,
+void fltk3::XlibGraphicsDriver::draw_image_mono(fltk3::DrawImageCb cb, void*
data,
int x, int y, int w, int h,int d) {
innards(0,x,y,w,h,d,0,1,cb,data);
}
Modified: branches/branch-3.0/src/fl_font_xft.cxx
===================================================================
--- branches/branch-3.0/src/fl_font_xft.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/src/fl_font_xft.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -113,7 +113,7 @@
//const char* fl_encoding_ = "iso8859-1";
const char* fl_encoding_ = "iso10646-1";
-static void fl_xft_font(Fl_Xlib_Graphics_Driver *driver, fltk3::Font fnum,
fltk3::Fontsize size, int angle) {
+static void fl_xft_font(fltk3::XlibGraphicsDriver *driver, fltk3::Font fnum,
fltk3::Fontsize size, int angle) {
if (fnum==-1) { // special case to stop font caching
driver->fltk3::GraphicsDriver::font(0, 0);
return;
@@ -142,7 +142,7 @@
fl_xftfont = (void*)f->font;
}
-void Fl_Xlib_Graphics_Driver::font(fltk3::Font fnum, fltk3::Fontsize size) {
+void fltk3::XlibGraphicsDriver::font(fltk3::Font fnum, fltk3::Fontsize size) {
fl_xft_font(this,fnum,size,0);
}
@@ -382,17 +382,17 @@
#endif
}
-int Fl_Xlib_Graphics_Driver::height() {
+int fltk3::XlibGraphicsDriver::height() {
if (font_descriptor()) return font_descriptor()->font->ascent +
font_descriptor()->font->descent;
else return -1;
}
-int Fl_Xlib_Graphics_Driver::descent() {
+int fltk3::XlibGraphicsDriver::descent() {
if (font_descriptor()) return font_descriptor()->font->descent;
else return -1;
}
-double Fl_Xlib_Graphics_Driver::width(const char* str, int n) {
+double fltk3::XlibGraphicsDriver::width(const char* str, int n) {
if (!font_descriptor()) return -1.0;
XGlyphInfo i;
utf8extents(font_descriptor(), str, n, &i);
@@ -410,11 +410,11 @@
return i.xOff;
}
-double Fl_Xlib_Graphics_Driver::width(unsigned int c) {
+double fltk3::XlibGraphicsDriver::width(unsigned int c) {
return fl_xft_width(font_descriptor(), (FcChar32 *)(&c), 1);
}
-void Fl_Xlib_Graphics_Driver::text_extents(const char *c, int n, int &dx, int
&dy, int &w, int &h) {
+void fltk3::XlibGraphicsDriver::text_extents(const char *c, int n, int &dx,
int &dy, int &w, int &h) {
if (!font_descriptor()) {
w = h = 0;
dx = dy = 0;
@@ -579,7 +579,7 @@
#endif
}
-void Fl_Xlib_Graphics_Driver::draw(const char *str, int n, int x, int y) {
+void fltk3::XlibGraphicsDriver::draw(const char *str, int n, int x, int y) {
if ( !this->font_descriptor() ) {
this->font(fltk3::HELVETICA, fltk3::NORMAL_SIZE);
}
@@ -621,7 +621,7 @@
#endif
}
-void Fl_Xlib_Graphics_Driver::draw(int angle, const char *str, int n, int x,
int y) {
+void fltk3::XlibGraphicsDriver::draw(int angle, const char *str, int n, int x,
int y) {
fl_xft_font(this, this->fltk3::GraphicsDriver::font(), this->size(), angle);
this->draw(str, n, (int)x, (int)y);
fl_xft_font(this, this->fltk3::GraphicsDriver::font(), this->size(), 0);
@@ -662,7 +662,7 @@
}
-void Fl_Xlib_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) {
+void fltk3::XlibGraphicsDriver::rtl_draw(const char* c, int n, int x, int y) {
#if defined(__GNUC__)
// FIXME: warning Need to improve this XFT right to left draw function
Modified: branches/branch-3.0/src/fl_read_image.cxx
===================================================================
--- branches/branch-3.0/src/fl_read_image.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/src/fl_read_image.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -133,7 +133,7 @@
if (!image) {
// fetch absolute coordinates
int dx, dy, sx, sy, sw, sh;
- Window child_win;
+ ::Window child_win;
fltk3::Window *win;
if (allow_outside) win = (fltk3::Window*)1;
Modified: branches/branch-3.0/test/color_chooser.cxx
===================================================================
--- branches/branch-3.0/test/color_chooser.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/test/color_chooser.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -132,14 +132,14 @@
} else if (argv[i][0] != '-') {
#if !defined(WIN32) && !defined(__APPLE__)
int visid = atoi(argv[i]);
- fltk3::open_display();
+ fl_open_display();
XVisualInfo templt; int num;
templt.visualid = visid;
- fltk3::visual = XGetVisualInfo(fltk3::display, VisualIDMask, &templt,
&num);
- if (!fltk3::visual) fltk3::fatal("No visual with id %d",visid);
- fltk3::colormap = XCreateColormap(fltk3::display,
RootWindow(fltk3::display,fltk3::screen),
- fltk3::visual->visual, AllocNone);
- fltk3::xpixel(fltk3::BLACK); // make sure black is allocated
+ fl_visual = XGetVisualInfo(fl_display, VisualIDMask, &templt, &num);
+ if (!fl_visual) fltk3::fatal("No visual with id %d",visid);
+ fl_colormap = XCreateColormap(fl_display,
RootWindow(fl_display,fl_screen),
+ fl_visual->visual, AllocNone);
+ fl_xpixel(fltk3::BLACK); // make sure black is allocated
#else
fltk3::fatal("Visual id's not supported on MSWindows or MacOS.");
#endif
Modified: branches/branch-3.0/test/hello.cxx
===================================================================
--- branches/branch-3.0/test/hello.cxx 2011-05-26 16:43:21 UTC (rev 8742)
+++ branches/branch-3.0/test/hello.cxx 2011-05-26 21:18:08 UTC (rev 8743)
@@ -32,7 +32,7 @@
using namespace fltk3;
int main(int argc, char **argv) {
- Window *window = new Window(340,180);
+ fltk3::Window *window = new fltk3::Window(340,180);
Box *box = new Box(20,40,300,100,"Hello, World!");
box->box(UP_BOX);
box->labelfont(BOLD+ITALIC);
Modified: branches/branch-3.0/test/image.cxx
===================================================================
--- branches/branch-3.0/test/image.cxx 2011-05-26 16:43:21 UTC (rev 8742)
+++ branches/branch-3.0/test/image.cxx 2011-05-26 21:18:08 UTC (rev 8743)
@@ -104,18 +104,18 @@
fltk3::args(argc,argv,i,arg);
if (visid >= 0) {
- fltk3::open_display();
+ fl_open_display();
XVisualInfo templt; int num;
templt.visualid = visid;
- fltk3::visual = XGetVisualInfo(fltk3::display, VisualIDMask, &templt,
&num);
- if (!fltk3::visual) {
+ fl_visual = XGetVisualInfo(fl_display, VisualIDMask, &templt, &num);
+ if (!fl_visual) {
fprintf(stderr, "No visual with id %d, use one of:\n",visid);
list_visuals();
exit(1);
}
- fltk3::colormap = XCreateColormap(fltk3::display,
RootWindow(fltk3::display,fltk3::screen),
- fltk3::visual->visual, AllocNone);
- fltk3::xpixel(fltk3::BLACK); // make sure black is allocated in overlay
visuals
+ fl_colormap = XCreateColormap(fl_display, RootWindow(fl_display,fl_screen),
+ fl_visual->visual, AllocNone);
+ fl_xpixel(fltk3::BLACK); // make sure black is allocated in overlay visuals
} else {
fltk3::visual(fltk3::RGB);
}
Modified: branches/branch-3.0/test/list_visuals.cxx
===================================================================
--- branches/branch-3.0/test/list_visuals.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/test/list_visuals.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -54,16 +54,16 @@
#include <stdio.h>
#include <stdlib.h>
-Display *fltk3::display;
-int fltk3::screen;
+Display *fl_display;
+int fl_screen;
const char *dname;
-void fltk3::open_display() {
- fltk3::display = XOpenDisplay(dname);
- if (!fltk3::display) {
+void fl_open_display() {
+ fl_display = XOpenDisplay(dname);
+ if (!fl_display) {
fprintf(stderr,"Can't open display: %s\n",XDisplayName(dname));
exit(1);
}
- fltk3::screen = DefaultScreen(fltk3::display);
+ fl_screen = DefaultScreen(fl_display);
}
#endif
@@ -122,23 +122,23 @@
}
void list_visuals() {
- fltk3::open_display();
+ fl_open_display();
XVisualInfo vTemplate;
int num;
- XVisualInfo *visualList = XGetVisualInfo(fltk3::display,0,&vTemplate,&num);
+ XVisualInfo *visualList = XGetVisualInfo(fl_display,0,&vTemplate,&num);
XPixmapFormatValues *pfvlist;
static int numpfv;
- pfvlist = XListPixmapFormats(fltk3::display, &numpfv);
+ pfvlist = XListPixmapFormats(fl_display, &numpfv);
OverlayInfo *overlayInfo = 0;
int numoverlayinfo = 0;
- Atom overlayVisualsAtom =
XInternAtom(fltk3::display,"SERVER_OVERLAY_VISUALS",1);
+ Atom overlayVisualsAtom = XInternAtom(fl_display,"SERVER_OVERLAY_VISUALS",1);
if (overlayVisualsAtom) {
unsigned long sizeData, bytesLeft;
Atom actualType;
int actualFormat;
- if (!XGetWindowProperty(fltk3::display, RootWindow(fltk3::display,
fltk3::screen),
+ if (!XGetWindowProperty(fl_display, RootWindow(fl_display, fl_screen),
overlayVisualsAtom, 0L, 10000L, False,
overlayVisualsAtom, &actualType, &actualFormat,
&sizeData, &bytesLeft,
@@ -150,8 +150,8 @@
int event_base, error_base;
XmbufBufferInfo *mbuf, *sbuf;
int nmbuf = 0, nsbuf = 0;
- if (XmbufQueryExtension(fltk3::display,&event_base, &error_base)) {
- XmbufGetScreenInfo(fltk3::display,RootWindow(fltk3::display,fltk3::screen),
+ if (XmbufQueryExtension(fl_display,&event_base, &error_base)) {
+ XmbufGetScreenInfo(fl_display,RootWindow(fl_display,fl_screen),
&nmbuf, &mbuf, &nsbuf, &sbuf);
}
#endif
@@ -160,10 +160,10 @@
int event_base, error_base;
int numdouble = 0;
XdbeVisualInfo *dbe = 0;
- if (XdbeQueryExtension(fltk3::display, &event_base, &error_base)) {
- Drawable root = RootWindow(fltk3::display,fltk3::screen);
+ if (XdbeQueryExtension(fl_display, &event_base, &error_base)) {
+ Drawable root = RootWindow(fl_display,fl_screen);
int numscreens = 1;
- XdbeScreenVisualInfo *a =
XdbeGetVisualInfo(fltk3::display,&root,&numscreens);
+ XdbeScreenVisualInfo *a = XdbeGetVisualInfo(fl_display,&root,&numscreens);
if (!a) printf("error getting double buffer visuals\n");
else {
dbe = a->visinfo;
@@ -217,7 +217,7 @@
printf(" doublebuf(perflevel %d)",dbe[j].perflevel);
#endif
- if
(p->visualid==XVisualIDFromVisual(DefaultVisual(fltk3::display,fltk3::screen)))
+ if (p->visualid==XVisualIDFromVisual(DefaultVisual(fl_display,fl_screen)))
printf(" (default visual)");
putchar('\n');
Modified: branches/branch-3.0/test/sudoku.cxx
===================================================================
--- branches/branch-3.0/test/sudoku.cxx 2011-05-26 16:43:21 UTC (rev 8742)
+++ branches/branch-3.0/test/sudoku.cxx 2011-05-26 21:18:08 UTC (rev 8743)
@@ -464,25 +464,25 @@
XKeyboardControl control;
// Get original pitch and duration...
- XGetKeyboardControl(fltk3::display, &state);
+ XGetKeyboardControl(fl_display, &state);
// Sound a tone for the given note...
control.bell_percent = 100;
control.bell_pitch = frequencies[note - 'A'];
control.bell_duration = 50;
- XChangeKeyboardControl(fltk3::display,
+ XChangeKeyboardControl(fl_display,
KBBellPercent | KBBellPitch | KBBellDuration,
&control);
- XBell(fltk3::display, 100);
- XFlush(fltk3::display);
+ XBell(fl_display, 100);
+ XFlush(fl_display);
// Restore original pitch and duration...
control.bell_percent = state.bell_percent;
control.bell_pitch = state.bell_pitch;
control.bell_duration = state.bell_duration;
- XChangeKeyboardControl(fltk3::display,
+ XChangeKeyboardControl(fl_display,
KBBellPercent | KBBellPitch | KBBellDuration,
&control);
#endif // __APPLE__
@@ -713,8 +713,8 @@
#ifdef WIN32
icon((char *)LoadIcon(fltk3::display, MAKEINTRESOURCE(IDI_ICON)));
#elif !defined(__APPLE__)
- fltk3::open_display();
- icon((char *)XCreateBitmapFromData(fltk3::display,
DefaultRootWindow(fltk3::display),
+ fl_open_display();
+ icon((char *)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
(char *)sudoku_bits, sudoku_width,
sudoku_height));
#endif // WIN32
Modified: branches/branch-3.0/test/tiled_image.cxx
===================================================================
--- branches/branch-3.0/test/tiled_image.cxx 2011-05-26 16:43:21 UTC (rev
8742)
+++ branches/branch-3.0/test/tiled_image.cxx 2011-05-26 21:18:08 UTC (rev
8743)
@@ -66,18 +66,18 @@
fltk3::args(argc,argv,i,arg);
if (visid >= 0) {
- fltk3::open_display();
+ fl_open_display();
XVisualInfo templt; int num;
templt.visualid = visid;
- fltk3::visual = XGetVisualInfo(fltk3::display, VisualIDMask, &templt,
&num);
- if (!fltk3::visual) {
+ fl_visual = XGetVisualInfo(fl_display, VisualIDMask, &templt, &num);
+ if (!fl_visual) {
fprintf(stderr, "No visual with id %d, use one of:\n",visid);
list_visuals();
exit(1);
}
- fltk3::colormap = XCreateColormap(fltk3::display,
RootWindow(fltk3::display,fltk3::screen),
- fltk3::visual->visual, AllocNone);
- fltk3::xpixel(fltk3::BLACK); // make sure black is allocated in overlay
visuals
+ fl_colormap = XCreateColormap(fl_display, RootWindow(fl_display,fl_screen),
+ fl_visual->visual, AllocNone);
+ fl_xpixel(fltk3::BLACK); // make sure black is allocated in overlay visuals
} else {
fltk3::visual(fltk3::RGB);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
