From f04882c76d0d23a35942e736e89ef19268f541b5 Mon Sep 17 00:00:00 2001 From: Sadrul Habib Chowdhury Date: Sat, 7 Feb 2009 20:00:26 -0500 Subject: Copyright for 2009 --- src/display.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index de25859..ee5a03b 100644 --- a/src/display.h +++ b/src/display.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008 +/* Copyright (c) 2008, 2009 * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) * Micah Cowan (micah@cowan.name) -- cgit v1.2.1 From e8ab383af46b75a2b14d446fc6305912c773a7e6 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 23 Jul 2009 19:26:24 +0200 Subject: - change status message code so that Flush is no longer called - add progress parameter to flush - try to get the window's wait status when EOF is reached --- src/display.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index ee5a03b..aaaf6bf 100644 --- a/src/display.h +++ b/src/display.h @@ -164,6 +164,7 @@ struct display int d_status_lasty; /* before status was displayed */ int d_status_obuflen; /* saved obuflen */ int d_status_obuffree; /* saved obuffree */ + int d_status_obufpos; /* end of status position in obuf */ struct event d_statusev; /* timeout event */ struct event d_hstatusev; /* hstatus changed event */ int d_kaablamm; /* display kaablamm msg */ @@ -286,6 +287,7 @@ extern struct display TheDisplay; #define D_status_lasty DISPLAY(d_status_lasty) #define D_status_obuflen DISPLAY(d_status_obuflen) #define D_status_obuffree DISPLAY(d_status_obuffree) +#define D_status_obufpos DISPLAY(d_status_obufpos) #define D_statusev DISPLAY(d_statusev) #define D_hstatusev DISPLAY(d_hstatusev) #define D_kaablamm DISPLAY(d_kaablamm) -- cgit v1.2.1 From ca20b068fd39f8f9ca0c67353bc2b87141d0d290 Mon Sep 17 00:00:00 2001 From: Sadrul Habib Chowdhury Date: Thu, 12 Nov 2009 12:49:52 -0500 Subject: Add support for mouse tracking. Mouse tracking can be turned on/off using 'mousetrack' command. With mouse-tracking turned on, it is possible to switch to a region ('focus') using mouse-clicks. --- src/display.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index aaaf6bf..7ae32e8 100644 --- a/src/display.h +++ b/src/display.h @@ -150,6 +150,8 @@ struct display int d_hstatus; /* hardstatus used */ int d_lp_missing; /* last character on bot line missing */ int d_mouse; /* mouse mode */ + int d_mousetrack; /* set when user wants to use mouse even when the window + does not */ #ifdef RXVT_OSC int d_xtermosc[4]; /* osc used */ #endif @@ -275,6 +277,7 @@ extern struct display TheDisplay; #define D_hstatus DISPLAY(d_hstatus) #define D_lp_missing DISPLAY(d_lp_missing) #define D_mouse DISPLAY(d_mouse) +#define D_mousetrack DISPLAY(d_mousetrack) #define D_xtermosc DISPLAY(d_xtermosc) #define D_lpchar DISPLAY(d_lpchar) #define D_status DISPLAY(d_status) -- cgit v1.2.1 From 827243a5521df50824f0371f24a67692d11fe101 Mon Sep 17 00:00:00 2001 From: Sadrul Habib Chowdhury Date: Thu, 12 Nov 2009 13:42:55 -0500 Subject: Start refactoring. The Screen code at this stage is somewhat complicated to start working on. So refactor some code so it's easier to manage and hack. Also, the plan is to eventually add some documentation, possibly in the header files showing their usage. --- src/display.h | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index 7ae32e8..f67a7b2 100644 --- a/src/display.h +++ b/src/display.h @@ -53,38 +53,6 @@ struct win; /* forward declaration */ #define MAXLAY 10 -#define SLICE_UNKN 0 -#define SLICE_VERT (1 << 0) -#define SLICE_HORI (1 << 1) - -#define SLICE_THIS (1 << 2) /* used in equal test */ -#define SLICE_GLOBAL (1 << 3) - -struct canvas -{ - struct canvas *c_next; /* next canvas on display */ - struct display *c_display; /* back pointer to display */ - - struct canvas *c_slnext; /* next canvas in display slice */ - struct canvas *c_slprev; /* prev canvas in display slice */ - struct canvas *c_slperp; /* perpendicular slice */ - struct canvas *c_slback; /* perpendicular slice back pointer */ - int c_slorient; /* our slice orientation */ - int c_slweight; /* size ratio */ - - struct viewport *c_vplist; - struct layer *c_layer; /* layer on this canvas */ - struct canvas *c_lnext; /* next canvas that displays layer */ - struct layer c_blank; /* bottom layer, always blank */ - int c_xoff; /* canvas x offset on display */ - int c_yoff; /* canvas y offset on display */ - int c_xs; - int c_xe; - int c_ys; - int c_ye; - struct event c_captev; /* caption changed event */ -}; - struct layout { struct layout *lay_next; -- cgit v1.2.1 From 36983385404db06b71744d9d42fbdd6d1c105bc2 Mon Sep 17 00:00:00 2001 From: Sadrul Habib Chowdhury Date: Thu, 12 Nov 2009 14:24:12 -0500 Subject: Refactor 'layout' and 'viewport' --- src/display.h | 52 ++++++++++------------------------------------------ 1 file changed, 10 insertions(+), 42 deletions(-) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index f67a7b2..e3d5ad7 100644 --- a/src/display.h +++ b/src/display.h @@ -27,6 +27,13 @@ * $Id$ FAU */ +#ifndef SCREEN_DISPLAY_H +#define SCREEN_DISPLAY_H + +#include "layout.h" +#include "canvas.h" +#include "viewport.h" + #ifdef MAPKEYS #define KMAP_KEYS (T_OCAPS-T_CAPS) @@ -51,31 +58,6 @@ struct kmap_ext struct win; /* forward declaration */ -#define MAXLAY 10 - -struct layout -{ - struct layout *lay_next; - char *lay_title; - int lay_number; - struct canvas lay_canvas; - struct canvas *lay_forecv; - struct canvas *lay_cvlist; - int lay_autosave; -}; - -struct viewport -{ - struct viewport *v_next; /* next vp on canvas */ - struct canvas *v_canvas; /* back pointer to canvas */ - int v_xoff; /* layer x offset on display */ - int v_yoff; /* layer y offset on display */ - int v_xs; /* vp upper left */ - int v_xe; /* vp upper right */ - int v_ys; /* vp lower left */ - int v_ye; /* vp lower right */ -}; - struct display { struct display *d_next; /* linked list */ @@ -330,23 +312,6 @@ do \ } \ while (0) -#define CV_CALL(cv, cmd) \ -{ \ - struct display *olddisplay = display; \ - struct layer *oldflayer = flayer; \ - struct layer *l = cv->c_layer; \ - struct canvas *cvlist = l->l_cvlist; \ - struct canvas *cvlnext = cv->c_lnext; \ - flayer = l; \ - l->l_cvlist = cv; \ - cv->c_lnext = 0; \ - cmd; \ - flayer = oldflayer; \ - l->l_cvlist = cvlist; \ - cv->c_lnext = cvlnext; \ - display = olddisplay; \ -} - #define STATUS_OFF 0 #define STATUS_ON_WIN 1 #define STATUS_ON_HS 2 @@ -356,3 +321,6 @@ while (0) #define HSTATUS_MESSAGE 2 #define HSTATUS_HS 3 #define HSTATUS_ALWAYS (1<<2) + +#endif /* SCREEN_DISPLAY_H */ + -- cgit v1.2.1 From e0ac7e1651c48358b4b6e3734f106c06076e0220 Mon Sep 17 00:00:00 2001 From: Sadrul Habib Chowdhury Date: Tue, 15 Dec 2009 16:17:33 -0500 Subject: GNUize. --- src/display.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display.h') diff --git a/src/display.h b/src/display.h index e3d5ad7..e8b3b80 100644 --- a/src/display.h +++ b/src/display.h @@ -24,7 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * **************************************************************** - * $Id$ FAU + * $Id$ GNU */ #ifndef SCREEN_DISPLAY_H -- cgit v1.2.1