Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-05 16:12:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

overlay drawing is now avoiding XOR mode (STR #1438)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5613 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2007-01-18 12:59:37 +00:00
parent 4b59f90ba7
commit 32a8df787c
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.8
- overlay drawing is now avoiding XOR mode (STR #1438)
- Fixed Scroll crash in Fluid Live Mode (STR #1524)
- Fixed mousewheel event propagation (STR #1521)
- Fixed drawing issues of a tile in a scroll (STR #1507)
src/fl_overlay.cxx
+48 -2
View File
@@ -36,9 +36,18 @@
#include <config.h>
#endif
//#define USE_XOR
static int px,py,pw,ph;
#ifndef USE_XOR
#include <stdlib.h>
static uchar *bgN = 0L, *bgS = 0L, *bgE = 0L, *bgW = 0L;
static int bgx, bgy, bgw, bgh;
#endif
static void draw_current_rect() {
#ifdef USE_XOR
# ifdef WIN32
int old = SetROP2(fl_gc, R2_NOT);
fl_rect(px, py, pw, ph);
@@ -50,6 +59,7 @@ static void draw_current_rect() {
# elif defined(__APPLE_QUARTZ__)
// warning: Quartz does not support xor drawing
// Use the Fl_Overlay_Window instead.
fl_color(FL_WHITE);
fl_rect(px, py, pw, ph);
# else
XSetFunction(fl_display, fl_gc, GXxor);
@@ -57,10 +67,46 @@ static void draw_current_rect() {
XDrawRectangle(fl_display, fl_window, fl_gc, px, py, pw, ph);
XSetFunction(fl_display, fl_gc, GXcopy);
# endif
#else
if (bgN) { free(bgN); bgN = 0L; }
if (bgS) { free(bgS); bgS = 0L; }
if (bgE) { free(bgE); bgE = 0L; }
if (bgW) { free(bgW); bgW = 0L; }
if (pw>0 && ph>0) {
bgN = fl_read_image(0L, px, py, pw, 1);
bgS = fl_read_image(0L, px, py+ph-1, pw, 1);
bgE = fl_read_image(0L, px, py, 1, ph);
bgW = fl_read_image(0L, px+pw-1, py, 1, ph);
bgx = px; bgy = py;
bgw = pw; bgh = ph;
}
fl_color(FL_BLACK);
fl_line_style(FL_SOLID);
fl_rect(px, py, pw, ph);
fl_color(FL_WHITE);
fl_line_style(FL_DOT);
fl_rect(px, py, pw, ph);
fl_line_style(FL_SOLID);
#endif
}
static void erase_current_rect() {
#ifdef USE_XOR
# ifdef __APPLE_QUARTZ__
fl_rect(px, py, pw, ph);
# else
draw_current_rect();
# endif
#else
if (bgN) fl_draw_image(bgN, px, py, pw, 1);
if (bgS) fl_draw_image(bgS, px, py+ph-1, pw, 1);
if (bgE) fl_draw_image(bgE, px, py, 1, ph);
if (bgW) fl_draw_image(bgW, px+pw-1, py, 1, ph);
#endif
}
void fl_overlay_clear() {
if (pw > 0) {draw_current_rect(); pw = 0;}
if (pw > 0) {erase_current_rect(); pw = 0;}
}
void fl_overlay_rect(int x, int y, int w, int h) {
@@ -68,7 +114,7 @@ void fl_overlay_rect(int x, int y, int w, int h) {
if (h < 0) {y += h; h = -h;} else if (!h) h = 1;
if (pw > 0) {
if (x==px && y==py && w==pw && h==ph) return;
draw_current_rect();
erase_current_rect();
}
px = x; py = y; pw = w; ph = h;
draw_current_rect();