ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.5 2003/11/27 16:49:45 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
22/* 23/*
23 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
24 */ 25 */
25 26
26#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
27#define INTERN_SCREEN 28#define INTERN_SCREEN
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "screen.intpro" /* PROTOS for internal routines */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 32
33#include <stdint.h> 33#include <inttypes.h>
34#include <wchar.h> 34#include <wchar.h>
35
36#include "salloc.C" // HACK, should be a seperate compile!
35 37
36inline void fill_text (text_t *start, text_t value, int len) 38inline void fill_text (text_t *start, text_t value, int len)
37{ 39{
38 while (len--) 40 while (len--)
39 *start++ = value; 41 *start++ = value;
40} 42}
41
42#define RESET_CHSTAT(H) \
43 if ((H)->chstat == WBYTE) \
44 (H)->chstat = SBYTE, (H)->lost_multi = 1
45 43
46/* ------------------------------------------------------------------------- */ 44/* ------------------------------------------------------------------------- */
47#define PROP_SIZE 16384 45#define PROP_SIZE 16384
48#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
49 47
50/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
51 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
52 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
53#define ZERO_SCROLLBACK(R) \ 51#define ZERO_SCROLLBACK() \
54 if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
55 (R)->TermWin.view_start = 0 53 TermWin.view_start = 0
56#define CLEAR_SELECTION(R) \ 54#define CLEAR_SELECTION() \
57 (R)->selection.beg.row = (R)->selection.beg.col \ 55 selection.beg.row = selection.beg.col \
58 = (R)->selection.end.row = (R)->selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
59#define CLEAR_ALL_SELECTION(R) \ 57#define CLEAR_ALL_SELECTION() \
60 (R)->selection.beg.row = (R)->selection.beg.col \ 58 selection.beg.row = selection.beg.col \
61 = (R)->selection.mark.row = (R)->selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
62 = (R)->selection.end.row = (R)->selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
63 61
64#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
65 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
66#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
67 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
68#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
69 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
70#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
71 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
72#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
73 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
74#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
75 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
76 74
77/* these must be row_col_t */ 75/* these must be row_col_t */
78#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
79 ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
80#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
81 ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
82#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
83 ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
88#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
89 ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
90 88
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
96#define drawBuffer (R->TermWin.vt) 94#define drawBuffer TermWin.vt
97 95
98#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
99 if (R->TermWin.mapped) \ 97 if (TermWin.mapped) \
100 XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
101 Row2Pixel(row), (unsigned int)R->TermWin.width, \ 99 Row2Pixel (row), (unsigned int)TermWin.width, \
102 (unsigned int)Height2Pixel(num), False) 100 (unsigned int)Height2Pixel (num), False)
103 101
104#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
105 if (R->TermWin.mapped) \ 103 if (TermWin.mapped) \
106 XClearArea(R->Xdisplay, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
107 (unsigned int)Width2Pixel(num), \ 105 (unsigned int)Width2Pixel (num), \
108 (unsigned int)Height2Pixel(1), False) 106 (unsigned int)Height2Pixel (1), False)
109 107
110#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
111 XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
112 R->TermWin.int_bwidth, Row2Pixel(row), \ 110 0, Row2Pixel (row), \
113 (unsigned int)R->TermWin.width, \ 111 (unsigned int)TermWin.width, \
114 (unsigned int)Height2Pixel(num)) 112 (unsigned int)Height2Pixel (num))
115 113
116/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
120/* INTPROTO */
121void 118void
122rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
123{ 120{
124 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
125 efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); 122 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
126 123
127 while (width--) 124 while (width--)
128 { 125 {
129 *et++ = ' '; 126 *et++ = ' ';
130 *er++ = efs; 127 *er++ = efs;
131 } 128 }
132} 129}
133 130
134/* ------------------------------------------------------------------------- */ 131/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 132/* Fill a full line with blanks - make sure it is allocated first */
136/* INTPROTO */
137void 133void
138rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)
139{ 135{
140 int width = R->TermWin.ncol;
141 rend_t *er;
142
143#ifdef DEBUG_STRICT 136#ifdef DEBUG_STRICT
144 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
145#endif 138#endif
146 if (tp[row] == NULL) { 139 if (tp[row] == NULL)
147 tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width);
148 rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width);
149 } 140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
150 rxvt_blank_line (aR_ tp[row], rp[row], width, efs); 145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
151} 146}
152 147
153/* ------------------------------------------------------------------------- * 148/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 149 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 150 * ------------------------------------------------------------------------- */
156/* EXTPROTO */
157void 151void
158rxvt_scr_reset(pR) 152rxvt_term::scr_reset ()
159{ 153{
160 unsigned int ncol, nrow, prev_ncol, prev_nrow, 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
161 total_rows, prev_total_rows;
162 unsigned int p, q; 155 unsigned int p, q;
163 int k; 156 int k;
164 rend_t setrstyle; 157 rend_t setrstyle;
165 158
166 D_SCREEN((stderr, "rxvt_scr_reset()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
167 162
168 R->TermWin.view_start = 0; 163 TermWin.view_start = 0;
169 RESET_CHSTAT(R);
170 R->num_scr = 0; 164 num_scr = 0;
171 165
172 prev_ncol = R->prev_ncol;
173 prev_nrow = R->prev_nrow;
174 if (R->TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
175 R->TermWin.ncol = 80; 167 TermWin.ncol = 80;
168
176 if (R->TermWin.nrow == 0) 169 if (TermWin.nrow == 0)
177 R->TermWin.nrow = 24; 170 TermWin.nrow = 24;
171
178 ncol = R->TermWin.ncol; 172 ncol = TermWin.ncol;
179 nrow = R->TermWin.nrow; 173 nrow = TermWin.nrow;
174
180 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
181 return; 176 return;
182 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
183 R->want_refresh = 1; 186 want_refresh = 1;
184 187
185 total_rows = nrow + R->TermWin.saveLines;
186 prev_total_rows = prev_nrow + R->TermWin.saveLines; 188 prev_total_rows = prev_nrow + TermWin.saveLines;
189 total_rows = nrow + TermWin.saveLines;
187 190
188 R->screen.tscroll = 0; 191 screen.tscroll = 0;
189 R->screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
190 193
191 if (prev_nrow == 0) { 194 if (!talloc)
192/* 195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 {
202 /*
193 * A: first time called so just malloc everything : don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 205 */
196 R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
199 R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 210
201 R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
202 R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
203 213
204 R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
205 R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
207 R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 218
209 for (p = 0; p < nrow; p++) { 219 for (p = 0; p < nrow; p++)
220 {
210 q = p + R->TermWin.saveLines; 221 q = p + TermWin.saveLines;
211 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 q, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend,
214 p, DEFAULT_RSTYLE);
215 R->screen.tlen[q] = R->swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 p, DEFAULT_RSTYLE);
218 } 226 }
227
219 MEMSET(R->charsets, 'B', sizeof(R->charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 R->TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 R->rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 R->screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 R->screen.cur.row = R->screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 R->screen.charset = 0; 233 screen.charset = 0;
225 R->current_screen = PRIMARY; 234 current_screen = PRIMARY;
226 rxvt_scr_cursor(aR_ SAVE); 235 scr_cursor (SAVE);
236
227#if NSCREENS 237#if NSCREENS
228 R->swap.flags = Screen_DefaultFlags; 238 swap.flags = Screen_DefaultFlags;
229 R->swap.cur.row = R->swap.cur.col = 0; 239 swap.cur.row = swap.cur.col = 0;
230 R->swap.charset = 0; 240 swap.charset = 0;
231 R->current_screen = SECONDARY; 241 current_screen = SECONDARY;
232 rxvt_scr_cursor(aR_ SAVE); 242 scr_cursor (SAVE);
233 R->current_screen = PRIMARY; 243 current_screen = PRIMARY;
234#endif 244#endif
245
235 R->selection.text = NULL; 246 selection.text = NULL;
236 R->selection.len = 0; 247 selection.len = 0;
237 R->selection.op = SELECTION_CLEAR; 248 selection.op = SELECTION_CLEAR;
238 R->selection.screen = PRIMARY; 249 selection.screen = PRIMARY;
239 R->selection.clicks = 0; 250 selection.clicks = 0;
240 CLEAR_ALL_SELECTION(R); 251 CLEAR_ALL_SELECTION ();
241 R->rvideo = 0; 252 rvideo = 0;
242 253 }
243 } else { 254 else
244/* 255 {
256 /*
245 * B1: add or delete rows as appropriate 257 * add or delete rows as appropriate
246 */ 258 */
247 setrstyle = DEFAULT_RSTYLE; 259 setrstyle = DEFAULT_RSTYLE;
248 260
249 if (nrow < prev_nrow) { 261 if (nrow < prev_nrow)
262 {
250 /* delete rows */ 263 /* delete rows */
251 k = min(R->TermWin.nscrolled, prev_nrow - nrow); 264 k = min (TermWin.nscrolled, prev_nrow - nrow);
252 rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); 265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266
253 for (p = nrow; p < prev_nrow; p++) { 267 for (p = nrow; p < prev_nrow; p++)
268 {
254 q = p + R->TermWin.saveLines; 269 q = p + TermWin.saveLines;
270
255 if (R->screen.text[q]) { 271 if (screen.text[q])
272 {
256#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
257 assert(R->screen.rend[q]); 274 assert (screen.rend[q]);
258#endif 275#endif
259 free(R->screen.text[q]); 276 talloc->free (screen.text[q]);
260 free(R->screen.rend[q]); 277 ralloc->free (screen.rend[q]);
261 } 278 }
279
262 if (R->swap.text[p]) { 280 if (swap.text[p])
281 {
263#ifdef DEBUG_STRICT 282#ifdef DEBUG_STRICT
264 assert(R->swap.rend[p]); 283 assert (swap.rend[p]);
265#endif 284#endif
266 free(R->swap.text[p]); 285 talloc->free (swap.text[p]);
267 free(R->swap.rend[p]); 286 ralloc->free (swap.rend[p]);
268 } 287 }
288
269#ifdef DEBUG_STRICT 289#ifdef DEBUG_STRICT
270 assert(R->drawn_text[p] && R->drawn_rend[p]); 290 assert (drawn_text[p] && drawn_rend[p]);
271#endif 291#endif
272 free(R->drawn_text[p]); 292 talloc->free (drawn_text[p]);
273 free(R->drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
274 } 294 }
295
275 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
276 MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
277 MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); 298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
278 299
279 rxvt_scr_reset_realloc(aR); /* realloc _last_ */ 300 scr_reset_realloc (); /* realloc _last_ */
280 301 }
281 } else if (nrow > prev_nrow) { 302 else if (nrow > prev_nrow)
303 {
282 /* add rows */ 304 /* add rows */
283 rxvt_scr_reset_realloc(aR); /* realloc _first_ */ 305 scr_reset_realloc (); /* realloc _first_ */
284 306
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
308
285 k = min(R->TermWin.nscrolled, nrow - prev_nrow); 309 k = min (TermWin.nscrolled, nrow - prev_nrow);
310
286 for (p = prev_total_rows; p < total_rows; p++) { 311 for (p = prev_total_rows; p < total_rows; p++)
312 {
287 R->screen.tlen[p] = 0; 313 screen.tlen[p] = 0;
288 R->screen.text[p] = NULL; 314 screen.text[p] = NULL;
289 R->screen.rend[p] = NULL; 315 screen.rend[p] = NULL;
290 } 316 }
317
291 for (p = prev_total_rows; p < total_rows - k; p++) 318 for (p = prev_total_rows; p < total_rows - k; p++)
292 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
293 p, setrstyle); 320
294 for (p = prev_nrow; p < nrow; p++) { 321 for (p = prev_nrow; p < nrow; p++)
322 {
295 R->swap.tlen[p] = 0; 323 swap.tlen[p] = 0;
296 R->swap.text[p] = NULL; 324 swap.text[p] = NULL;
297 R->swap.rend[p] = NULL; 325 swap.rend[p] = NULL;
298 R->drawn_text[p] = NULL; 326 drawn_text[p] = NULL;
299 R->drawn_rend[p] = NULL; 327 drawn_rend[p] = NULL;
300 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, 328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
301 p, setrstyle);
302 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
303 p, setrstyle);
304 } 330 }
331
305 if (k > 0) { 332 if (k > 0)
333 {
306 rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); 334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
307 R->screen.cur.row += k; 335 screen.cur.row += k;
308 R->screen.s_cur.row += k; 336 screen.s_cur.row += k;
309 R->TermWin.nscrolled -= k; 337 TermWin.nscrolled -= k;
310 } 338 }
311#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
312 assert(R->screen.cur.row < R->TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
313 assert(R->swap.cur.row < R->TermWin.nrow); 341 assert (swap.cur.row < TermWin.nrow);
314#else /* drive with your eyes closed */ 342#else /* drive with your eyes closed */
343
315 MIN_IT(R->screen.cur.row, nrow - 1); 344 MIN_IT (screen.cur.row, nrow - 1);
316 MIN_IT(R->swap.cur.row, nrow - 1); 345 MIN_IT (swap.cur.row, nrow - 1);
317#endif 346#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
318 } 348 }
349
319/* B2: resize columns */ 350 /* resize columns */
320 if (ncol != prev_ncol) { 351 if (ncol != prev_ncol)
352 {
353 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
354 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
355
321 for (p = 0; p < total_rows; p++) { 356 for (p = 0; p < total_rows; p++)
357 {
322 if (R->screen.text[p]) { 358 if (screen.text[p])
359 {
323 R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); 360 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
324 R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); 361 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
362
325 MIN_IT(R->screen.tlen[p], (int16_t)ncol); 363 MIN_IT (screen.tlen[p], (int16_t)ncol);
364
326 if (ncol > prev_ncol) 365 if (ncol > prev_ncol)
327 rxvt_blank_line(aR_ 366 scr_blank_line (&screen.text[p][prev_ncol],
328 &(R->screen.text[p][prev_ncol]),
329 &(R->screen.rend[p][prev_ncol]), 367 &screen.rend[p][prev_ncol],
330 ncol - prev_ncol, 368 ncol - prev_ncol, setrstyle);
331 setrstyle);
332 } 369 }
333 } 370 }
371
334 for (p = 0; p < nrow; p++) { 372 for (p = 0; p < nrow; p++)
373 {
335 R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); 374 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
336 R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); 375 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
376
377 if (ncol > prev_ncol)
378 scr_blank_line (&drawn_text[p][prev_ncol],
379 &drawn_rend[p][prev_ncol],
380 ncol - prev_ncol, setrstyle);
381
337 if (R->swap.text[p]) { 382 if (swap.text[p])
383 {
338 R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); 384 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
339 R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); 385 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
386
340 MIN_IT(R->swap.tlen[p], (int16_t)ncol); 387 MIN_IT (swap.tlen[p], (int16_t)ncol);
388
341 if (ncol > prev_ncol) 389 if (ncol > prev_ncol)
342 rxvt_blank_line(aR_ 390 scr_blank_line (&swap.text[p][prev_ncol],
343 &(R->swap.text[p][prev_ncol]),
344 &(R->swap.rend[p][prev_ncol]), 391 &swap.rend[p][prev_ncol],
345 ncol - prev_ncol, setrstyle); 392 ncol - prev_ncol, setrstyle);
346 } 393 }
347 if (ncol > prev_ncol) 394
348 rxvt_blank_line(aR_
349 &(R->drawn_text[p][prev_ncol]),
350 &(R->drawn_rend[p][prev_ncol]),
351 ncol - prev_ncol, setrstyle);
352 } 395 }
396
353 MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); 397 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
354 MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); 398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399
400 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra;
355 } 402 }
403
356 if (R->tabs) 404 if (tabs)
357 free(R->tabs); 405 free (tabs);
358 } 406 }
359 407
408 prev_nrow = nrow;
409 prev_ncol = ncol;
410
360 R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); 411 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
361 412
362 for (p = 0; p < ncol; p++) 413 for (p = 0; p < ncol; p++)
363 R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 414 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
364 415
365 R->prev_nrow = nrow; 416 tt_winch ();
366 R->prev_ncol = ncol;
367
368 rxvt_tt_winsize (R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid);
369} 417}
370 418
371/* INTPROTO */
372void 419void
373rxvt_scr_reset_realloc(pR) 420rxvt_term::scr_reset_realloc ()
374{ 421{
375 uint16_t total_rows, nrow; 422 uint16_t total_rows, nrow;
376 423
377 nrow = R->TermWin.nrow; 424 nrow = TermWin.nrow;
378 total_rows = nrow + R->TermWin.saveLines; 425 total_rows = nrow + TermWin.saveLines;
379/* *INDENT-OFF* */ 426 /* *INDENT-OFF* */
380 R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *)); 427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
381 R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *)); 428 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
382 R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *)); 429 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
383 R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *)); 430 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
384 431
385 R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t)); 432 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
386 R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t)); 433 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
387 434
388 R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *)); 435 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
389 R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *)); 436 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
390 R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *)); 437 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
391 R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *)); 438 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
392/* *INDENT-ON* */ 439 /* *INDENT-ON* */
393} 440}
394 441
395/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
396/* 443/*
397 * Free everything. That way malloc debugging can find leakage. 444 * Free everything. That way malloc debugging can find leakage.
398 */ 445 */
399/* EXTPROTO */
400void 446void
401rxvt_scr_release(pR) 447rxvt_term::scr_release ()
402{ 448{
403 uint16_t total_rows; 449 uint16_t total_rows;
404 int i; 450 int i;
405 451
406 total_rows = R->TermWin.nrow + R->TermWin.saveLines; 452 total_rows = TermWin.nrow + TermWin.saveLines;
407 for (i = 0; i < total_rows; i++) { 453
408 if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ 454 delete talloc; talloc = 0;
409 free(R->screen.text[i]); 455 delete ralloc; ralloc = 0;
410#ifdef DEBUG_STRICT 456
411 assert(R->screen.rend[i]);
412#endif
413 free(R->screen.rend[i]);
414 }
415 }
416 for (i = 0; i < R->TermWin.nrow; i++) {
417 free(R->drawn_text[i]);
418 free(R->drawn_rend[i]);
419 free(R->swap.text[i]);
420 free(R->swap.rend[i]);
421 }
422 free(R->screen.text); 457 free (screen.text);
423 free(R->screen.tlen); 458 free (screen.tlen);
424 free(R->screen.rend); 459 free (screen.rend);
425 free(R->drawn_text); 460 free (drawn_text);
426 free(R->drawn_rend); 461 free (drawn_rend);
427 free(R->swap.text); 462 free (swap.text);
428 free(R->swap.tlen); 463 free (swap.tlen);
429 free(R->swap.rend); 464 free (swap.rend);
430 free(R->buf_text); 465 free (buf_text);
431 free(R->buf_rend); 466 free (buf_rend);
432 free(R->tabs); 467 free (tabs);
433 468
434/* NULL these so if anything tries to use them, we'll know about it */ 469 /* NULL these so if anything tries to use them, we'll know about it */
435 R->screen.text = R->drawn_text = R->swap.text = NULL; 470 screen.text = drawn_text = swap.text = NULL;
436 R->screen.rend = R->drawn_rend = R->swap.rend = NULL; 471 screen.rend = drawn_rend = swap.rend = NULL;
437 R->screen.tlen = R->swap.tlen = NULL; 472 screen.tlen = swap.tlen = NULL;
438 R->buf_text = NULL; 473 buf_text = NULL;
439 R->buf_rend = NULL; 474 buf_rend = NULL;
440 R->tabs = NULL; 475 tabs = NULL;
441} 476}
442 477
443/* ------------------------------------------------------------------------- */ 478/* ------------------------------------------------------------------------- */
444/* 479/*
445 * Hard reset 480 * Hard reset
446 */ 481 */
447/* EXTPROTO */
448void 482void
449rxvt_scr_poweron(pR) 483rxvt_term::scr_poweron ()
450{ 484{
451 D_SCREEN((stderr, "rxvt_scr_poweron()"));
452
453 rxvt_scr_release(aR); 485 scr_release ();
454 R->prev_nrow = R->prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
455 rxvt_scr_reset(aR); 487 scr_reset ();
456 488
457 rxvt_scr_clear(aR); 489 scr_clear (true);
458 rxvt_scr_refresh(aR_ SLOW_REFRESH); 490 scr_refresh (SLOW_REFRESH);
459#ifdef RXVT_GRAPHICS
460 rxvt_Gr_reset(aR);
461#endif
462} 491}
463 492
464/* ------------------------------------------------------------------------- * 493/* ------------------------------------------------------------------------- *
465 * PROCESS SCREEN COMMANDS * 494 * PROCESS SCREEN COMMANDS *
466 * ------------------------------------------------------------------------- */ 495 * ------------------------------------------------------------------------- */
467/* 496/*
468 * Save and Restore cursor 497 * Save and Restore cursor
469 * XTERM_SEQ: Save cursor : ESC 7 498 * XTERM_SEQ: Save cursor : ESC 7
470 * XTERM_SEQ: Restore cursor: ESC 8 499 * XTERM_SEQ: Restore cursor: ESC 8
471 */ 500 */
472/* EXTPROTO */
473void 501void
474rxvt_scr_cursor(pR_ int mode) 502rxvt_term::scr_cursor (int mode)
475{ 503{
476 screen_t *s; 504 screen_t *s;
477
478 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode));
479 505
480#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
481 if (R->current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
482 s = &(R->swap); 508 s = &swap;
483 else 509 else
484#endif 510#endif
485 s = &(R->screen); 511 s = &screen;
512
486 switch (mode) { 513 switch (mode)
514 {
487 case SAVE: 515 case SAVE:
488 s->s_cur.row = s->cur.row; 516 s->s_cur.row = s->cur.row;
489 s->s_cur.col = s->cur.col; 517 s->s_cur.col = s->cur.col;
490 s->s_rstyle = R->rstyle; 518 s->s_rstyle = rstyle;
491 s->s_charset = s->charset; 519 s->s_charset = s->charset;
492 s->s_charset_char = R->charsets[s->charset]; 520 s->s_charset_char = charsets[s->charset];
493 break; 521 break;
522
494 case RESTORE: 523 case RESTORE:
495 R->want_refresh = 1; 524 want_refresh = 1;
496 s->cur.row = s->s_cur.row; 525 s->cur.row = s->s_cur.row;
497 s->cur.col = s->s_cur.col; 526 s->cur.col = s->s_cur.col;
498 s->flags &= ~Screen_WrapNext; 527 s->flags &= ~Screen_WrapNext;
499 R->rstyle = s->s_rstyle; 528 rstyle = s->s_rstyle;
500 s->charset = s->s_charset; 529 s->charset = s->s_charset;
501 R->charsets[s->charset] = s->s_charset_char; 530 charsets[s->charset] = s->s_charset_char;
502 rxvt_set_font_style(aR); 531 set_font_style ();
503 break; 532 break;
504 } 533 }
534
505/* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
506 MIN_IT(s->cur.row, R->TermWin.nrow - 1); 536 MIN_IT (s->cur.row, TermWin.nrow - 1);
507 MIN_IT(s->cur.col, R->TermWin.ncol - 1); 537 MIN_IT (s->cur.col, TermWin.ncol - 1);
508#ifdef DEBUG_STRICT 538#ifdef DEBUG_STRICT
509 assert(s->cur.row >= 0); 539 assert (s->cur.row >= 0);
510 assert(s->cur.col >= 0); 540 assert (s->cur.col >= 0);
511#else /* drive with your eyes closed */ 541#else /* drive with your eyes closed */
512 MAX_IT(s->cur.row, 0); 542 MAX_IT (s->cur.row, 0);
513 MAX_IT(s->cur.col, 0); 543 MAX_IT (s->cur.col, 0);
514#endif 544#endif
515} 545}
516 546
517/* ------------------------------------------------------------------------- */ 547/* ------------------------------------------------------------------------- */
518/* 548/*
519 * Swap between primary and secondary screens 549 * Swap between primary and secondary screens
520 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 550 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
521 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
522 */ 552 */
523/* EXTPROTO */
524int 553int
525rxvt_scr_change_screen(pR_ int scrn) 554rxvt_term::scr_change_screen (int scrn)
526{ 555{
527 int i; 556 int i;
528#if NSCREENS 557#if NSCREENS
529 int offset; 558 int offset;
530#endif 559#endif
531 560
532 R->want_refresh = 1; 561 want_refresh = 1;
533 562
534 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn));
535
536 R->TermWin.view_start = 0; 563 TermWin.view_start = 0;
537 RESET_CHSTAT(R);
538 564
539 if (R->current_screen == scrn) 565 if (current_screen == scrn)
540 return R->current_screen; 566 return scrn;
541 567
542 rxvt_selection_check(aR_ 2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
543 569
544 SWAP_IT(R->current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
545#if NSCREENS 571#if NSCREENS
572 if (options & Opt_secondaryScreen)
573 {
546 R->num_scr = 0; 574 num_scr = 0;
547 offset = R->TermWin.saveLines; 575 offset = TermWin.saveLines;
548 for (i = R->prev_nrow; i--;) { 576 for (i = prev_nrow; i--;)
577 {
549 SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); 578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
550 SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); 579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
551 SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); 580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
552 } 581 }
553 SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); 582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
554 SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); 583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
555# ifdef DEBUG_STRICT 584# ifdef DEBUG_STRICT
556 assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->prev_nrow)); 585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
557 assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->prev_ncol)); 586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
558# else /* drive with your eyes closed */ 587# else /* drive with your eyes closed */
559 MAX_IT(R->screen.cur.row, 0); 588 MAX_IT (screen.cur.row, 0);
560 MIN_IT(R->screen.cur.row, (int32_t)R->prev_nrow - 1); 589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
561 MAX_IT(R->screen.cur.col, 0); 590 MAX_IT (screen.cur.col, 0);
562 MIN_IT(R->screen.cur.col, (int32_t)R->prev_ncol - 1); 591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
563# endif 592# endif
564 SWAP_IT(R->screen.charset, R->swap.charset, int16_t); 593 SWAP_IT (screen.charset, swap.charset, int16_t);
565 SWAP_IT(R->screen.flags, R->swap.flags, int); 594 SWAP_IT (screen.flags, swap.flags, int);
566 R->screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
567 R->swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
568
569# ifdef RXVT_GRAPHICS
570
571 if (rxvt_Gr_Displayed(aR)) {
572 rxvt_Gr_scroll(aR_ 0);
573 rxvt_Gr_ChangeScreen(aR);
574 } 597 }
598 else
575# endif 599#endif
576#else 600 if (options & Opt_secondaryScroll)
577# ifdef SCROLL_ON_NO_SECONDARY
578# ifdef RXVT_GRAPHICS
579 if (rxvt_Gr_Displayed(aR))
580 rxvt_Gr_ClearScreen(aR);
581# endif
582 if (R->current_screen == PRIMARY 601 //if (current_screen == PRIMARY)
583# ifdef RXVT_GRAPHICS
584 && !rxvt_Gr_Displayed(aR)
585# endif
586 )
587 rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
588# endif
589#endif
590 return scrn; 603 return scrn;
604}
605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
591} 621}
592 622
593/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
594/* 624/*
595 * Change the colour for following text 625 * Change the colour for following text
596 */ 626 */
597/* EXTPROTO */
598void 627void
599rxvt_scr_color(pR_ unsigned int color, int fgbg) 628rxvt_term::scr_color (unsigned int color, int fgbg)
600{ 629{
601 color &= RS_fgMask; 630 color &= RS_fgMask;
602 if (fgbg == Color_fg) 631 if (fgbg == Color_fg)
603 R->rstyle = SET_FGCOLOR(R->rstyle, color); 632 rstyle = SET_FGCOLOR (rstyle, color);
604 else 633 else
605 R->rstyle = SET_BGCOLOR(R->rstyle, color); 634 rstyle = SET_BGCOLOR (rstyle, color);
606} 635}
607 636
608/* ------------------------------------------------------------------------- */ 637/* ------------------------------------------------------------------------- */
609/* 638/*
610 * Change the rendition style for following text 639 * Change the rendition style for following text
611 */ 640 */
612/* EXTPROTO */
613void 641void
614rxvt_scr_rendition(pR_ int set, int style) 642rxvt_term::scr_rendition (int set, int style)
615{ 643 {
616 if (set) 644 if (set)
617 R->rstyle |= style; 645 rstyle |= style;
618 else if (style == ~RS_None) 646 else if (style == ~RS_None)
619 R->rstyle = DEFAULT_RSTYLE; 647 rstyle = DEFAULT_RSTYLE;
620 else 648 else
621 R->rstyle &= ~style; 649 rstyle &= ~style;
622} 650 }
623 651
624/* ------------------------------------------------------------------------- */ 652/* ------------------------------------------------------------------------- */
625/* 653/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 654 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 655 * count positive ==> scroll up
628 * count negative ==> scroll down 656 * count negative ==> scroll down
629 * spec == 0 for normal routines 657 * spec == 0 for normal routines
630 */ 658 */
631/* EXTPROTO */
632int 659int
633rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) 660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
634{ 661{
635 int i, j; 662 int i, j;
636 long nscrolled; 663 long nscrolled;
637 664
638 if (count == 0 || (row1 > row2)) 665 if (count == 0 || (row1 > row2))
639 return 0; 666 return 0;
640 667
641 R->want_refresh = 1; 668 want_refresh = 1;
642 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->current_screen == PRIMARY) ? "Primary" : "Secondary"));
643 669
644 if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { 670 if (row1 == 0 && count > 0
671 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
672 {
645 nscrolled = (long)R->TermWin.nscrolled + (long)count;; 673 nscrolled = (long)TermWin.nscrolled + (long)count;
674
646 if (nscrolled > (long)R->TermWin.saveLines) 675 if (nscrolled > (long)TermWin.saveLines)
647 R->TermWin.nscrolled = R->TermWin.saveLines; 676 TermWin.nscrolled = TermWin.saveLines;
648 else 677 else
649 R->TermWin.nscrolled = (uint16_t)nscrolled; 678 TermWin.nscrolled = (uint16_t)nscrolled;
679
650 if ((R->Options & Opt_scrollWithBuffer) 680 if ((options & Opt_scrollWithBuffer)
651 && R->TermWin.view_start != 0 681 && TermWin.view_start != 0
652 && R->TermWin.view_start != R->TermWin.saveLines) 682 && TermWin.view_start != TermWin.saveLines)
653 rxvt_scr_page(aR_ UP, count); 683 scr_page (UP, count);
684 }
654 } else if (!spec) 685 else if (!spec)
655 row1 += R->TermWin.saveLines;
656 row2 += R->TermWin.saveLines; 686 row1 += TermWin.saveLines;
657 687
688 row2 += TermWin.saveLines;
689
658 if (R->selection.op && R->current_screen == R->selection.screen) { 690 if (selection.op && current_screen == selection.screen)
691 {
659 i = R->selection.beg.row + R->TermWin.saveLines; 692 i = selection.beg.row + TermWin.saveLines;
660 j = R->selection.end.row + R->TermWin.saveLines; 693 j = selection.end.row + TermWin.saveLines;
661 if ((i < row1 && j > row1) 694 if ((i < row1 && j > row1)
662 || (i < row2 && j > row2) 695 || (i < row2 && j > row2)
663 || (i - count < row1 && i >= row1) 696 || (i - count < row1 && i >= row1)
664 || (i - count > row2 && i <= row2) 697 || (i - count > row2 && i <= row2)
665 || (j - count < row1 && j >= row1) 698 || (j - count < row1 && j >= row1)
666 || (j - count > row2 && j <= row2)) { 699 || (j - count > row2 && j <= row2))
700 {
667 CLEAR_ALL_SELECTION(R); 701 CLEAR_ALL_SELECTION ();
668 R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 702 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
703 }
669 } else if (j >= row1 && j <= row2) { 704 else if (j >= row1 && j <= row2)
705 {
670 /* move selected region too */ 706 /* move selected region too */
671 R->selection.beg.row -= count; 707 selection.beg.row -= count;
672 R->selection.end.row -= count; 708 selection.end.row -= count;
673 R->selection.mark.row -= count; 709 selection.mark.row -= count;
674 } 710 }
675 } 711 }
712
676 rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ 713 selection_check (0); /* _after_ TermWin.nscrolled update */
677 714
678 R->num_scr += count; 715 num_scr += count;
679 j = count; 716 j = count;
717
680 if (count < 0) 718 if (count < 0)
681 count = -count; 719 count = -count;
720
682 i = row2 - row1 + 1; 721 i = row2 - row1 + 1;
683 MIN_IT(count, i); 722 MIN_IT (count, i);
684 723
685 if (j > 0) { 724 if (j > 0)
725 {
686/* A: scroll up */ 726 /* A: scroll up */
687 727
688/* A1: Copy lines that will get clobbered by the rotation */ 728 /* A1: Copy lines that will get clobbered by the rotation */
689 for (i = 0, j = row1; i < count; i++, j++) { 729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
690 R->buf_text[i] = R->screen.text[j]; 730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
691 R->buf_rend[i] = R->screen.rend[j]; 731
692 }
693/* A2: Rotate lines */ 732 /* A2: Rotate lines */
694 for (j = row1, i = j + count; i <= row2; i++, j++) { 733 i = row2 - row1 - count + 1;
695 R->screen.tlen[j] = R->screen.tlen[i]; 734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
696 R->screen.text[j] = R->screen.text[i]; 735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
697 R->screen.rend[j] = R->screen.rend[i]; 736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
698 } 737
699 j = row2 - count + 1, i = count; 738 j = row2 - count + 1, i = count;
739 }
700 } else /* if (j < 0) */ { 740 else /* if (j < 0) */
741 {
701/* B: scroll down */ 742 /* B: scroll down */
702 743
703/* B1: Copy lines that will get clobbered by the rotation */ 744 /* B1: Copy lines that will get clobbered by the rotation */
704 for (i = 0, j = row2; i < count; i++, j--) { 745 for (i = 0, j = row2; i < count; i++, j--)
746 {
705 R->buf_text[i] = R->screen.text[j]; 747 buf_text[i] = screen.text[j];
706 R->buf_rend[i] = R->screen.rend[j]; 748 buf_rend[i] = screen.rend[j];
707 } 749 }
750
708/* B2: Rotate lines */ 751 /* B2: Rotate lines */
709 for (j = row2, i = j - count; i >= row1; i--, j--) { 752 for (j = row2, i = j - count; i >= row1; i--, j--)
753 {
710 R->screen.tlen[j] = R->screen.tlen[i]; 754 screen.tlen[j] = screen.tlen[i];
711 R->screen.text[j] = R->screen.text[i]; 755 screen.text[j] = screen.text[i];
712 R->screen.rend[j] = R->screen.rend[i]; 756 screen.rend[j] = screen.rend[i];
713 } 757 }
758
714 j = row1, i = count; 759 j = row1, i = count;
715 count = -count; 760 count = -count;
716 } 761 }
717 762
718/* C: Resurrect lines */ 763 /* C: Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */
719 for (; i--; j++) { 768 for (; i--; j++)
720 R->screen.tlen[j] = 0; 769 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
721 R->screen.text[j] = R->buf_text[i];
722 R->screen.rend[j] = R->buf_rend[i];
723 if (!spec) /* line length may not equal TermWin.ncol */
724 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend,
725 (unsigned int)j, R->rstyle);
726 }
727 770
728#ifdef RXVT_GRAPHICS
729 if (rxvt_Gr_Displayed(aR))
730 rxvt_Gr_scroll(aR_ count);
731#endif
732 return count; 771 return count;
733} 772}
734 773
735/* ------------------------------------------------------------------------- */ 774/* ------------------------------------------------------------------------- */
736/* 775/*
737 * Add text given in <str> of length <len> to screen struct 776 * Add text given in <str> of length <len> to screen struct
738 */ 777 */
739/* EXTPROTO */
740void 778void
741rxvt_scr_add_lines(pR_ const uint32_t *str, int nlines, int len) 779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
742{ 780{
743 unsigned char checksel, clearsel; 781 unsigned char checksel;
744 uint32_t c; 782 unicode_t c;
745 int i, row, last_col; 783 int i, row, last_col;
746 text_t *stp; 784 text_t *stp;
747 rend_t *srp; 785 rend_t *srp;
748 786
749 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
750 return; 788 return;
751 789
752 R->want_refresh = 1; 790 want_refresh = 1;
791 ZERO_SCROLLBACK ();
753 last_col = R->TermWin.ncol; 792 last_col = TermWin.ncol;
754 793
755 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len));
756 ZERO_SCROLLBACK(R);
757 if (nlines > 0) { 794 if (nlines > 0)
795 {
758 nlines += (R->screen.cur.row - R->screen.bscroll); 796 nlines += screen.cur.row - screen.bscroll;
759 if ((nlines > 0) 797 if ((nlines > 0)
760 && (R->screen.tscroll == 0) 798 && (screen.tscroll == 0)
761 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 799 && (screen.bscroll == (TermWin.nrow - 1)))
800 {
762 /* _at least_ this many lines need to be scrolled */ 801 /* _at least_ this many lines need to be scrolled */
763 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, 802 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
764 0);
765 R->screen.cur.row -= nlines; 803 screen.cur.row -= nlines;
766 } 804 }
767 } 805 }
806
768#ifdef DEBUG_STRICT 807#ifdef DEBUG_STRICT
769 assert(R->screen.cur.col < last_col); 808 assert (screen.cur.col < last_col);
770 assert((R->screen.cur.row < R->TermWin.nrow) 809 assert ((screen.cur.row < TermWin.nrow)
771 && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); 810 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
772#else /* drive with your eyes closed */ 811#else /* drive with your eyes closed */
773 MIN_IT(R->screen.cur.col, last_col - 1); 812 MIN_IT (screen.cur.col, last_col - 1);
774 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 813 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
775 MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); 814 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
776#endif 815#endif
777 row = R->screen.cur.row + R->TermWin.saveLines; 816 row = screen.cur.row + TermWin.saveLines;
778 817
779 checksel = (R->selection.op 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
780 && R->current_screen == R->selection.screen) ? 1 : 0;
781 clearsel = 0;
782 819
783 stp = R->screen.text[row]; 820 stp = screen.text[row];
784 srp = R->screen.rend[row]; 821 srp = screen.rend[row];
785 822
786 for (i = 0; i < len;) { 823 while (len--)
824 {
787 c = str[i++]; 825 c = *str++;
826
827 if (c < 0x20)
788 switch (c) { 828 switch (c)
789 case '\t': 829 {
830 case C0_HT:
790 rxvt_scr_tab(aR_ 1); 831 scr_tab (1);
832 continue;
833
834 case C0_LF:
835 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col);
837
838 screen.flags &= ~Screen_WrapNext;
839
840 if (screen.cur.row == screen.bscroll)
841 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
842 else if (screen.cur.row < (TermWin.nrow - 1))
843 row = (++screen.cur.row) + TermWin.saveLines;
844
845 stp = screen.text[row]; /* _must_ refresh */
846 srp = screen.rend[row]; /* _must_ refresh */
847 continue;
848
849 case C0_CR:
850 if (screen.tlen[row] != -1) /* XXX: think about this */
851 MAX_IT (screen.tlen[row], screen.cur.col);
852
853 screen.flags &= ~Screen_WrapNext;
854 screen.cur.col = 0;
855 continue;
856 }
857
858 if (checksel /* see if we're writing within selection */
859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
860 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
861 {
862 checksel = 0;
863 /*
864 * If we wrote anywhere in the selected area, kill the selection
865 * XXX: should we kill the mark too? Possibly, but maybe that
866 * should be a similar check.
867 */
868 CLEAR_SELECTION ();
869 }
870
871 if (screen.flags & Screen_WrapNext)
872 {
873 screen.tlen[row] = -1;
874
875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
876
877 stp = screen.text[row]; /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */
879 }
880
881 if (screen.flags & Screen_Insert)
882 scr_insdel_chars (1, INSERT);
883
884 // rely on wcwidth to tell us the character width, at least for non-latin1
885 // do wcwidth before further replacements, as wcwidth says that line-drawing
886 // characters have width -1 (DOH!) on GNU/Linux sometimes.
887 int width = c < 0x100 ? 1 : wcwidth (c);
888
889 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 {
891 // vt100 special graphics and line drawing
892 static uint16_t vt100_0[32] = { // 5f .. 7e
893 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
894 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
895 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
896 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
897 };
898
899 if (c >= 0x5f && c <= 0x7e)
900 {
901 c = vt100_0[c - 0x5f];
902 width = 1;
903 }
904 }
905
906 if (width != 0)
907 {
908#if !UNICODE_3
909 // trim characters we can't store directly :(
910 if (c >= 0x10000)
911# if ENABLE_COMBINING
912 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else
914 c = 0xfffd;
915# endif
916#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
918 rend_t rend = SET_FONT (rstyle,
919 c > 0x7f || bold || c < 0x20
920 ? TermWin.fontset->find_font (c, bold)
921 : TermWin.ascii_map [c - 0x20]);
922
923 do
924 {
925 stp[screen.cur.col] = c;
926 srp[screen.cur.col] = rend;
927
928 if (screen.cur.col < last_col - 1)
929 screen.cur.col++;
930 else
931 {
932 screen.tlen[row] = last_col;
933 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext;
935 break;
936 }
937
938 c = NOCHAR;
939 }
940 while (--width > 0);
941
942 // pad with spaces when overwriting wide character with smaller one
943 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944 {
945 stp[c] = ' ';
946 srp[c] = rend;
947 }
948 }
949 else if (width == 0)
950 {
951#if ENABLE_COMBINING
952 // handle combining characters
953 // we just tag the accent on the previous on-screen character.
954 // this is arguably not correct, but also arguably not wrong.
955 // we don't handle double-width characters nicely yet.
956
957 text_t *tp;
958 rend_t *rp;
959
960 if (screen.cur.col > 0)
961 {
962 tp = stp + screen.cur.col - 1;
963 rp = srp + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967 {
968 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
969 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
970 }
971 else
791 continue; 972 continue;
792 case '\n':
793 if (R->screen.tlen[row] != -1) /* XXX: think about this */
794 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
795 R->screen.flags &= ~Screen_WrapNext;
796 if (R->screen.cur.row == R->screen.bscroll)
797 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0);
798 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
799 row = (++R->screen.cur.row) + R->TermWin.saveLines;
800 stp = R->screen.text[row]; /* _must_ refresh */
801 srp = R->screen.rend[row]; /* _must_ refresh */
802 RESET_CHSTAT(R);
803 continue;
804 case '\r':
805 if (R->screen.tlen[row] != -1) /* XXX: think about this */
806 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
807 R->screen.flags &= ~Screen_WrapNext;
808 R->screen.cur.col = 0;
809 RESET_CHSTAT(R);
810 continue;
811 default:
812 if (c == 127)
813 continue; /* yummmm..... */
814 break;
815 }
816 973
817 if (checksel /* see if we're writing within selection */ 974 // handle double-width-chars by making them look extremely ugly
818 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 975 if (*tp == NOCHAR)
819 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { 976 *tp = ' '; // hack //D //TODO //--tp, --rp;
820 checksel = 0;
821 clearsel = 1;
822 }
823 if (R->screen.flags & Screen_WrapNext) {
824 R->screen.tlen[row] = -1;
825 if (R->screen.cur.row == R->screen.bscroll)
826 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0);
827 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
828 row = (++R->screen.cur.row) + R->TermWin.saveLines;
829 stp = R->screen.text[row]; /* _must_ refresh */
830 srp = R->screen.rend[row]; /* _must_ refresh */
831 R->screen.cur.col = 0;
832 R->screen.flags &= ~Screen_WrapNext;
833 }
834 if (R->screen.flags & Screen_Insert)
835 rxvt_scr_insdel_chars(aR_ 1, INSERT);
836 977
837 if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL 978 // first try to find a precomposed character
838 switch (c) 979 unicode_t n = rxvt_compose (*tp, c);
839 { 980 if (n == NOCHAR)
840 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 981 n = rxvt_composite.compose (*tp, c);
841 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
842 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
843 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
844 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
845 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
846 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
847 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
848 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
849 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
850 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
851 }
852 982
983 *tp = n;
853 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); 984 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
854 985#endif
855 stp[R->screen.cur.col] = c;
856 srp[R->screen.cur.col] = rend;
857
858 if (c > 255)
859 {
860 // rely on wcwidth to tell us the character width, at least for non iso-8859-1
861 int width = wcwidth (c);
862
863 if (width > 1)
864 {
865 while (--width > 0 && R->screen.cur.col < last_col - 1)
866 {
867
868 srp[R->screen.cur.col] |= RS_wide;
869
870 R->screen.cur.col++;
871 stp[R->screen.cur.col] = NOCHAR;
872 srp[R->screen.cur.col] = rend;
873 }
874 }
875 } 986 }
876
877 if (R->screen.cur.col < last_col - 1)
878 R->screen.cur.col++;
879 else {
880 R->screen.tlen[row] = last_col;
881 if (R->screen.flags & Screen_Autowrap)
882 R->screen.flags |= Screen_WrapNext;
883 }
884 } 987 }
988
885 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
886 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 990 MAX_IT (screen.tlen[row], screen.cur.col);
887
888/*
889 * If we wrote anywhere in the selected area, kill the selection
890 * XXX: should we kill the mark too? Possibly, but maybe that
891 * should be a similar check.
892 */
893 if (clearsel)
894 CLEAR_SELECTION(R);
895 991
896#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
897 assert(R->screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
898#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
899 MAX_IT(R->screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
900#endif 996#endif
901} 997}
902 998
903/* ------------------------------------------------------------------------- */ 999/* ------------------------------------------------------------------------- */
904/* 1000/*
905 * Process Backspace. Move back the cursor back a position, wrap if have to 1001 * Process Backspace. Move back the cursor back a position, wrap if have to
906 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
907 */ 1003 */
908/* EXTPROTO */
909void 1004void
910rxvt_scr_backspace(pR) 1005rxvt_term::scr_backspace ()
911{ 1006{
912 RESET_CHSTAT(R);
913 R->want_refresh = 1; 1007 want_refresh = 1;
1008
914 if (R->screen.cur.col == 0) { 1009 if (screen.cur.col == 0)
1010 {
915 if (R->screen.cur.row > 0) { 1011 if (screen.cur.row > 0)
1012 {
916#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
917 R->screen.cur.col = R->TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
918 R->screen.cur.row--; 1015 screen.cur.row--;
919 return; 1016 return;
920#endif 1017#endif
921 } 1018 }
1019 }
922 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
923 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1022
924 R->screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
925} 1024}
926 1025
927/* ------------------------------------------------------------------------- */ 1026/* ------------------------------------------------------------------------- */
928/* 1027/*
929 * Process Horizontal Tab 1028 * Process Horizontal Tab
930 * count: +ve = forward; -ve = backwards 1029 * count: +ve = forward; -ve = backwards
931 * XTERM_SEQ: CTRL-I 1030 * XTERM_SEQ: CTRL-I
932 */ 1031 */
933/* EXTPROTO */
934void 1032void
935rxvt_scr_tab(pR_ int count) 1033rxvt_term::scr_tab (int count)
936{ 1034{
937 int i, x; 1035 int i, x;
938 1036
939 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
940 R->want_refresh = 1; 1037 want_refresh = 1;
941 RESET_CHSTAT(R);
942 i = x = R->screen.cur.col; 1038 i = x = screen.cur.col;
1039
943 if (count == 0) 1040 if (count == 0)
944 return; 1041 return;
945 else if (count > 0) { 1042 else if (count > 0)
1043 {
946 for (; ++i < R->TermWin.ncol; ) 1044 for (; ++i < TermWin.ncol; )
947 if (R->tabs[i]) { 1045 if (tabs[i])
1046 {
948 x = i; 1047 x = i;
949 if (!--count) 1048 if (!--count)
950 break; 1049 break;
951 } 1050 }
1051
952 if (count) 1052 if (count)
953 x = R->TermWin.ncol - 1; 1053 x = TermWin.ncol - 1;
1054 }
954 } else /* if (count < 0) */ { 1055 else /* if (count < 0) */
1056 {
955 for (; --i >= 0; ) 1057 for (; --i >= 0; )
956 if (R->tabs[i]) { 1058 if (tabs[i])
957 x = i;
958 if (!++count)
959 break;
960 } 1059 {
961 if (count)
962 x = 0; 1060 x = i;
1061 if (!++count)
1062 break;
1063 }
1064
1065 if (count)
1066 x = 0;
963 } 1067 }
1068
964 if (x != R->screen.cur.col) 1069 if (x != screen.cur.col)
965 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1070 scr_gotorc (0, x, R_RELATIVE);
966} 1071}
967 1072
968/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
969/* 1074/*
970 * Process DEC Back Index 1075 * Process DEC Back Index
971 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
972 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
973 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
974 */ 1079 */
975#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
976/* EXTPROTO */
977void 1081void
978rxvt_scr_backindex(pR) 1082rxvt_term::scr_backindex ()
979{ 1083{
980 if (R->screen.cur.col > 0) 1084 if (screen.cur.col > 0)
981 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
982 else { 1086 else
1087 {
983 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
984 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
985 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1091 scr_insdel_chars (1, INSERT);
986 } 1092 }
987} 1093}
988#endif 1094#endif
989/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
990/* 1096/*
991 * Process DEC Forward Index 1097 * Process DEC Forward Index
992 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
993 * Move cursor right in row. If we're at the right boundary, shift everything 1099 * Move cursor right in row. If we're at the right boundary, shift everything
994 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
995 */ 1101 */
996#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
997/* EXTPROTO */
998void 1103void
999rxvt_scr_forwardindex(pR) 1104rxvt_term::scr_forwardindex ()
1000{ 1105{
1001 int row; 1106 int row;
1002 1107
1003 if (R->screen.cur.col < R->TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1004 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1005 else { 1110 else
1111 {
1006 row = R->screen.cur.row + R->TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1007 if (R->screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1008 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1009 else if (R->screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1010 R->screen.tlen[row] = R->TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1011 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1012 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1013 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1014 } 1122 }
1015} 1123}
1016#endif 1124#endif
1017 1125
1018/* ------------------------------------------------------------------------- */ 1126/* ------------------------------------------------------------------------- */
1019/* 1127/*
1020 * Goto Row/Column 1128 * Goto Row/Column
1021 */ 1129 */
1022/* EXTPROTO */
1023void 1130void
1024rxvt_scr_gotorc(pR_ int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1025{ 1132{
1026 R->want_refresh = 1; 1133 want_refresh = 1;
1027 ZERO_SCROLLBACK(R); 1134 ZERO_SCROLLBACK ();
1028 RESET_CHSTAT(R);
1029#ifdef RXVT_GRAPHICS
1030 if (rxvt_Gr_Displayed(aR))
1031 rxvt_Gr_scroll(aR_ 0);
1032#endif
1033 1135
1034 D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, R->screen.cur.row, R->screen.cur.col));
1035
1036 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1037 : col);
1038 MAX_IT(R->screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1039 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1040 1139
1041 R->screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1042 if (relative & R_RELATIVE) { 1142 if (relative & R_RELATIVE)
1143 {
1043 if (row > 0) { 1144 if (row > 0)
1145 {
1044 if (R->screen.cur.row <= R->screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
1045 && (R->screen.cur.row + row) > R->screen.bscroll) 1147 && (screen.cur.row + row) > screen.bscroll)
1046 R->screen.cur.row = R->screen.bscroll; 1148 screen.cur.row = screen.bscroll;
1047 else 1149 else
1048 R->screen.cur.row += row;
1049 } else if (row < 0) {
1050 if (R->screen.cur.row >= R->screen.tscroll
1051 && (R->screen.cur.row + row) < R->screen.tscroll)
1052 R->screen.cur.row = R->screen.tscroll;
1053 else
1054 R->screen.cur.row += row;
1055 }
1056 } else {
1057 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1058 R->screen.cur.row = row + R->screen.tscroll;
1059 MIN_IT(R->screen.cur.row, R->screen.bscroll);
1060 } else
1061 R->screen.cur.row = row; 1150 screen.cur.row += row;
1151 }
1152 else if (row < 0)
1153 {
1154 if (screen.cur.row >= screen.tscroll
1155 && (screen.cur.row + row) < screen.tscroll)
1156 screen.cur.row = screen.tscroll;
1157 else
1158 screen.cur.row += row;
1159 }
1160 }
1161 else
1062 } 1162 {
1163 if (screen.flags & Screen_Relative)
1164 { /* relative origin mode */
1165 screen.cur.row = row + screen.tscroll;
1166 MIN_IT (screen.cur.row, screen.bscroll);
1167 }
1168 else
1169 screen.cur.row = row;
1170 }
1171
1063 MAX_IT(R->screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1064 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1065} 1174}
1066 1175
1067/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1068/* 1177/*
1069 * direction should be UP or DN 1178 * direction should be UP or DN
1070 */ 1179 */
1071/* EXTPROTO */
1072void 1180void
1073rxvt_scr_index(pR_ enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1074{ 1182{
1075 int dirn; 1183 int dirn;
1076 1184
1077 R->want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1078 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1079 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1080 1189
1081 ZERO_SCROLLBACK(R);
1082 RESET_CHSTAT(R);
1083
1084#ifdef RXVT_GRAPHICS
1085 if (rxvt_Gr_Displayed(aR))
1086 rxvt_Gr_scroll(aR_ 0);
1087#endif
1088
1089 R->screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1090 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1091 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1092 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1093 else 1195 else
1094 R->screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1095 MAX_IT(R->screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1096 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1097 rxvt_selection_check(aR_ 0); 1200 selection_check (0);
1098} 1201}
1099 1202
1100/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1101/* 1204/*
1102 * Erase part or whole of a line 1205 * Erase part or whole of a line
1103 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1206 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1104 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1207 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1105 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1208 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1106 */ 1209 */
1107/* EXTPROTO */
1108void 1210void
1109rxvt_scr_erase_line(pR_ int mode) 1211rxvt_term::scr_erase_line (int mode)
1110{ 1212{
1111 unsigned int row, col, num; 1213 unsigned int row, col, num;
1112 1214
1113 R->want_refresh = 1; 1215 want_refresh = 1;
1114 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row));
1115 ZERO_SCROLLBACK(R); 1216 ZERO_SCROLLBACK ();
1116 RESET_CHSTAT(R);
1117 1217
1118#ifdef RXVT_GRAPHICS
1119 if (rxvt_Gr_Displayed(aR))
1120 rxvt_Gr_scroll(aR_ 0);
1121#endif
1122
1123 rxvt_selection_check(aR_ 1); 1218 selection_check (1);
1124 1219
1125 R->screen.flags &= ~Screen_WrapNext;
1126
1127 row = R->TermWin.saveLines + R->screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1128 switch (mode) { 1221 switch (mode)
1222 {
1129 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
1130 col = R->screen.cur.col; 1224 col = screen.cur.col;
1131 num = R->TermWin.ncol - col; 1225 num = TermWin.ncol - col;
1132 MIN_IT(R->screen.tlen[row], (int16_t)col); 1226 MIN_IT (screen.tlen[row], (int16_t)col);
1133 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1227 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1134 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1228 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1135 CLEAR_SELECTION(R); 1229 CLEAR_SELECTION ();
1136 break; 1230 break;
1137 case 1: /* erase to beginning of line */ 1231 case 1: /* erase to beginning of line */
1138 col = 0; 1232 col = 0;
1139 num = R->screen.cur.col + 1; 1233 num = screen.cur.col + 1;
1140 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1234 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1141 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1235 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1142 CLEAR_SELECTION(R); 1236 CLEAR_SELECTION ();
1143 break; 1237 break;
1144 case 2: /* erase whole line */ 1238 case 2: /* erase whole line */
1145 col = 0; 1239 col = 0;
1146 num = R->TermWin.ncol; 1240 num = TermWin.ncol;
1147 R->screen.tlen[row] = 0; 1241 screen.tlen[row] = 0;
1148 if (R->selection.beg.row <= R->screen.cur.row 1242 if (selection.beg.row <= screen.cur.row
1149 && R->selection.end.row >= R->screen.cur.row) 1243 && selection.end.row >= screen.cur.row)
1150 CLEAR_SELECTION(R); 1244 CLEAR_SELECTION ();
1151 break; 1245 break;
1152 default: 1246 default:
1153 return; 1247 return;
1154 } 1248 }
1249
1155 if (R->screen.text[row]) 1250 if (screen.text[row])
1156 rxvt_blank_line(aR_ 1251 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1157 &(R->screen.text[row][col]),
1158 &(R->screen.rend[row][col]), num, R->rstyle);
1159 else 1252 else
1160 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, 1253 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1161 R->rstyle);
1162} 1254}
1163 1255
1164/* ------------------------------------------------------------------------- */ 1256/* ------------------------------------------------------------------------- */
1165/* 1257/*
1166 * Erase part of whole of the screen 1258 * Erase part of whole of the screen
1167 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1259 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1168 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1260 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1169 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1261 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1170 */ 1262 */
1171/* EXTPROTO */
1172void 1263void
1173rxvt_scr_erase_screen(pR_ int mode) 1264rxvt_term::scr_erase_screen (int mode)
1174{ 1265{
1175 int num; 1266 int num;
1176 int32_t row, row_offset; 1267 int32_t row, row_offset;
1177 rend_t ren; 1268 rend_t ren;
1178 XGCValues gcvalue; 1269 XGCValues gcvalue;
1179 1270
1180 R->want_refresh = 1; 1271 want_refresh = 1;
1181 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row));
1182 ZERO_SCROLLBACK(R); 1272 ZERO_SCROLLBACK ();
1183 RESET_CHSTAT(R); 1273
1184 row_offset = (int32_t)R->TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1185 1275
1186 switch (mode) { 1276 switch (mode)
1277 {
1187 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
1188 rxvt_selection_check(aR_ 1); 1279 selection_check (1);
1189 rxvt_scr_erase_line(aR_ 0); 1280 scr_erase_line (0);
1190 row = R->screen.cur.row + 1; /* possible OOB */ 1281 row = screen.cur.row + 1; /* possible OOB */
1191 num = R->TermWin.nrow - row; 1282 num = TermWin.nrow - row;
1192 break; 1283 break;
1193 case 1: /* erase to beginning of screen */ 1284 case 1: /* erase to beginning of screen */
1194 rxvt_selection_check(aR_ 3); 1285 selection_check (3);
1195 rxvt_scr_erase_line(aR_ 1); 1286 scr_erase_line (1);
1196 row = 0; 1287 row = 0;
1197 num = R->screen.cur.row; 1288 num = screen.cur.row;
1198 break; 1289 break;
1199 case 2: /* erase whole screen */ 1290 case 2: /* erase whole screen */
1200 rxvt_selection_check(aR_ 3); 1291 selection_check (3);
1201#ifdef RXVT_GRAPHICS
1202 rxvt_Gr_ClearScreen(aR);
1203#endif
1204 row = 0; 1292 row = 0;
1205 num = R->TermWin.nrow; 1293 num = TermWin.nrow;
1206 break; 1294 break;
1207 default: 1295 default:
1208 return; 1296 return;
1209 } 1297 }
1210 R->refresh_type |= REFRESH_BOUNDS; 1298
1211 if (R->selection.op && R->current_screen == R->selection.screen 1299 if (selection.op && current_screen == selection.screen
1212 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1213 || (R->selection.end.row >= row 1301 || (selection.end.row >= row
1214 && R->selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1215 CLEAR_SELECTION(R); 1303 CLEAR_SELECTION ();
1304
1216 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1305 if (row >= TermWin.nrow) /* Out Of Bounds */
1217 return; 1306 return;
1307
1218 MIN_IT(num, (R->TermWin.nrow - row)); 1308 MIN_IT (num, (TermWin.nrow - row));
1309
1219 if (R->rstyle & (RS_RVid | RS_Uline)) 1310 if (rstyle & (RS_RVid | RS_Uline))
1220 ren = (rend_t) ~RS_None; 1311 ren = (rend_t) ~RS_None;
1221 else if (GET_BASEBG(R->rstyle) == Color_bg) { 1312 else if (GET_BASEBG (rstyle) == Color_bg)
1313 {
1222 ren = DEFAULT_RSTYLE; 1314 ren = DEFAULT_RSTYLE;
1223 CLEAR_ROWS(row, num); 1315 CLEAR_ROWS (row, num);
1224 } else { 1316 }
1317 else
1318 {
1225 ren = (R->rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1226 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1227 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1228 ERASE_ROWS(row, num); 1322 ERASE_ROWS (row, num);
1229 gcvalue.foreground = R->PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1230 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1231 } 1325 }
1326
1232 for (; num--; row++) { 1327 for (; num--; row++)
1328 {
1233 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 1329 scr_blank_screen_mem (screen.text, screen.rend,
1234 (unsigned int)(row + row_offset), R->rstyle); 1330 (unsigned int) (row + row_offset), rstyle);
1235 R->screen.tlen[row + row_offset] = 0; 1331 screen.tlen[row + row_offset] = 0;
1236 rxvt_blank_line(aR_ 1332 scr_blank_line (drawn_text[row], drawn_rend[row],
1237 R->drawn_text[row], R->drawn_rend[row],
1238 (unsigned int)R->TermWin.ncol, ren); 1333 (unsigned int)TermWin.ncol, ren);
1239 } 1334 }
1240} 1335}
1241 1336
1242/* ------------------------------------------------------------------------- */ 1337/* ------------------------------------------------------------------------- */
1243/* 1338/*
1244 * Fill the screen with `E's 1339 * Fill the screen with `E's
1245 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1340 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1246 */ 1341 */
1247/* EXTPROTO */
1248void 1342void
1249rxvt_scr_E(pR) 1343rxvt_term::scr_E ()
1250{ 1344{
1251 int i, j, k; 1345 int i, j, k;
1252 rend_t *r1, fs; 1346 rend_t *r1, fs;
1253 1347
1254 R->want_refresh = 1; 1348 want_refresh = 1;
1255 R->num_scr_allow = 0;
1256 ZERO_SCROLLBACK(R); 1349 ZERO_SCROLLBACK ();
1257 RESET_CHSTAT(R); 1350
1351 num_scr_allow = 0;
1258 rxvt_selection_check(aR_ 3); 1352 selection_check (3);
1259 1353
1260 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1261 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1356 {
1262 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1357 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1263 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1358 fill_text (screen.text[k], 'E', TermWin.ncol);
1264 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1359 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1265 *r1++ = fs; 1360 *r1++ = fs;
1266 } 1361 }
1267} 1362}
1268 1363
1269/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1270/* 1365/*
1271 * Insert/Delete <count> lines 1366 * Insert/Delete <count> lines
1272 */ 1367 */
1273/* EXTPROTO */
1274void 1368void
1275rxvt_scr_insdel_lines(pR_ int count, int insdel) 1369rxvt_term::scr_insdel_lines (int count, int insdel)
1276{ 1370{
1277 int end; 1371 int end;
1278 1372
1279 ZERO_SCROLLBACK(R); 1373 ZERO_SCROLLBACK ();
1280 RESET_CHSTAT(R);
1281 1374
1282#ifdef RXVT_GRAPHICS
1283 if (rxvt_Gr_Displayed(aR))
1284 rxvt_Gr_scroll(aR_ 0);
1285#endif
1286
1287 rxvt_selection_check(aR_ 1); 1375 selection_check (1);
1288 1376
1289 if (R->screen.cur.row > R->screen.bscroll) 1377 if (screen.cur.row > screen.bscroll)
1378 return;
1379
1380 end = screen.bscroll - screen.cur.row + 1;
1381 if (count > end)
1382 {
1383 if (insdel == DELETE)
1290 return; 1384 return;
1291
1292 end = R->screen.bscroll - R->screen.cur.row + 1;
1293 if (count > end) {
1294 if (insdel == DELETE)
1295 return;
1296 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1297 count = end; 1386 count = end;
1298 } 1387 }
1299 R->screen.flags &= ~Screen_WrapNext;
1300 1388
1389 scr_do_wrap ();
1390
1301 rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1302 0);
1303} 1392}
1304 1393
1305/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1306/* 1395/*
1307 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
1308 */ 1397 */
1309/* EXTPROTO */
1310void 1398void
1311rxvt_scr_insdel_chars(pR_ int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1312{ 1400{
1313 int col, row; 1401 int col, row;
1314 rend_t tr; 1402 rend_t tr;
1315 text_t *stp; 1403 text_t *stp;
1316 rend_t *srp; 1404 rend_t *srp;
1317 int16_t *slp; 1405 int16_t *slp;
1318 1406
1319 R->want_refresh = 1; 1407 want_refresh = 1;
1320 ZERO_SCROLLBACK(R); 1408 ZERO_SCROLLBACK ();
1321#if 0
1322 RESET_CHSTAT(R);
1323#endif
1324 1409
1325#ifdef RXVT_GRAPHICS
1326 if (rxvt_Gr_Displayed(aR))
1327 rxvt_Gr_scroll(aR_ 0);
1328#endif
1329
1330 if (count <= 0) 1410 if (count <= 0)
1331 return; 1411 return;
1332 1412
1413 scr_do_wrap ();
1414
1333 rxvt_selection_check(aR_ 1); 1415 selection_check (1);
1334 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1335 1417
1336 row = R->screen.cur.row + R->TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1337 R->screen.flags &= ~Screen_WrapNext;
1338 1419
1339 stp = R->screen.text[row]; 1420 stp = screen.text[row];
1340 srp = R->screen.rend[row]; 1421 srp = screen.rend[row];
1341 slp = &(R->screen.tlen[row]); 1422 slp = &screen.tlen[row];
1423
1342 switch (insdel) { 1424 switch (insdel)
1425 {
1343 case INSERT: 1426 case INSERT:
1344 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1345 col--) { 1428 col--)
1429 {
1346 stp[col] = stp[col - count]; 1430 stp[col] = stp[col - count];
1347 srp[col] = srp[col - count]; 1431 srp[col] = srp[col - count];
1348 } 1432 }
1433
1349 if (*slp != -1) { 1434 if (*slp != -1)
1435 {
1350 *slp += count; 1436 *slp += count;
1351 MIN_IT(*slp, R->TermWin.ncol); 1437 MIN_IT (*slp, TermWin.ncol);
1352 } 1438 }
1439
1353 if (R->selection.op && R->current_screen == R->selection.screen 1440 if (selection.op && current_screen == selection.screen
1354 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1441 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1442 {
1355 if (R->selection.end.row != R->screen.cur.row 1443 if (selection.end.row != screen.cur.row
1356 || (R->selection.end.col + count >= R->TermWin.ncol)) 1444 || (selection.end.col + count >= TermWin.ncol))
1357 CLEAR_SELECTION(R); 1445 CLEAR_SELECTION ();
1446 else
1358 else { /* shift selection */ 1447 { /* shift selection */
1359 R->selection.beg.col += count; 1448 selection.beg.col += count;
1360 R->selection.mark.col += count; /* XXX: yes? */ 1449 selection.mark.col += count; /* XXX: yes? */
1361 R->selection.end.col += count; 1450 selection.end.col += count;
1362 } 1451 }
1363 } 1452 }
1453
1364 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1454 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1365 (unsigned int)count, R->rstyle); 1455 (unsigned int)count, rstyle);
1366 break; 1456 break;
1457
1367 case ERASE: 1458 case ERASE:
1368 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1459 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1369 rxvt_selection_check(aR_ 1); 1460 selection_check (1);
1370 R->screen.cur.col -= count; 1461 screen.cur.col -= count;
1371 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1462 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1372 (unsigned int)count, R->rstyle); 1463 (unsigned int)count, rstyle);
1373 break; 1464 break;
1465
1374 case DELETE: 1466 case DELETE:
1375 tr = srp[R->TermWin.ncol - 1]
1376 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1467 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1468
1377 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1469 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1470 {
1378 stp[col] = stp[col + count]; 1471 stp[col] = stp[col + count];
1379 srp[col] = srp[col + count]; 1472 srp[col] = srp[col + count];
1380 } 1473 }
1381 rxvt_blank_line(aR_ 1474
1382 &(stp[R->TermWin.ncol - count]), 1475 scr_blank_line (& (stp[TermWin.ncol - count]),
1383 &(srp[R->TermWin.ncol - count]), 1476 & (srp[TermWin.ncol - count]),
1384 (unsigned int)count, tr); 1477 (unsigned int)count, tr);
1478
1385 if (*slp == -1) /* break line continuation */ 1479 if (*slp == -1) /* break line continuation */
1386 *slp = R->TermWin.ncol; 1480 *slp = TermWin.ncol;
1481
1387 *slp -= count; 1482 *slp -= count;
1388 MAX_IT(*slp, 0); 1483 MAX_IT (*slp, 0);
1484
1389 if (R->selection.op && R->current_screen == R->selection.screen 1485 if (selection.op && current_screen == selection.screen
1390 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 {
1391 if (R->selection.end.row != R->screen.cur.row 1488 if (selection.end.row != screen.cur.row
1392 || (R->screen.cur.col >= R->selection.beg.col - count) 1489 || (screen.cur.col >= selection.beg.col - count)
1393 || R->selection.end.col >= R->TermWin.ncol) 1490 || selection.end.col >= TermWin.ncol)
1394 CLEAR_SELECTION(R); 1491 CLEAR_SELECTION ();
1395 else { 1492 else
1493 {
1396 /* shift selection */ 1494 /* shift selection */
1397 R->selection.beg.col -= count; 1495 selection.beg.col -= count;
1398 R->selection.mark.col -= count; /* XXX: yes? */ 1496 selection.mark.col -= count; /* XXX: yes? */
1399 R->selection.end.col -= count; 1497 selection.end.col -= count;
1400 } 1498 }
1401 } 1499 }
1500
1402 break; 1501 break;
1403 } 1502 }
1404} 1503}
1405 1504
1406/* ------------------------------------------------------------------------- */ 1505/* ------------------------------------------------------------------------- */
1407/* 1506/*
1408 * Set the scrolling region 1507 * Set the scrolling region
1409 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1410 */ 1509 */
1411/* EXTPROTO */
1412void 1510void
1413rxvt_scr_scroll_region(pR_ int top, int bot) 1511rxvt_term::scr_scroll_region (int top, int bot)
1414{ 1512{
1415 MAX_IT(top, 0); 1513 MAX_IT (top, 0);
1416 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1514 MIN_IT (bot, (int)TermWin.nrow - 1);
1515
1417 if (top > bot) 1516 if (top > bot)
1418 return; 1517 return;
1518
1419 R->screen.tscroll = top; 1519 screen.tscroll = top;
1420 R->screen.bscroll = bot; 1520 screen.bscroll = bot;
1421 rxvt_scr_gotorc(aR_ 0, 0, 0); 1521 scr_gotorc (0, 0, 0);
1422} 1522}
1423 1523
1424/* ------------------------------------------------------------------------- */ 1524/* ------------------------------------------------------------------------- */
1425/* 1525/*
1426 * Make the cursor visible/invisible 1526 * Make the cursor visible/invisible
1427 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1527 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1428 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1528 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1429 */ 1529 */
1430/* EXTPROTO */
1431void 1530void
1432rxvt_scr_cursor_visible(pR_ int mode) 1531rxvt_term::scr_cursor_visible (int mode)
1433{ 1532{
1434 R->want_refresh = 1; 1533 want_refresh = 1;
1534
1435 if (mode) 1535 if (mode)
1436 R->screen.flags |= Screen_VisibleCursor; 1536 screen.flags |= Screen_VisibleCursor;
1437 else 1537 else
1438 R->screen.flags &= ~Screen_VisibleCursor; 1538 screen.flags &= ~Screen_VisibleCursor;
1439} 1539}
1440 1540
1441/* ------------------------------------------------------------------------- */ 1541/* ------------------------------------------------------------------------- */
1442/* 1542/*
1443 * Set/unset automatic wrapping 1543 * Set/unset automatic wrapping
1444 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1544 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1445 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1545 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1446 */ 1546 */
1447/* EXTPROTO */
1448void 1547void
1449rxvt_scr_autowrap(pR_ int mode) 1548rxvt_term::scr_autowrap (int mode)
1450{ 1549{
1451 if (mode) 1550 if (mode)
1452 R->screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1453 else 1552 else
1454 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1455} 1554}
1456 1555
1457/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1458/* 1557/*
1459 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1462 * Relative mode: line numbers are relative to top margin of scrolling region 1561 * Relative mode: line numbers are relative to top margin of scrolling region
1463 * and the cursor cannot be moved outside. 1562 * and the cursor cannot be moved outside.
1464 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1563 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1465 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1564 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1466 */ 1565 */
1467/* EXTPROTO */
1468void 1566void
1469rxvt_scr_relative_origin(pR_ int mode) 1567rxvt_term::scr_relative_origin (int mode)
1470{ 1568{
1471 if (mode) 1569 if (mode)
1472 R->screen.flags |= Screen_Relative; 1570 screen.flags |= Screen_Relative;
1473 else 1571 else
1474 R->screen.flags &= ~Screen_Relative; 1572 screen.flags &= ~Screen_Relative;
1475 rxvt_scr_gotorc(aR_ 0, 0, 0); 1573 scr_gotorc (0, 0, 0);
1476} 1574}
1477 1575
1478/* ------------------------------------------------------------------------- */ 1576/* ------------------------------------------------------------------------- */
1479/* 1577/*
1480 * Set insert/replace mode 1578 * Set insert/replace mode
1481 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1579 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1482 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1580 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1483 */ 1581 */
1484/* EXTPROTO */
1485void 1582void
1486rxvt_scr_insert_mode(pR_ int mode) 1583rxvt_term::scr_insert_mode (int mode)
1487{ 1584{
1488 if (mode) 1585 if (mode)
1489 R->screen.flags |= Screen_Insert; 1586 screen.flags |= Screen_Insert;
1490 else 1587 else
1491 R->screen.flags &= ~Screen_Insert; 1588 screen.flags &= ~Screen_Insert;
1492} 1589}
1493 1590
1494/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1495/* 1592/*
1496 * Set/Unset tabs 1593 * Set/Unset tabs
1497 * XTERM_SEQ: Set tab at current column : ESC H 1594 * XTERM_SEQ: Set tab at current column : ESC H
1498 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1595 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1499 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1596 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1500 */ 1597 */
1501/* EXTPROTO */
1502void 1598void
1503rxvt_scr_set_tab(pR_ int mode) 1599rxvt_term::scr_set_tab (int mode)
1504{ 1600{
1505 if (mode < 0) 1601 if (mode < 0)
1506 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1507 else if (R->screen.cur.col < R->TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1508 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1509} 1605}
1510 1606
1511/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
1512/* 1608/*
1513 * Set reverse/normal video 1609 * Set reverse/normal video
1514 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1610 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1515 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1516 */ 1612 */
1517/* EXTPROTO */
1518void 1613void
1519rxvt_scr_rvideo_mode(pR_ int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1520{ 1615{
1521 XGCValues gcvalue; 1616 XGCValues gcvalue;
1522 1617
1523 if (R->rvideo != mode) { 1618 if (rvideo != mode)
1619 {
1524 R->rvideo = mode; 1620 rvideo = mode;
1525 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1526#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1527 if (R->bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1528#endif 1624#endif
1529#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1530 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1531#endif 1627#endif
1532 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1533 R->PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1534 1630
1535 gcvalue.foreground = R->PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1536 gcvalue.background = R->PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1537 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1538 &gcvalue); 1634 &gcvalue);
1539 rxvt_scr_clear(aR); 1635 scr_clear ();
1540 rxvt_scr_touch(aR_ True); 1636 scr_touch (true);
1541 } 1637 }
1542} 1638}
1543 1639
1544/* ------------------------------------------------------------------------- */ 1640/* ------------------------------------------------------------------------- */
1545/* 1641/*
1546 * Report current cursor position 1642 * Report current cursor position
1547 * XTERM_SEQ: Report position: ESC [ 6 n 1643 * XTERM_SEQ: Report position: ESC [ 6 n
1548 */ 1644 */
1549/* EXTPROTO */
1550void 1645void
1551rxvt_scr_report_position(pR) 1646rxvt_term::scr_report_position ()
1552{ 1647{
1553 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); 1648 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1554} 1649}
1555 1650
1556/* ------------------------------------------------------------------------- * 1651/* ------------------------------------------------------------------------- *
1557 * FONTS * 1652 * FONTS *
1558 * ------------------------------------------------------------------------- */ 1653 * ------------------------------------------------------------------------- */
1559 1654
1560/* 1655/*
1561 * Set font style 1656 * Set font style
1562 */ 1657 */
1563/* INTPROTO */
1564void 1658void
1565rxvt_set_font_style(pR) 1659rxvt_term::set_font_style ()
1566{ 1660{
1567 switch (R->charsets[R->screen.charset]) { 1661 switch (charsets[screen.charset])
1662 {
1568 case '0': /* DEC Special Character & Line Drawing Set */ 1663 case '0': /* DEC Special Character & Line Drawing Set */
1569 break; 1664 break;
1570 case 'A': /* United Kingdom (UK) */ 1665 case 'A': /* United Kingdom (UK) */
1571 break; 1666 break;
1572 case 'B': /* United States (USASCII) */ 1667 case 'B': /* United States (USASCII) */
1573 break; 1668 break;
1574 case '<': /* Multinational character set */ 1669 case '<': /* Multinational character set */
1575 break; 1670 break;
1576 case '5': /* Finnish character set */ 1671 case '5': /* Finnish character set */
1577 break; 1672 break;
1578 case 'C': /* Finnish character set */ 1673 case 'C': /* Finnish character set */
1579 break; 1674 break;
1580 case 'K': /* German character set */ 1675 case 'K': /* German character set */
1581 break; 1676 break;
1582 } 1677 }
1583} 1678}
1584 1679
1585/* ------------------------------------------------------------------------- */ 1680/* ------------------------------------------------------------------------- */
… …
1588 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1683 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1589 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1684 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1590 * XTERM_SEQ: Invoke G2 character set: ESC N 1685 * XTERM_SEQ: Invoke G2 character set: ESC N
1591 * XTERM_SEQ: Invoke G3 character set: ESC O 1686 * XTERM_SEQ: Invoke G3 character set: ESC O
1592 */ 1687 */
1593/* EXTPROTO */
1594void 1688void
1595rxvt_scr_charset_choose(pR_ int set) 1689rxvt_term::scr_charset_choose (int set)
1596{ 1690 {
1597 R->screen.charset = set; 1691 screen.charset = set;
1598 rxvt_set_font_style(aR); 1692 set_font_style ();
1599} 1693 }
1600 1694
1601/* ------------------------------------------------------------------------- */ 1695/* ------------------------------------------------------------------------- */
1602/* 1696/*
1603 * Set a font 1697 * Set a font
1604 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1698 * XTERM_SEQ: Set G0 character set: ESC ( <C>
1605 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1699 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1606 * XTERM_SEQ: Set G2 character set: ESC * <C> 1700 * XTERM_SEQ: Set G2 character set: ESC * <C>
1607 * XTERM_SEQ: Set G3 character set: ESC + <C> 1701 * XTERM_SEQ: Set G3 character set: ESC + <C>
1608 * See set_font_style for possible values for <C> 1702 * See set_font_style for possible values for <C>
1609 */ 1703 */
1610/* EXTPROTO */
1611void 1704void
1612rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1705rxvt_term::scr_charset_set (int set, unsigned int ch)
1613{ 1706 {
1614 R->charsets[set] = (unsigned char)ch; 1707 charsets[set] = (unsigned char)ch;
1615 rxvt_set_font_style(aR); 1708 set_font_style ();
1616} 1709 }
1617 1710
1618
1619/* ------------------------------------------------------------------------- *
1620 * GRAPHICS COLOURS *
1621 * ------------------------------------------------------------------------- */
1622
1623#ifdef RXVT_GRAPHICS
1624/* EXTPROTO */
1625int
1626rxvt_scr_get_fgcolor(pR)
1627{
1628 return GET_FGCOLOR(R->rstyle);
1629}
1630
1631/* ------------------------------------------------------------------------- */
1632/* EXTPROTO */
1633int
1634rxvt_scr_get_bgcolor(pR)
1635{
1636 return GET_BGCOLOR(R->rstyle);
1637}
1638#endif
1639 1711
1640/* ------------------------------------------------------------------------- * 1712/* ------------------------------------------------------------------------- *
1641 * MAJOR SCREEN MANIPULATION * 1713 * MAJOR SCREEN MANIPULATION *
1642 * ------------------------------------------------------------------------- */ 1714 * ------------------------------------------------------------------------- */
1643 1715
1644/* 1716/*
1717 * refresh matching text.
1718 */
1719bool
1720rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1721{
1722 bool found = false;
1723
1724 for (int i = 0; i < TermWin.nrow; i++)
1725 {
1726 int col = 0;
1727 rend_t *drp = drawn_rend [i];
1728
1729 for (; col < TermWin.ncol; col++, drp++)
1730 if ((*drp & mask) == value)
1731 {
1732 found = true;
1733 *drp = ~value;
1734 }
1735 }
1736
1737 return found;
1738}
1739
1740/*
1645 * Refresh an area 1741 * Refresh an area
1646 */ 1742 */
1647enum { 1743enum {
1648 PART_BEG = 0, 1744 PART_BEG = 0,
1649 PART_END, 1745 PART_END,
1650 RC_COUNT 1746 RC_COUNT
1651}; 1747};
1652 1748
1653/* EXTPROTO */
1654void 1749void
1655rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1750rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1656{ 1751{
1657 int i; 1752 int i;
1658 row_col_t rc[RC_COUNT]; 1753 row_col_t rc[RC_COUNT];
1659 1754
1660 if (R->drawn_text == NULL) /* sanity check */ 1755 if (drawn_text == NULL) /* sanity check */
1661 return; 1756 return;
1757
1758#ifndef NO_SLOW_LINK_SUPPORT
1759 if (refresh_type == FAST_REFRESH && !display->is_local)
1760 {
1761 y = 0;
1762 height = TermWin.height;
1763 }
1764#endif
1662 1765
1663#ifdef DEBUG_STRICT 1766#ifdef DEBUG_STRICT
1664 x = max(x, (int)R->TermWin.int_bwidth); 1767 x = max (x, 0);
1665 x = min(x, (int)R->TermWin.width); 1768 x = min (x, (int)TermWin.width);
1666 y = max(y, (int)R->TermWin.int_bwidth); 1769 y = max (y, 0);
1667 y = min(y, (int)R->TermWin.height); 1770 y = min (y, (int)TermWin.height);
1668#endif 1771#endif
1669 1772
1670/* round down */ 1773 /* round down */
1671 rc[PART_BEG].col = Pixel2Col(x); 1774 rc[PART_BEG].col = Pixel2Col (x);
1672 rc[PART_BEG].row = Pixel2Row(y); 1775 rc[PART_BEG].row = Pixel2Row (y);
1673/* round up */ 1776 /* round up */
1674 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1777 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1675 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1778 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1676 1779
1677/* sanity checks */ 1780 /* sanity checks */
1678 for (i = PART_BEG; i < RC_COUNT; i++) { 1781 for (i = PART_BEG; i < RC_COUNT; i++)
1782 {
1679 MIN_IT(rc[i].col, R->TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1680 MIN_IT(rc[i].row, R->TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1681 } 1785 }
1682 1786
1683 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1684
1685 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1787 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1686 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1788 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1687 (rc[PART_END].col - rc[PART_BEG].col + 1));
1688 1789
1689 if (refresh) 1790 if (refresh)
1690 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1791 scr_refresh (SLOW_REFRESH);
1691} 1792}
1692 1793
1693/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
1694/* 1795/*
1695 * Refresh the entire screen 1796 * Refresh the entire screen
1696 */ 1797 */
1697/* EXTPROTO */
1698void 1798void
1699rxvt_scr_touch(pR_ Bool refresh) 1799rxvt_term::scr_touch (bool refresh)
1700{ 1800{
1701 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1801 scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
1702} 1802}
1703 1803
1704/* ------------------------------------------------------------------------- */ 1804/* ------------------------------------------------------------------------- */
1705/* 1805/*
1706 * Move the display so that the line represented by scrollbar value Y is at 1806 * Move the display so that the line represented by scrollbar value Y is at
1707 * the top of the screen 1807 * the top of the screen
1708 */ 1808 */
1709/* EXTPROTO */
1710int 1809int
1711rxvt_scr_move_to(pR_ int y, int len) 1810rxvt_term::scr_move_to (int y, int len)
1712{ 1811{
1713 long p = 0; 1812 long p = 0;
1714 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1715 1814
1716 oldviewstart = R->TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1717 if (y < len) { 1817 if (y < len)
1818 {
1718 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1719 p -= (long)(R->TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1720 p = max(p, 0); 1821 p = max (p, 0);
1721 } 1822 }
1823
1722 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1723 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start));
1724 1825
1725 return rxvt_scr_changeview(aR_ oldviewstart); 1826 return scr_changeview (oldviewstart);
1726} 1827}
1727 1828
1728/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1729/* 1830/*
1730 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1731 * direction should be UP or DN 1832 * direction should be UP or DN
1732 */ 1833 */
1733/* EXTPROTO */
1734int 1834int
1735rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1736{ 1836{
1737 int n; 1837 int n;
1738 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1739 1839
1740 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start));
1741#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1742 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1743#endif 1842#endif
1744 oldviewstart = R->TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1745 if (direction == UP) { 1844 if (direction == UP)
1845 {
1746 n = R->TermWin.view_start + nlines; 1846 n = TermWin.view_start + nlines;
1747 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1847 TermWin.view_start = min (n, TermWin.nscrolled);
1748 } else { 1848 }
1849 else
1850 {
1749 n = R->TermWin.view_start - nlines; 1851 n = TermWin.view_start - nlines;
1750 R->TermWin.view_start = max(n, 0); 1852 TermWin.view_start = max (n, 0);
1751 } 1853 }
1752 return rxvt_scr_changeview(aR_ oldviewstart); 1854 return scr_changeview (oldviewstart);
1753} 1855}
1754 1856
1755/* INTPROTO */
1756int 1857int
1757rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1858rxvt_term::scr_changeview (uint16_t oldviewstart)
1758{ 1859{
1759 if (R->TermWin.view_start != oldviewstart) { 1860 if (TermWin.view_start != oldviewstart)
1861 {
1760 R->want_refresh = 1; 1862 want_refresh = 1;
1761#ifdef RXVT_GRAPHICS
1762 if (rxvt_Gr_Displayed(aR))
1763 rxvt_Gr_scroll(aR_ 0);
1764#endif
1765 R->num_scr -= (R->TermWin.view_start - oldviewstart); 1863 num_scr -= (TermWin.view_start - oldviewstart);
1766 } 1864 }
1865
1767 return (int)(R->TermWin.view_start - oldviewstart); 1866 return (int) (TermWin.view_start - oldviewstart);
1768} 1867}
1769 1868
1770/* ------------------------------------------------------------------------- */ 1869/* ------------------------------------------------------------------------- */
1771/* EXTPROTO */
1772void 1870void
1773rxvt_scr_bell(pR) 1871rxvt_term::scr_bell ()
1774{ 1872{
1775#ifndef NO_BELL 1873#ifndef NO_BELL
1776# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1777# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1778 if (R->Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1779# endif 1877# endif
1780 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1781# endif 1879# endif
1782 if (R->Options & Opt_visualBell) { 1880 if (options & Opt_visualBell)
1881 {
1783 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1784 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1884 }
1785 } else 1885 else
1786 XBell(R->Xdisplay, 0); 1886 XBell (display->display, 0);
1787#endif 1887#endif
1788} 1888}
1789 1889
1790/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1791/* ARGSUSED */ 1891/* ARGSUSED */
1792/* EXTPROTO */
1793void 1892void
1794rxvt_scr_printscreen(pR_ int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1795{ 1894{
1796#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1797 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1798 text_t *t; 1897 FILE *fd;
1799 FILE *fd;
1800 1898
1801 if ((fd = rxvt_popen_printer(aR)) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1802 return; 1900 return;
1901
1803 nrows = R->TermWin.nrow; 1902 nrows = TermWin.nrow;
1804 row_offset = R->TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1805 if (!fullhist) 1905 if (!fullhist)
1806 row_offset -= R->TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1807 else { 1907 else
1908 {
1808 nrows += R->TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1809 row_offset -= R->TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1810 } 1911 }
1811 1912
1913 wctomb (0, 0);
1914
1812 for (r1 = 0; r1 < nrows; r1++) { 1915 for (r1 = 0; r1 < nrows; r1++)
1916 {
1813 t = R->screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1814 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1815 if (!isspace(t[i])) 1919
1816 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1817 fprintf(fd, "%.*s\n", (i + 1), t); 1921 {
1922 char mb[MB_LEN_MAX];
1923 text_t t = *tp++;
1924 if (t == NOCHAR)
1925 continue;
1926
1927 len = wctomb (mb, t);
1928
1929 if (len <= 0)
1930 {
1931 mb[0] = ' ';
1932 len = 1;
1933 }
1934
1935 fwrite (mb, 1, len, fd);
1936 }
1937
1938 fputc ('\n', fd);
1818 } 1939 }
1940
1819 rxvt_pclose_printer(fd); 1941 pclose_printer (fd);
1820#endif 1942#endif
1821} 1943}
1822 1944
1823/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1824/* 1946/*
1825 * Refresh the screen 1947 * Refresh the screen
1826 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1948 * drawn_text/drawn_rend contain the screen information before the update.
1827 * R->screen.text/R->screen.rend contain what the screen will change to. 1949 * screen.text/screen.rend contain what the screen will change to.
1828 */ 1950 */
1829
1830#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1831# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1832# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1833#else
1834# define MONO_BOLD(x) \
1835 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1836# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1837#endif
1838 1951
1839#define FONT_WIDTH(X, Y) \ 1952#define FONT_WIDTH(X, Y) \
1840 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1953 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1841#define FONT_RBEAR(X, Y) \ 1954#define FONT_RBEAR(X, Y) \
1842 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1955 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1843#define FONT_LBEAR(X, Y) \ 1956#define FONT_LBEAR(X, Y) \
1844 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1957 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1845#define IS_FONT_CHAR(X, Y) \ 1958#define IS_FONT_CHAR(X, Y) \
1846 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1959 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1847 1960
1848/* EXTPROTO */
1849void 1961void
1850rxvt_scr_refresh(pR_ unsigned char refresh_type) 1962rxvt_term::scr_refresh (unsigned char refresh_type)
1851{ 1963{
1852 unsigned char clearfirst, /* first character writes before cell */
1853 clearlast, /* last character writes beyond cell */
1854 must_clear, /* use draw_string not draw_image_string */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1855#ifndef NO_BOLDFONT
1856 bfont, /* we've changed font to bold font */
1857#endif
1858 rvid, /* reverse video this position */ 1965 rvid, /* reverse video this position */
1859 wbyte, /* we're in multibyte */
1860 showcursor; /* show the cursor */ 1966 showcursor; /* show the cursor */
1861 int fore, back; /* desired foreground/background */
1862 int16_t col, row, /* column/row we're processing */ 1967 int16_t col, row, /* column/row we're processing */
1863 ocrow; /* old cursor row */ 1968 ocrow; /* old cursor row */
1864 int cursorwidth;
1865 int i, /* tmp */ 1969 int i, /* tmp */
1866 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1867#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1868 rend_t cc1; /* store colours at cursor position(s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1869 rend_t cc2; /* store colours at cursor position(s) */
1870#endif 1973#endif
1871 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1872 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1873 char *buffer; /* local copy of R->buffer */
1874 1975
1875 if (refresh_type == NO_REFRESH || !R->TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1876 return; 1977 return;
1877 1978
1878 /* 1979 /*
1879 * A: set up vars 1980 * A: set up vars
1880 */ 1981 */
1881 clearfirst = clearlast = must_clear = wbyte = 0; 1982 must_clear = 0;
1882#ifndef NO_BOLDFONT 1983 refresh_count = 0;
1883 bfont = 0;
1884#endif
1885 1984
1886 if (R->currmaxcol < R->TermWin.ncol) 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1986
1987#ifdef XPM_BACKGROUND
1988 must_clear |= (bgPixmap.pixmap != None);
1989#endif
1990#ifdef TRANSPARENT
1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1992#endif
1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1994
1995 /*
1996 * B: reverse any characters which are selected
1997 */
1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
2002
2003 /*
2004 * C: set the cursor character (s)
2005 */
2006 {
2007 unsigned char setoldcursor;
2008 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */
2010
2011 showcursor = (screen.flags & Screen_VisibleCursor);
2012#ifdef CURSOR_BLINK
2013 if (hidden_cursor)
2014 showcursor = 0;
2015#endif
2016
2017 if (showcursor)
1887 { 2018 {
1888 R->currmaxcol = R->TermWin.ncol; 2019 int col = screen.cur.col;
1889 R->buffer = (char *)rxvt_realloc (R->buffer,
1890 sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX);
1891 }
1892 2020
1893 buffer = R->buffer; 2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
1894 R->refresh_count = 0; 2022 col--;
1895 2023
1896 row_offset = R->TermWin.saveLines - R->TermWin.view_start;
1897
1898 if ((refresh_type & REFRESH_BOUNDS))
1899 {
1900 clearfirst = clearlast = 1;
1901 R->refresh_type &= ~REFRESH_BOUNDS;
1902 }
1903
1904#if defined(XPM_BACKGROUND)
1905 must_clear |= (R->bgPixmap.pixmap != None);
1906#endif
1907#if defined(TRANSPARENT)
1908 must_clear |= ((R->Options & Opt_transparent) && R->am_transparent);
1909#endif
1910 ocrow = R->oldcursor.row; /* is there an old outline cursor on screen? */
1911
1912/*
1913 * B: reverse any characters which are selected
1914 */
1915 rxvt_scr_reverse_selection(aR);
1916
1917/*
1918 * C: set the cursor character(s)
1919 */
1920 {
1921 unsigned char setoldcursor;
1922 rend_t ccol1, /* Cursor colour */
1923 ccol2; /* Cursor colour2 */
1924
1925 showcursor = (R->screen.flags & Screen_VisibleCursor);
1926 cursorwidth = 0;
1927#ifdef CURSOR_BLINK
1928 if (R->hidden_cursor)
1929 showcursor = 0;
1930#endif
1931
1932 cursorwidth = 0;
1933
1934 if (showcursor)
1935 {
1936 cursorwidth++;
1937
1938 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1939 [R->screen.cur.col]);
1940 2025
1941 if (showcursor && R->TermWin.focus) 2026 if (showcursor && TermWin.focus)
1942 { 2027 {
1943 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
1944#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1945 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
1946 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
1947 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
1948 else 2033 else
1949#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1950 ccol1 = GET_FGCOLOR(R->rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
1951#else 2036#else
1952 ccol1 = Color_fg; 2037 ccol1 = Color_fg;
1953#endif 2038#endif
1954 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) 2039 if (ISSET_PIXCOLOR (Color_cursor2))
1955 ccol2 = Color_cursor2; 2040 ccol2 = Color_cursor2;
1956 else 2041 else
1957#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1958 ccol2 = GET_BGCOLOR(R->rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
1959#else 2044#else
1960 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
1961#endif 2046#endif
1962 *srp = SET_FGCOLOR(*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
1963 *srp = SET_BGCOLOR(*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
1964#endif 2049#endif
1965 }
1966
1967 while (IS_WIDE (*srp))
1968 cursorwidth++, srp++;
1969 }
1970
1971 /* make sure no outline cursor is left around */
1972 setoldcursor = 0;
1973 if (ocrow != -1) {
1974 if (R->screen.cur.row + R->TermWin.view_start != ocrow
1975 || R->screen.cur.col != R->oldcursor.col) {
1976 if (ocrow < R->TermWin.nrow
1977 && R->oldcursor.col < R->TermWin.ncol) {
1978 R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline);
1979 }
1980 if (R->TermWin.focus || !showcursor)
1981 R->oldcursor.row = -1;
1982 else
1983 setoldcursor = 1;
1984 }
1985 } else if (!R->TermWin.focus)
1986 setoldcursor = 1;
1987 if (setoldcursor) {
1988 if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow)
1989 R->oldcursor.row = -1;
1990 else {
1991 R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start;
1992 R->oldcursor.col = R->screen.cur.col;
1993 } 2050 }
1994 } 2051 }
2052
2053 /* make sure no outline cursor is left around */
2054 setoldcursor = 0;
2055 if (ocrow != -1)
2056 {
2057 if (screen.cur.row + TermWin.view_start != ocrow
2058 || screen.cur.col != oldcursor.col)
2059 {
2060 if (ocrow < TermWin.nrow
2061 && oldcursor.col < TermWin.ncol)
2062 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2063
2064 if (TermWin.focus || !showcursor)
2065 oldcursor.row = -1;
2066 else
2067 setoldcursor = 1;
2068 }
1995 } 2069 }
2070 else if (!TermWin.focus)
2071 setoldcursor = 1;
1996 2072
2073 if (setoldcursor)
2074 {
2075 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2076 oldcursor.row = -1;
2077 else
2078 {
2079 oldcursor.row = screen.cur.row + TermWin.view_start;
2080 oldcursor.col = screen.cur.col;
2081 }
2082 }
2083 }
2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1997#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
1998/* 2088 /*
1999 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
2000 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
2001 */ 2091 */
2002 i = R->num_scr; 2092 i = num_scr;
2093 if (!display->is_local
2003 if (refresh_type == FAST_REFRESH && R->num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
2004 && abs(i) < R->TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
2005 { 2096 {
2006 int16_t nits; 2097 int16_t nits;
2007 int j; 2098 int j;
2008 rend_t *drp2; 2099 int len, wlen;
2009 text_t *dtp2;
2010 int len, wlen;
2011 2100
2012 j = R->TermWin.nrow; 2101 j = TermWin.nrow;
2013 wlen = len = -1; 2102 wlen = len = -1;
2014 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
2015 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2016 { 2105 {
2017 if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2018 { 2107 {
2019 stp = R->screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
2020 srp = R->screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
2021 dtp = R->drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
2022 dtp2 = R->drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
2023 drp = R->drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
2024 drp2 = R->drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
2025 2114
2026 for (nits = 0, col = R->TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2027 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2028 nits--; 2117 nits--;
2029 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2030 nits++; 2119 nits++;
2031 2120
2032 if (nits > 8) /* XXX: arbitrary choice */ 2121 if (nits > 8) /* XXX: arbitrary choice */
2033 { 2122 {
2034 for (col = R->TermWin.ncol; col--; ) 2123 for (col = TermWin.ncol; col--; )
2124 {
2125 *dtp++ = *dtp2++;
2126 *drp++ = *drp2++;
2127 }
2128
2129 if (len == -1)
2130 len = row;
2131
2132 wlen = row;
2133 continue;
2134 }
2135 }
2136
2137 if (len != -1)
2138 {
2139 /* also comes here at end if needed because of >= above */
2140 if (wlen < len)
2141 SWAP_IT (wlen, len, int);
2142
2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2144 TermWin.gc, 0, Row2Pixel (len + i),
2145 (unsigned int)TermWin_TotalWidth (),
2146 (unsigned int)Height2Pixel (wlen - len + 1),
2147 0, Row2Pixel (len));
2148 len = -1;
2149 }
2150 }
2151 }
2152#endif
2153
2154 /*
2155 * E: main pass across every character
2156 */
2157 for (row = 0; row < TermWin.nrow; row++)
2158 {
2159 text_t *stp = screen.text[row + row_offset];
2160 rend_t *srp = screen.rend[row + row_offset];
2161 text_t *dtp = drawn_text[row];
2162 rend_t *drp = drawn_rend[row];
2163
2164 /*
2165 * E2: OK, now the real pass
2166 */
2167 int ypixel = (int)Row2Pixel (row);
2168
2169 for (col = 0; col < TermWin.ncol; col++)
2170 {
2171 /* compare new text with old - if exactly the same then continue */
2172 if (stp[col] == dtp[col] /* Must match characters to skip. */
2173 && (srp[col] == drp[col] /* Either rendition the same or */
2174 || (stp[col] == ' ' /* space w/ no background change */
2175 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176 continue;
2177
2178 // redraw one or more characters
2179
2180 // seek to the beginning if wide characters
2181 while (stp[col] == NOCHAR && col > 0)
2182 --col;
2183
2184 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2185 text_t *text = stp + col;
2186 int count = 1;
2187
2188 dtp[col] = stp[col];
2189 drp[col] = rend;
2190
2191 int xpixel = Col2Pixel (col);
2192
2193 // this loop looks very messy, it can probably be optimized
2194 // and cleaned a bit by you?
2195 for (i = 0; ++col < TermWin.ncol; )
2196 {
2197 if (stp[col] == NOCHAR)
2198 {
2199 dtp[col] = stp[col];
2200 drp[col] = rend;
2201 count++;
2202 i++;
2203
2204 continue;
2205 }
2206
2207 if (rend != srp[col])
2208 break;
2209
2210 count++;
2211
2212 if (stp[col] != dtp[col]
2213 || srp[col] != drp[col])
2214 {
2215 if (must_clear && (i++ > count / 2))
2216 break;
2217
2218 dtp[col] = stp[col];
2219 drp[col] = rend;
2220 i = 0;
2221 }
2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2223 break;
2224 }
2225
2226 col--; /* went one too far. move back */
2227 count -= i; /* dump any matching trailing chars */
2228
2229 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR)
2231 count++, i--;
2232
2233 /*
2234 * Determine the attributes for the string
2235 */
2236 int fid = GET_FONT (rend);
2237 int fore = GET_FGCOLOR (rend); // desired foreground
2238 int back = GET_BGCOLOR (rend); // desired background
2239
2240 rend = GET_ATTR (rend);
2241
2242 rvid = !!(rend & RS_RVid);
2243
2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2246 {
2247 if (ISSET_PIXCOLOR (Color_BD))
2248 fore = Color_BD;
2249 else
2250 rvid = !rvid;
2251 }
2252
2253 if (rend & RS_Uline)
2254 if (ISSET_PIXCOLOR (Color_UL))
2255 fore = Color_UL;
2256#endif
2257
2258 if (rvid)
2259 {
2260 SWAP_IT (fore, back, int);
2261
2262#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (ISSET_PIXCOLOR (Color_RV)
2264# ifndef NO_CURSORCOLOR
2265 && !ISSET_PIXCOLOR (Color_cursor)
2266# endif
2267 )
2268 back = Color_RV;
2269#endif
2270 }
2271
2272#ifdef TEXT_BLINK
2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2274 {
2275 if (!text_blink_ev.active)
2276 {
2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2278 hidden_text = 0;
2279 }
2280 else if (hidden_text)
2281 fore = back;
2282 }
2283#endif
2284
2285 /*
2286 * Actually do the drawing of the string here
2287 */
2288 rxvt_font *font = (*TermWin.fontset)[fid];
2289
2290 if (back == fore)
2291 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2292 TermWin.fwidth * count, TermWin.fheight,
2293 back);
2294 else if (back == Color_bg)
2295 {
2296 if (must_clear)
2297 {
2298 CLEAR_CHARS (xpixel, ypixel, count);
2299
2300 for (i = 0; i < count; i++) /* don't draw empty strings */
2301 if (text[i] != ' ')
2035 { 2302 {
2036 *dtp++ = *dtp2++; 2303 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2037 *drp++ = *drp2++; 2304 break;
2038 } 2305 }
2039
2040 if (len == -1)
2041 len = row;
2042
2043 wlen = row;
2044 continue;
2045 } 2306 }
2046 }
2047
2048 if (len != -1)
2049 {
2050 /* also comes here at end if needed because of >= above */
2051 if (wlen < len)
2052 SWAP_IT(wlen, len, int);
2053 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2054 XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt,
2055 R->TermWin.gc, 0, Row2Pixel(len + i),
2056 (unsigned int)TermWin_TotalWidth(),
2057 (unsigned int)Height2Pixel(wlen - len + 1),
2058 0, Row2Pixel(len));
2059 len = -1;
2060 }
2061 }
2062 }
2063#endif
2064
2065/*
2066 * E: main pass across every character
2067 */
2068 for (row = 0; row < R->TermWin.nrow; row++)
2069 {
2070 stp = R->screen.text[row + row_offset];
2071 srp = R->screen.rend[row + row_offset];
2072 dtp = R->drawn_text[row];
2073 drp = R->drawn_rend[row];
2074
2075/*
2076 * E2: OK, now the real pass
2077 */
2078 int ypixel = (int)Row2Pixel(row);
2079
2080 for (col = 0; col < R->TermWin.ncol; col++)
2081 {
2082 /* compare new text with old - if exactly the same then continue */
2083 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2084
2085 if (stp[col] == dtp[col] /* Must match characters to skip. */
2086 && (rend == drp[col] /* Either rendition the same or */
2087 || (stp[col] == ' ' /* space w/ no background change */
2088 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2089 continue;
2090
2091 text_t *text = stp + col;
2092 int count = 1;
2093
2094 /* redraw one or more characters */
2095
2096 dtp[col] = stp[col];
2097 drp[col] = rend;
2098
2099 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2100 continue;
2101
2102 int xpixel = Col2Pixel(col);
2103
2104 // this loop looks very messy, it can probably be optimized
2105 // and cleaned a bit by you?
2106 for (i = 0; ++col < R->TermWin.ncol; )
2107 {
2108 if (stp[col] == NOCHAR)
2109 {
2110 dtp[col] = stp[col];
2111 drp[col] = rend;
2112 count++;
2113
2114 if (i) // only possible skip if char unchanged
2115 i++;
2116
2117 continue;
2118 }
2119
2120 if (((rend ^ srp[col]) & ~RS_wide) != 0)
2121 break;
2122
2123 count++;
2124
2125 if (stp[col] != dtp[col]
2126 || srp[col] != drp[col])
2127 {
2128 if (must_clear && (i++ > (count / 2)))
2129 break;
2130
2131 dtp[col] = stp[col];
2132 drp[col] = rend;
2133 i = 0;
2134 }
2135 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2136 break;
2137 }
2138
2139 col--; /* went one too far. move back */
2140 count -= i; /* dump any matching trailing chars */
2141
2142/*
2143 * Determine the attributes for the string
2144 */
2145 int fid = GET_FONT(rend);
2146 fore = GET_FGCOLOR(rend);
2147 back = GET_BGCOLOR(rend);
2148 rend = GET_ATTR(rend);
2149
2150 rvid = (rend & RS_RVid) ? 1 : 0;
2151#ifdef OPTION_HC
2152 if (!rvid && (rend & RS_Blink))
2153 {
2154 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC))
2155 back = Color_HC;
2156 else 2307 else
2157 rvid = !rvid; /* fall back */ 2308 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2158 } 2309 }
2159#endif
2160 if (rvid)
2161 {
2162 SWAP_IT(fore, back, int);
2163
2164#ifndef NO_BOLD_UNDERLINE_REVERSE
2165 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV)
2166# ifndef NO_CURSORCOLOR
2167 && !ISSET_PIXCOLOR(R, Color_cursor)
2168# endif
2169 )
2170 back = Color_RV;
2171#endif
2172 }
2173#ifndef NO_BOLD_UNDERLINE_REVERSE
2174 else if (rend & RS_Bold)
2175 {
2176 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD))
2177 {
2178 fore = Color_BD;
2179# ifndef VERYBOLD
2180 rend &= ~RS_Bold; /* we've taken care of it */
2181# endif
2182 }
2183 }
2184 else if (rend & RS_Uline)
2185 {
2186 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL))
2187 {
2188 fore = Color_UL;
2189 rend &= ~RS_Uline; /* we've taken care of it */
2190 }
2191 }
2192#endif
2193
2194/*
2195 * Actually do the drawing of the string here
2196 */
2197 rxvt_font *font = (*R->TermWin.fontset)[fid];
2198
2199 if (back == Color_bg)
2200 {
2201 if (must_clear)
2202 {
2203 for (i = 0; i < count; i++) /* don't draw empty strings */
2204 if (text[i] != ' ')
2205 {
2206 font->draw (xpixel, ypixel, text, count, fore, -1);
2207 goto nodraw;
2208 }
2209
2210 CLEAR_CHARS(xpixel, ypixel, count);
2211nodraw: ;
2212 }
2213 else
2214 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2215 }
2216 else 2310 else
2217 font->draw (xpixel, ypixel, text, count, fore, back); 2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2218 2312
2219 if ((rend & RS_Uline) && (font->descent > 1)) 2313 if (rend & RS_Uline && font->descent > 1 && fore != back)
2220 XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, 2314 XDrawLine (display->display, drawBuffer, TermWin.gc,
2221 xpixel, ypixel + font->ascent + 1, 2315 xpixel, ypixel + font->ascent + 1,
2222 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2223 } /* for (col....) */ 2317 } /* for (col....) */
2224 } /* for (row....) */ 2318 } /* for (row....) */
2225 2319
2226/* 2320 /*
2227 * G: cleanup cursor and display outline cursor if necessary 2321 * G: cleanup cursor and display outline cursor if necessary
2228 */ 2322 */
2229 if (showcursor) { 2323 if (showcursor)
2324 {
2230 if (R->TermWin.focus) { 2325 if (TermWin.focus)
2231 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2326 {
2232 [R->screen.cur.col]);
2233 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2234#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2235 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2236#endif 2330#endif
2331 }
2237 } else if (R->oldcursor.row >= 0) { 2332 else if (oldcursor.row >= 0)
2333 {
2238#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2239 unsigned long gcmask; /* Graphics Context mask */
2240
2241 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { 2335 if (ISSET_PIXCOLOR (Color_cursor))
2242 XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2243 }
2244#endif 2337#endif
2338 int cursorwidth = 1;
2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2341 cursorwidth++;
2342
2245 XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, 2343 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2246 Col2Pixel(R->oldcursor.col), 2344 Col2Pixel (oldcursor.col),
2247 Row2Pixel(R->oldcursor.row), 2345 Row2Pixel (oldcursor.row),
2248 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2346 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2249 (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); 2347 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2250 } 2348 }
2251 } 2349 }
2252/* 2350
2351 /*
2253 * H: cleanup selection 2352 * H: cleanup selection
2254 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2255 rxvt_scr_reverse_selection(aR); 2357 scr_reverse_selection ();
2256 2358
2257/*
2258 * I: other general cleanup
2259 */
2260 if (clearfirst && R->TermWin.int_bwidth)
2261 /*
2262 * clear the whole screen height, note that width == 0 is treated
2263 * specially by XClearArea
2264 */
2265 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0,
2266 (unsigned int)R->TermWin.int_bwidth,
2267 (unsigned int)TermWin_TotalHeight(), False);
2268 if (clearlast && R->TermWin.int_bwidth)
2269 /*
2270 * clear the whole screen height, note that width == 0 is treated
2271 * specially by XClearArea
2272 */
2273 XClearArea(R->Xdisplay, R->TermWin.vt,
2274 R->TermWin.width + R->TermWin.int_bwidth, 0,
2275 (unsigned int)R->TermWin.int_bwidth,
2276 (unsigned int)TermWin_TotalHeight(), False);
2277 if (refresh_type & SMOOTH_REFRESH) 2359 if (refresh_type & SMOOTH_REFRESH)
2278 XSync(R->Xdisplay, False); 2360 XFlush (display->display);
2279 2361
2280 R->num_scr = 0; 2362 num_scr = 0;
2281 R->num_scr_allow = 1; 2363 num_scr_allow = 1;
2282 R->want_refresh = 0; /* screen is current */ 2364 want_refresh = 0; /* screen is current */
2283} 2365}
2284/* ------------------------------------------------------------------------- */
2285 2366
2286/* EXTPROTO */
2287void 2367void
2288rxvt_scr_clear(pR) 2368rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2289{ 2369{
2370 if (!rp || !tp)
2371 return;
2372
2373 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2374 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2375}
2376
2377void
2378rxvt_term::scr_remap_chars ()
2379{
2380 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2381 scr_remap_chars (screen.text[i], screen.rend[i]);
2382
2383 for (int i = TermWin.nrow; i--; )
2384 {
2385 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2386 scr_remap_chars (swap.text[i], swap.rend[i]);
2387 }
2388}
2389
2390/* ------------------------------------------------------------------------- */
2391void
2392rxvt_term::scr_clear (bool really)
2393{
2290 if (!R->TermWin.mapped) 2394 if (!TermWin.mapped)
2291 return; 2395 return;
2396
2292 R->num_scr_allow = 0; 2397 num_scr_allow = 0;
2293 R->want_refresh = 1; 2398 want_refresh = 1;
2399
2294#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2295 if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2296 int i; 2402 {
2403 int i;
2297 2404
2298 if (!(R->Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2299 i = 0; 2406 i = 0;
2300 else 2407 else
2301 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2302 for (; i--;) 2409
2410 while (i--)
2303 if (R->TermWin.parent[i] != None) 2411 if (TermWin.parent[i] != None)
2304 XClearWindow(R->Xdisplay, R->TermWin.parent[i]); 2412 XClearWindow (display->display, TermWin.parent[i]);
2305 } 2413 }
2306#endif 2414#endif
2415
2416 if (really)
2307 XClearWindow(R->Xdisplay, R->TermWin.vt); 2417 XClearWindow (display->display, TermWin.vt);
2308} 2418}
2309 2419
2310/* ------------------------------------------------------------------------- */ 2420/* ------------------------------------------------------------------------- */
2311/* INTPROTO */
2312void 2421void
2313rxvt_scr_reverse_selection(pR) 2422rxvt_term::scr_reverse_selection ()
2314{ 2423{
2315 int i, col, row, end_row;
2316 rend_t *srp;
2317
2318 if (R->selection.op && R->current_screen == R->selection.screen) { 2424 if (selection.op && current_screen == selection.screen)
2425 {
2319 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2426 int end_row = TermWin.saveLines - TermWin.view_start;
2320 i = R->selection.beg.row + R->TermWin.saveLines; 2427 int i = selection.beg.row + TermWin.saveLines;
2321 row = R->selection.end.row + R->TermWin.saveLines; 2428 int col, row = selection.end.row + TermWin.saveLines;
2429 rend_t *srp;
2430
2322 if (i >= end_row) 2431 if (i >= end_row)
2323 col = R->selection.beg.col; 2432 col = selection.beg.col;
2324 else { 2433 else
2434 {
2325 col = 0; 2435 col = 0;
2326 i = end_row; 2436 i = end_row;
2327 } 2437 }
2438
2328 end_row += R->TermWin.nrow; 2439 end_row += TermWin.nrow;
2329 for (; i < row && i < end_row; i++, col = 0) 2440 for (; i < row && i < end_row; i++, col = 0)
2330 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2441 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2331#ifndef OPTION_HC
2332 srp[col] ^= RS_RVid; 2442 srp[col] ^= RS_RVid;
2333#else 2443
2334 srp[col] ^= RS_Blink;
2335#endif
2336 if (i == row && i < end_row) 2444 if (i == row && i < end_row)
2337 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2445 for (srp = screen.rend[i]; col < selection.end.col; col++)
2338#ifndef OPTION_HC
2339 srp[col] ^= RS_RVid; 2446 srp[col] ^= RS_RVid;
2340#else
2341 srp[col] ^= RS_Blink;
2342#endif
2343 } 2447 }
2344} 2448}
2345 2449
2346/* ------------------------------------------------------------------------- */ 2450/* ------------------------------------------------------------------------- */
2347/* 2451/*
2348 * Dump the whole scrollback and screen to the passed filedescriptor. The 2452 * Dump the whole scrollback and screen to the passed filedescriptor. The
2349 * invoking routine must close the fd. 2453 * invoking routine must close the fd.
2350 */ 2454 */
2351#if 0 2455#if 0
2352/* EXTPROTO */
2353void 2456void
2354rxvt_scr_dump(pR_ int fd) 2457rxvt_term::scr_dump (int fd)
2355{ 2458{
2356 int row, wrote; 2459 int row, wrote;
2357 unsigned int width, towrite; 2460 unsigned int width, towrite;
2358 char r1[] = "\n"; 2461 char r1[] = "\n";
2359 2462
2360 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2463 for (row = TermWin.saveLines - TermWin.nscrolled;
2361 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2464 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2465 {
2362 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2466 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2363 : R->TermWin.ncol; 2467 : TermWin.ncol;
2364 for (towrite = width; towrite; towrite -= wrote) { 2468 for (towrite = width; towrite; towrite -= wrote)
2469 {
2365 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2470 wrote = write (fd, & (screen.text[row][width - towrite]),
2366 towrite); 2471 towrite);
2367 if (wrote < 0) 2472 if (wrote < 0)
2368 return; /* XXX: death, no report */ 2473 return; /* XXX: death, no report */
2369 } 2474 }
2370 if (R->screen.tlen[row] >= 0) 2475 if (screen.tlen[row] >= 0)
2371 if (write(fd, r1, 1) <= 0) 2476 if (write (fd, r1, 1) <= 0)
2372 return; /* XXX: death, no report */ 2477 return; /* XXX: death, no report */
2373 } 2478 }
2374} 2479}
2375#endif 2480#endif
2376 2481
2377/* ------------------------------------------------------------------------- * 2482/* ------------------------------------------------------------------------- *
2378 * CHARACTER SELECTION * 2483 * CHARACTER SELECTION *
2379 * ------------------------------------------------------------------------- */ 2484 * ------------------------------------------------------------------------- */
2380 2485
2381/* 2486/*
2382 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2383 */ 2488 */
2384/* EXTPROTO */
2385void 2489void
2386rxvt_selection_check(pR_ int check_more) 2490rxvt_term::selection_check (int check_more)
2387{ 2491{
2388 row_col_t pos; 2492 row_col_t pos;
2389 2493
2390 if (!R->selection.op) 2494 if (!selection.op)
2391 return; 2495 return;
2392 2496
2393 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
2394 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2498 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2395 || (R->selection.beg.row >= R->TermWin.nrow) 2499 || (selection.beg.row >= TermWin.nrow)
2396 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2500 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2397 || (R->selection.mark.row >= R->TermWin.nrow) 2501 || (selection.mark.row >= TermWin.nrow)
2398 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2502 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2399 || (R->selection.end.row >= R->TermWin.nrow) 2503 || (selection.end.row >= TermWin.nrow)
2400 || (check_more == 1 2504 || (check_more == 1
2401 && R->current_screen == R->selection.screen 2505 && current_screen == selection.screen
2402 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2506 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2403 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2507 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2404 || (check_more == 2 2508 || (check_more == 2
2405 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2509 && ROWCOL_IS_BEFORE (selection.beg, pos)
2406 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2510 && ROWCOL_IS_AFTER (selection.end, pos))
2407 || (check_more == 3 2511 || (check_more == 3
2408 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2512 && ROWCOL_IS_AFTER (selection.end, pos))
2409 || (check_more == 4 /* screen width change */ 2513 || (check_more == 4 /* screen width change */
2410 && (R->selection.beg.row != R->selection.end.row 2514 && (selection.beg.row != selection.end.row
2411 || R->selection.end.col > R->TermWin.ncol))) 2515 || selection.end.col > TermWin.ncol)))
2412 CLEAR_SELECTION(R); 2516 CLEAR_SELECTION ();
2413} 2517}
2414 2518
2415/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2416/* 2520/*
2417 * Paste a selection direct to the command fd 2521 * Paste a selection direct to the command fd
2418 */ 2522 */
2419/* INTPROTO */
2420void 2523void
2421rxvt_PasteIt (pR_ const unsigned char *data, unsigned int nitems) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2422{ 2525{
2423 unsigned int i, j, n; 2526 unsigned int i, j, n;
2424 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2425 2528
2426 /* convert normal newline chars into common keyboard Return key sequence */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2427 for (i = 0; i < nitems; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2428 { 2531 {
2429 n = min (nitems - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2430 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2534
2431 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2432 if (ds[j] == '\n') 2536 if (ds[j] == C0_LF)
2433 ds[j] = '\r'; 2537 ds[j] = C0_CR;
2538
2434 R->tt_write (ds, (int)n); 2539 tt_write (ds, (int)n);
2435 } 2540 }
2436 2541
2437 free(ds); 2542 free (ds);
2438} 2543}
2439 2544
2440/* ------------------------------------------------------------------------- */ 2545/* ------------------------------------------------------------------------- */
2441/* 2546/*
2442 * Respond to a notification that a primary selection has been sent 2547 * Respond to a notification that a primary selection has been sent
2443 * EXT: SelectionNotify 2548 * EXT: SelectionNotify
2444 */ 2549 */
2445/* EXTPROTO */
2446int 2550int
2447rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2448{ 2552{
2449 long nread = 0; 2553 long nread = 0;
2450 unsigned long bytes_after; 2554 unsigned long bytes_after;
2451 XTextProperty ct; 2555 XTextProperty ct;
2452#ifdef MULTICHAR_SET
2453 int dummy_count;
2454 char **cl;
2455#endif
2456 2556
2457 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait));
2458
2459 if (prop == None) { /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2460#ifdef MULTICHAR_SET 2558 {
2461 if ((R->selection_type & Sel_CompoundText)) { 2559 if ((selection_type & Sel_CompoundText))
2560 {
2462 int selnum = R->selection_type & Sel_whereMask; 2561 int selnum = selection_type & Sel_whereMask;
2463 2562
2464 R->selection_type = 0; 2563 selection_type = 0;
2465 if (selnum != Sel_direct) 2564 if (selnum != Sel_direct)
2466 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2565 selection_request_other (XA_STRING, selnum);
2566 }
2567
2568 if ((selection_type & Sel_UTF8String))
2467 } 2569 {
2468#endif 2570 int selnum = selection_type & Sel_whereMask;
2571
2572 selection_type = Sel_CompoundText;
2573 if (selnum != Sel_direct)
2574 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2575 else
2576 selection_type = 0;
2577 }
2578
2469 return 0; 2579 return 0;
2470 } 2580 }
2581
2471 for (;;) { 2582 for (;;)
2583 {
2472 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2584 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2473 (long)(PROP_SIZE / 4), delete_prop, 2585 (long) (PROP_SIZE / 4), delete_prop,
2474 AnyPropertyType, &ct.encoding, &ct.format, 2586 AnyPropertyType, &ct.encoding, &ct.format,
2475 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2476 &ct.value) != Success) 2588 &ct.value) != Success)
2589 break;
2590
2591 if (ct.encoding == 0)
2592 break;
2593
2594 if (ct.encoding == xa[XA_INCR])
2595 {
2596 // INCR selection, start handshake
2597 XDeleteProperty (display->display, win, prop);
2598 selection_wait = Sel_incr;
2599 incr_ev.start (NOW + 10);
2477 break; 2600 break;
2478 if (ct.encoding == 0) {
2479 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!"));
2480 break;
2481 } 2601 }
2602
2482 if (ct.value == NULL) { 2603 if (ct.value == NULL)
2483 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2484 continue; 2604 continue;
2485 } 2605
2486 if (ct.nitems == 0) { 2606 if (ct.nitems == 0)
2487 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2607 {
2488 if (R->selection_wait == Sel_normal && nread == 0) { 2608 if (selection_wait == Sel_normal && nread == 0
2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2610 {
2489 /* 2611 /*
2490 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2491 * XConvertSelection() but nothing was presented 2613 * XConvertSelection () but nothing was presented
2492 */ 2614 */
2493 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2494 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2495 } 2616 }
2617
2496 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2497 break; 2619 break;
2498 } 2620 }
2621
2499 nread += ct.nitems; 2622 nread += ct.nitems;
2500#ifdef MULTICHAR_SET 2623
2624 char **cl;
2625 int cr;
2501 if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2502 &dummy_count) == Success && cl) { 2627 {
2503 rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); 2628 for (int i = 0; i < cr; i++)
2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2630
2504 XFreeStringList(cl); 2631 XFreeStringList (cl);
2632 }
2505 } else 2633 else
2506#endif 2634 paste (ct.value, ct.nitems);
2507 rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); 2635
2508 if (bytes_after == 0) 2636 if (bytes_after == 0)
2509 break; 2637 break;
2638
2510 XFree(ct.value); 2639 XFree (ct.value);
2511 } 2640 }
2641
2512 if (ct.value) 2642 if (ct.value)
2513 XFree(ct.value); 2643 XFree (ct.value);
2644
2514 if (R->selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2515 R->selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2516 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2647
2517 return (int)nread; 2648 return (int)nread;
2649}
2650
2651void
2652rxvt_term::incr_cb (time_watcher &w)
2653{
2654 selection_wait = Sel_none;
2655
2656 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2518} 2657}
2519 2658
2520/* 2659/*
2521 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2522 */ 2661 */
2523/* EXTPROTO */
2524void 2662void
2525rxvt_selection_property(pR_ Window win, Atom prop) 2663rxvt_term::selection_property (Window win, Atom prop)
2526{ 2664{
2527 int reget_time = 0; 2665 if (prop == None || selection_wait != Sel_incr)
2528
2529 if (prop == None)
2530 return; 2666 return;
2531 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2532 if (R->selection_wait == Sel_normal) {
2533 int a, afmt;
2534 Atom atype;
2535 unsigned long bytes_after, nitems;
2536 unsigned char *s = NULL;
2537 2667
2538 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2668 if (selection_paste (win, prop, 1) > 0)
2539 R->xa[XA_INCR], &atype, &afmt, &nitems, 2669 incr_ev.start (NOW + 10);
2540 &bytes_after, &s); 2670 else
2541 if (s) 2671 {
2542 XFree(s);
2543 if (a != Success)
2544 return;
2545#ifndef __CYGWIN32__
2546 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */
2547 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2548 XDeleteProperty(R->Xdisplay, win, prop);
2549 XFlush(R->Xdisplay);
2550 reget_time = 1;
2551 R->selection_wait = Sel_incr;
2552 }
2553#endif
2554 } else if (R->selection_wait == Sel_incr) {
2555 reget_time = 1;
2556 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2557 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2558 R->selection_wait = Sel_none; 2672 selection_wait = Sel_none;
2559 R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ 2673 incr_ev.stop ();
2560 }
2561 } 2674 }
2562 if (reget_time) { /* received more data so reget time */
2563 (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL);
2564 R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */
2565 }
2566} 2675}
2676
2567/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2568/* 2678/*
2569 * Request the current selection: 2679 * Request the current selection:
2570 * Order: > internal selection if available 2680 * Order: > internal selection if available
2571 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2681 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2572 * > CUT_BUFFER0 2682 * > CUT_BUFFER0
2573 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2683 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2574 * will auto fallback to CUT_BUFFER0 2684 * will auto fallback to CUT_BUFFER0
2575 * EXT: button 2 release 2685 * EXT: button 2 release
2576 */ 2686 */
2577/* EXTPROTO */
2578void 2687void
2579rxvt_selection_request(pR_ Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2580{ 2689{
2581 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2582 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2583 return; /* outside window */ 2691 return; /* outside window */
2584 2692
2585 if (R->selection.text != NULL) { /* internal selection */ 2693 if (selection.text)
2586 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2694 { /* internal selection */
2587 rxvt_PasteIt(aR_ R->selection.text, R->selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2696 paste ((unsigned char *)str, strlen (str));
2697 free (str);
2588 return; 2698 return;
2589 } else { 2699 }
2590 int i; 2700 else
2701 {
2702 int i;
2591 2703
2592 R->selection_request_time = tm; 2704 selection_request_time = tm;
2593 R->selection_wait = Sel_normal; 2705 selection_wait = Sel_normal;
2706
2594 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2707 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2595#ifdef MULTICHAR_SET 2708 {
2596 R->selection_type = Sel_CompoundText; 2709#if X_HAVE_UTF8_STRING
2710 selection_type = Sel_UTF8String;
2711 if (selection_request_other (xa[XA_UTF8_STRING], i))
2712 return;
2597#else 2713#else
2598 R->selection_type = 0; 2714 selection_type = Sel_CompoundText;
2599#endif 2715 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2600 if (rxvt_selection_request_other(aR_
2601#ifdef MULTICHAR_SET
2602 R->xa[XA_COMPOUND_TEXT],
2603#else
2604 XA_STRING,
2605#endif
2606 i))
2607 return; 2716 return;
2717#endif
2718
2608 } 2719 }
2609 } 2720 }
2721
2610 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2611 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2612 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2613} 2724}
2614 2725
2615/* INTPROTO */
2616int 2726int
2617rxvt_selection_request_other(pR_ Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
2618{ 2728{
2619 Atom sel; 2729 Atom sel;
2620#ifdef DEBUG_SELECT 2730#ifdef DEBUG_SELECT
2621 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2731 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2622#endif 2732#endif
2623 2733
2624 R->selection_type |= selnum; 2734 selection_type |= selnum;
2735
2625 if (selnum == Sel_Primary) 2736 if (selnum == Sel_Primary)
2626 sel = XA_PRIMARY; 2737 sel = XA_PRIMARY;
2627 else if (selnum == Sel_Secondary) 2738 else if (selnum == Sel_Secondary)
2628 sel = XA_SECONDARY; 2739 sel = XA_SECONDARY;
2629 else 2740 else
2630 sel = R->xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2742
2631 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2743 if (XGetSelectionOwner (display->display, sel) != None)
2632 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2744 {
2633 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2634 R->TermWin.vt, R->selection_request_time); 2746 TermWin.vt, selection_request_time);
2635 return 1; 2747 return 1;
2636 } 2748 }
2749
2637 return 0; 2750 return 0;
2638} 2751}
2639 2752
2640/* ------------------------------------------------------------------------- */ 2753/* ------------------------------------------------------------------------- */
2641/* 2754/*
2642 * Clear all selected text 2755 * Clear all selected text
2643 * EXT: SelectionClear 2756 * EXT: SelectionClear
2644 */ 2757 */
2645/* EXTPROTO */
2646void 2758void
2647rxvt_selection_clear(pR) 2759rxvt_term::selection_clear ()
2648{ 2760{
2649 D_SELECT((stderr, "rxvt_selection_clear()"));
2650
2651 R->want_refresh = 1; 2761 want_refresh = 1;
2652 if (R->selection.text)
2653 free(R->selection.text); 2762 free (selection.text);
2654 R->selection.text = NULL; 2763 selection.text = NULL;
2655 R->selection.len = 0; 2764 selection.len = 0;
2656 CLEAR_SELECTION(R); 2765 CLEAR_SELECTION ();
2766
2767 if (display->selection_owner == this)
2768 display->selection_owner = 0;
2657} 2769}
2658 2770
2659/* ------------------------------------------------------------------------- */ 2771/* ------------------------------------------------------------------------- */
2660/* 2772/*
2661 * Copy a selection into the cut buffer 2773 * Copy a selection into the cut buffer
2662 * EXT: button 1 or 3 release 2774 * EXT: button 1 or 3 release
2663 */ 2775 */
2664/* EXTPROTO */
2665void 2776void
2666rxvt_selection_make(pR_ Time tm) 2777rxvt_term::selection_make (Time tm)
2667{ 2778{
2668 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2669 unsigned char *new_selection_text; 2780 wchar_t *new_selection_text;
2670 char *str; 2781 text_t *t;
2671 text_t *t;
2672#ifdef ACS_ASCII
2673 rend_t *re;
2674#endif
2675 2782
2676 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks));
2677 switch (R->selection.op) { 2783 switch (selection.op)
2784 {
2678 case SELECTION_CONT: 2785 case SELECTION_CONT:
2679 break; 2786 break;
2680 case SELECTION_INIT: 2787 case SELECTION_INIT:
2681 CLEAR_SELECTION(R); 2788 CLEAR_SELECTION ();
2682 /* FALLTHROUGH */ 2789 /* FALLTHROUGH */
2683 case SELECTION_BEGIN: 2790 case SELECTION_BEGIN:
2684 R->selection.op = SELECTION_DONE; 2791 selection.op = SELECTION_DONE;
2685 /* FALLTHROUGH */ 2792 /* FALLTHROUGH */
2686 default: 2793 default:
2687 return; 2794 return;
2688 } 2795 }
2796
2689 R->selection.op = SELECTION_DONE; 2797 selection.op = SELECTION_DONE;
2690 2798
2691 if (R->selection.clicks == 4) 2799 if (selection.clicks == 4)
2692 return; /* nothing selected, go away */ 2800 return; /* nothing selected, go away */
2693 2801
2694 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2802 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2695 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2803 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2696 2804
2697 new_selection_text = (unsigned char *)str;
2698
2699 col = R->selection.beg.col; 2805 col = selection.beg.col;
2700 MAX_IT(col, 0); 2806 MAX_IT (col, 0);
2701 row = R->selection.beg.row + R->TermWin.saveLines; 2807 row = selection.beg.row + TermWin.saveLines;
2702 end_row = R->selection.end.row + R->TermWin.saveLines; 2808 end_row = selection.end.row + TermWin.saveLines;
2809 int ofs = 0;
2810 int extra = 0;
2703 2811
2704 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2705 { 2813 {
2706 t = &(R->screen.text[row][col]); 2814 t = &screen.text[row][col];
2707 2815
2708 end_col = R->screen.tlen[row]; 2816 end_col = screen.tlen[row];
2709 2817
2710 if (end_col == -1) 2818 if (end_col == -1)
2711 end_col = R->TermWin.ncol; 2819 end_col = TermWin.ncol;
2712 2820
2713 if (row == end_row) 2821 if (row == end_row)
2714 MIN_IT (end_col, R->selection.end.col); 2822 MIN_IT (end_col, selection.end.col);
2715 2823
2716 for (; col < end_col; col++) 2824 for (; col < end_col; col++)
2825 {
2717 if (*t == NOCHAR) 2826 if (*t == NOCHAR)
2718 t++; 2827 t++;
2828#if ENABLE_COMBINING
2829 else if (IS_COMPOSE (*t))
2830 {
2831 int len = rxvt_composite.expand (*t, 0);
2832
2833 extra -= (len - 1);
2834
2835 if (extra < 0)
2836 {
2837 extra += i;
2838 i += i;
2839 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2840 }
2841
2842 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2843 }
2844#endif
2719 else 2845 else
2720 { 2846 new_selection_text[ofs++] = *t++;
2721 int len = wctomb (str, *t++);
2722 if (len > 0)
2723 str += len;
2724 } 2847 }
2725 2848
2726 if (R->screen.tlen[row] != -1 && row != end_row) 2849 if (screen.tlen[row] != -1 && row != end_row)
2727 *str++ = '\n'; 2850 new_selection_text[ofs++] = C0_LF;
2728 } 2851 }
2729 2852
2730#ifndef NO_OLD_SELECTION
2731 if (R->selection_style == OLD_SELECT)
2732 if (end_col == R->TermWin.ncol)
2733 *str++ = '\n';
2734#endif
2735#ifndef NO_NEW_SELECTION
2736 if (R->selection_style != OLD_SELECT)
2737 if (end_col != R->selection.end.col) 2853 if (end_col != selection.end.col)
2738 *str++ = '\n'; 2854 new_selection_text[ofs++] = C0_LF;
2739#endif
2740 *str = '\0';
2741 2855
2742 i = str - (char *)new_selection_text; 2856 new_selection_text[ofs] = 0;
2857
2743 if (i == 0) 2858 if (ofs == 0)
2744 { 2859 {
2745 free (new_selection_text); 2860 free (new_selection_text);
2746 return; 2861 return;
2747 } 2862 }
2748 2863
2749 // due to MB_MAX_CUR, selection wastage is usually high
2750 if (str - (char *)new_selection_text > 1024)
2751 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2752
2753 R->selection.len = i;
2754 if (R->selection.text)
2755 free (R->selection.text); 2864 free (selection.text);
2756 2865
2757 R->selection.text = new_selection_text; 2866 // we usually allocate much more than necessary, so realloc it smaller again
2867 selection.len = ofs;
2868 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2758 2869
2759 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2870 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2760 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2871 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2761 rxvt_print_error("can't get primary selection"); 2872 display->set_selection_owner (this);
2873 else
2874 rxvt_warn ("can't get primary selection, ignoring.\n");
2875
2876#if 0
2877 XTextProperty ct;
2878
2879 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2880 {
2762 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2881 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2763 PropModeReplace, R->selection.text, (int)R->selection.len); 2882 PropModeReplace, ct.value, ct.nitems);
2883 XFree (ct.value);
2884 }
2885#endif
2886
2764 R->selection_time = tm; 2887 selection_time = tm;
2765 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2766} 2888}
2767 2889
2768/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2769/* 2891/*
2770 * Mark or select text based upon number of clicks: 1, 2, or 3 2892 * Mark or select text based upon number of clicks: 1, 2, or 3
2771 * EXT: button 1 press 2893 * EXT: button 1 press
2772 */ 2894 */
2773/* EXTPROTO */
2774void 2895void
2775rxvt_selection_click(pR_ int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2776{ 2897{
2777 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2778
2779 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2780 R->selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2781 2900
2782 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2902
2783 if (clicks == 2 || clicks == 3) 2903 if (clicks == 2 || clicks == 3)
2784 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 2904 selection_extend_colrow (selection.mark.col,
2785 R->selection.mark.row
2786 + R->TermWin.view_start, 2905 selection.mark.row + TermWin.view_start,
2787 0, /* button 3 */ 2906 0, /* button 3 */
2788 1, /* button press */ 2907 1, /* button press */
2789 0); /* click change */ 2908 0); /* click change */
2790} 2909}
2791 2910
2792/* ------------------------------------------------------------------------- */ 2911/* ------------------------------------------------------------------------- */
2793/* 2912/*
2794 * Mark a selection at the specified col/row 2913 * Mark a selection at the specified col/row
2795 */ 2914 */
2796/* INTPROTO */
2797void 2915void
2798rxvt_selection_start_colrow(pR_ int col, int row) 2916rxvt_term::selection_start_colrow (int col, int row)
2799{ 2917{
2800 R->want_refresh = 1; 2918 want_refresh = 1;
2801 R->selection.mark.col = col; 2919 selection.mark.col = col;
2802 R->selection.mark.row = row - R->TermWin.view_start; 2920 selection.mark.row = row - TermWin.view_start;
2921
2803 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 2922 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2804 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 2923 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2805 MAX_IT(R->selection.mark.col, 0); 2924 MAX_IT (selection.mark.col, 0);
2806 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 2925 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2807 2926
2808 if (R->selection.op) { /* clear the old selection */ 2927 while (selection.mark.col > 0
2928 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2929 --selection.mark.col;
2930
2931 if (selection.op)
2932 { /* clear the old selection */
2809 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 2933 selection.beg.row = selection.end.row = selection.mark.row;
2810 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 2934 selection.beg.col = selection.end.col = selection.mark.col;
2811 } 2935 }
2936
2812 R->selection.op = SELECTION_INIT; 2937 selection.op = SELECTION_INIT;
2813 R->selection.screen = R->current_screen; 2938 selection.screen = current_screen;
2814} 2939}
2815 2940
2816/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
2817/* 2942/*
2818 * Word select: select text for 2 clicks 2943 * Word select: select text for 2 clicks
2819 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
2820 */ 2945 */
2821 2946
2822/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2947/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2823#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
2824 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 2949 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2825#ifdef MULTICHAR_SET
2826# define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0)
2827#else
2828# define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
2829#endif
2830 2951
2831/* INTPROTO */
2832void 2952void
2833rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2834{ 2954{
2835 int col, row, dirnadd, tcol, trow, w1, w2; 2955 int col, row, dirnadd, tcol, trow, w1, w2;
2836 row_col_t bound; 2956 row_col_t bound;
2837 text_t *stp; 2957 text_t *stp;
2838 rend_t *srp; 2958 rend_t *srp;
2839 2959
2840 if (dirn == UP) { 2960 if (dirn == UP)
2961 {
2841 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 2962 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2842 bound.col = 0; 2963 bound.col = 0;
2843 dirnadd = -1; 2964 dirnadd = -1;
2844 } else { 2965 }
2966 else
2967 {
2845 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 2968 bound.row = TermWin.saveLines + TermWin.nrow;
2846 bound.col = R->TermWin.ncol - 1; 2969 bound.col = TermWin.ncol - 1;
2847 dirnadd = 1; 2970 dirnadd = 1;
2848 } 2971 }
2972
2849 row = mark->row + R->TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
2850 col = mark->col; 2974 col = mark->col;
2851 MAX_IT(col, 0); 2975 MAX_IT (col, 0);
2852/* find the edge of a word */ 2976 /* find the edge of a word */
2853 stp = &(R->screen.text[row][col]); 2977 stp = &screen.text[row][col];
2854 w1 = DELIMIT_TEXT(*stp); 2978 w1 = DELIMIT_TEXT (*stp);
2855 2979
2856 if (R->selection_style != NEW_SELECT) { 2980 srp = &screen.rend[row][col];
2857 if (w1 == 1) { 2981 w2 = DELIMIT_REND (*srp);
2982
2983 for (;;)
2984 {
2985 for (; col != bound.col; col += dirnadd)
2986 {
2858 stp += dirnadd; 2987 stp += dirnadd;
2859 if (DELIMIT_TEXT(*stp) == 1)
2860 goto Old_Word_Selection_You_Die;
2861 col += dirnadd;
2862 }
2863 w1 = 0;
2864 }
2865 srp = (&R->screen.rend[row][col]);
2866 w2 = DELIMIT_REND(*srp);
2867
2868 for (;;) {
2869 for (; col != bound.col; col += dirnadd) {
2870 stp += dirnadd; 2988 srp += dirnadd;
2989
2990 if (*stp == NOCHAR)
2991 continue;
2992
2871 if (DELIMIT_TEXT(*stp) != w1) 2993 if (DELIMIT_TEXT (*stp) != w1)
2994 break;
2995 if (DELIMIT_REND (*srp) != w2)
2996 break;
2997 }
2998
2999 if ((col == bound.col) && (row != bound.row))
3000 {
3001 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3002 {
3003 trow = row + dirnadd;
3004 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3005
3006 if (screen.text[trow] == NULL)
2872 break; 3007 break;
2873 srp += dirnadd; 3008
2874 if (DELIMIT_REND(*srp) != w2) 3009 stp = & (screen.text[trow][tcol]);
3010 srp = & (screen.rend[trow][tcol]);
3011
3012 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2875 break; 3013 break;
2876 } 3014
2877 if ((col == bound.col) && (row != bound.row)) {
2878 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2879 trow = row + dirnadd;
2880 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0;
2881 if (R->screen.text[trow] == NULL)
2882 break;
2883 stp = &(R->screen.text[trow][tcol]);
2884 srp = &(R->screen.rend[trow][tcol]);
2885 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2886 break;
2887 row = trow; 3015 row = trow;
2888 col = tcol; 3016 col = tcol;
2889 continue; 3017 continue;
2890 } 3018 }
2891 } 3019 }
2892 break; 3020 break;
2893 } 3021 }
3022
2894 Old_Word_Selection_You_Die: 3023Old_Word_Selection_You_Die:
2895 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - R->TermWin.saveLines, col));
2896
2897 if (dirn == DN) 3024 if (dirn == DN)
2898 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
2899 3026
2900/* Poke the values back in */ 3027 /* Poke the values back in */
2901 ret->row = row - R->TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
2902 ret->col = col; 3029 ret->col = col;
2903} 3030}
2904 3031
2905/* ------------------------------------------------------------------------- */ 3032/* ------------------------------------------------------------------------- */
2906/* 3033/*
2907 * Extend the selection to the specified x/y pixel location 3034 * Extend the selection to the specified x/y pixel location
2908 * EXT: button 3 press; button 1 or 3 drag 3035 * EXT: button 3 press; button 1 or 3 drag
2909 * flag == 0 ==> button 1 3036 * flag == 0 ==> button 1
2910 * flag == 1 ==> button 3 press 3037 * flag == 1 ==> button 3 press
2911 * flag == 2 ==> button 3 motion 3038 * flag == 2 ==> button 3 motion
2912 */ 3039 */
2913/* EXTPROTO */
2914void 3040void
2915rxvt_selection_extend(pR_ int x, int y, int flag) 3041rxvt_term::selection_extend (int x, int y, int flag)
2916{ 3042{
2917 int col, row; 3043 int col, row;
2918 3044
2919 col = Pixel2Col(x); 3045 col = Pixel2Col (x);
2920 row = Pixel2Row(y); 3046 row = Pixel2Row (y);
2921 MAX_IT(row, 0); 3047 MAX_IT (row, 0);
2922 MIN_IT(row, (int)R->TermWin.nrow - 1); 3048 MIN_IT (row, (int)TermWin.nrow - 1);
2923 MAX_IT(col, 0); 3049 MAX_IT (col, 0);
2924 MIN_IT(col, (int)R->TermWin.ncol); 3050 MIN_IT (col, (int)TermWin.ncol);
2925#ifndef NO_NEW_SELECTION 3051
2926/* 3052 /*
2927 * If we're selecting characters (single click) then we must check first 3053 * If we're selecting characters (single click) then we must check first
2928 * if we are at the same place as the original mark. If we are then 3054 * if we are at the same place as the original mark. If we are then
2929 * select nothing. Otherwise, if we're to the right of the mark, you have to 3055 * select nothing. Otherwise, if we're to the right of the mark, you have to
2930 * be _past_ a character for it to be selected. 3056 * be _past_ a character for it to be selected.
2931 */ 3057 */
2932 if (R->selection_style != OLD_SELECT) {
2933 if (((R->selection.clicks % 3) == 1) && !flag 3058 if (((selection.clicks % 3) == 1) && !flag
2934 && (col == R->selection.mark.col 3059 && (col == selection.mark.col
2935 && (row == R->selection.mark.row + R->TermWin.view_start))) { 3060 && (row == selection.mark.row + TermWin.view_start)))
3061 {
2936 /* select nothing */ 3062 /* select nothing */
2937 R->selection.beg.row = R->selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
2938 R->selection.beg.col = R->selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
2939 R->selection.clicks = 4; 3065 selection.clicks = 4;
2940 R->want_refresh = 1; 3066 want_refresh = 1;
2941 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4"));
2942 return; 3067 return;
2943 }
2944 } 3068 }
2945#endif 3069
2946 if (R->selection.clicks == 4) 3070 if (selection.clicks == 4)
2947 R->selection.clicks = 1; 3071 selection.clicks = 1;
3072
2948 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 3073 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2949 flag == 1 ? 1 : 0, /* ? button press */ 3074 flag == 1 ? 1 : 0, /* ? button press */
2950 0); /* no click change */ 3075 0); /* no click change */
2951} 3076}
2952 3077
2953/* ------------------------------------------------------------------------- */ 3078/* ------------------------------------------------------------------------- */
2954/* 3079/*
2955 * Extend the selection to the specified col/row 3080 * Extend the selection to the specified col/row
2956 */ 3081 */
2957/* INTPROTO */
2958void 3082void
2959rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3083rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2960{ 3084{
2961 int16_t ncol = R->TermWin.ncol; 3085 int16_t ncol = TermWin.ncol;
2962 int end_col; 3086 int end_col;
2963 row_col_t pos; 3087 row_col_t pos;
2964 enum { 3088 enum {
2965 LEFT, RIGHT 3089 LEFT, RIGHT
2966 } closeto = RIGHT; 3090 } closeto = RIGHT;
2967 3091
2968 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op));
2969 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
2970
2971 R->want_refresh = 1; 3092 want_refresh = 1;
2972 switch (R->selection.op) { 3093 switch (selection.op)
3094 {
2973 case SELECTION_INIT: 3095 case SELECTION_INIT:
2974 CLEAR_SELECTION(R); 3096 CLEAR_SELECTION ();
2975 R->selection.op = SELECTION_BEGIN; 3097 selection.op = SELECTION_BEGIN;
2976 /* FALLTHROUGH */ 3098 /* FALLTHROUGH */
2977 case SELECTION_BEGIN: 3099 case SELECTION_BEGIN:
2978 if (row != R->selection.mark.row || col != R->selection.mark.col 3100 if (row != selection.mark.row || col != selection.mark.col
2979 || (!button3 && buttonpress)) 3101 || (!button3 && buttonpress))
2980 R->selection.op = SELECTION_CONT; 3102 selection.op = SELECTION_CONT;
2981 break; 3103 break;
2982 case SELECTION_DONE: 3104 case SELECTION_DONE:
2983 R->selection.op = SELECTION_CONT; 3105 selection.op = SELECTION_CONT;
2984 /* FALLTHROUGH */ 3106 /* FALLTHROUGH */
2985 case SELECTION_CONT: 3107 case SELECTION_CONT:
2986 break; 3108 break;
2987 case SELECTION_CLEAR: 3109 case SELECTION_CLEAR:
2988 rxvt_selection_start_colrow(aR_ col, row); 3110 selection_start_colrow (col, row);
2989 /* FALLTHROUGH */ 3111 /* FALLTHROUGH */
2990 default: 3112 default:
2991 return; 3113 return;
2992 } 3114 }
2993 if (R->selection.beg.col == R->selection.end.col 3115 if (selection.beg.col == selection.end.col
2994 && R->selection.beg.col != R->selection.mark.col 3116 && selection.beg.col != selection.mark.col
2995 && R->selection.beg.row == R->selection.end.row 3117 && selection.beg.row == selection.end.row
2996 && R->selection.beg.row != R->selection.mark.row) { 3118 && selection.beg.row != selection.mark.row)
3119 {
2997 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
2998 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3121 selection.beg.row = selection.end.row = selection.mark.row;
2999 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3000 } 3122 }
3001 3123
3002 pos.col = col; 3124 pos.col = col;
3003 pos.row = row; 3125 pos.row = row;
3004 3126
3005 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3127 pos.row -= TermWin.view_start; /* adjust for scroll */
3006 3128
3007#ifndef NO_OLD_SELECTION 3129 /*
3008/* 3130 * This is mainly xterm style selection with a couple of differences, mainly
3009 * This mimics some of the selection behaviour of version 2.20 and before. 3131 * in the way button3 drag extension works.
3010 * There are no ``selection modes'', button3 is always character extension. 3132 * We're either doing: button1 drag; button3 press; or button3 drag
3011 * Note: button3 drag is always available, c.f. v2.20 3133 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3012 * Selection always terminates (left or right as appropriate) at the mark. 3134 * is always at the left/right edge of the selection.
3135 * b) button3 press: extend/contract character/word/line at whichever edge of
3136 * the selection we are closest to.
3137 * c) button3 drag : extend/contract character/word/line - we select around
3138 * a point/word/line which is either the start or end of the selection
3139 * and it was decided by whichever point/word/line was `fixed' at the
3140 * time of the most recent button3 press
3013 */ 3141 */
3014 if (R->selection_style == OLD_SELECT) { 3142 if (button3 && buttonpress)
3015 if (R->selection.clicks == 1 || button3) { 3143 { /* button3 press */
3016 if (R->hate_those_clicks) { 3144 /*
3017 R->hate_those_clicks = 0; 3145 * first determine which edge of the selection we are closest to
3018 if (R->selection.clicks == 1) { 3146 */
3147 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3148 || (!ROWCOL_IS_AFTER (pos, selection.end)
3149 && (((pos.col - selection.beg.col)
3150 + ((pos.row - selection.beg.row) * ncol))
3151 < ((selection.end.col - pos.col)
3152 + ((selection.end.row - pos.row) * ncol)))))
3153 closeto = LEFT;
3154
3155 if (closeto == LEFT)
3156 {
3157 selection.beg.row = pos.row;
3158 selection.beg.col = pos.col;
3159 selection.mark.row = selection.end.row;
3160 selection.mark.col = selection.end.col - (selection.clicks == 2);
3161 }
3162 else
3163 {
3164 selection.end.row = pos.row;
3165 selection.end.col = pos.col;
3166 selection.mark.row = selection.beg.row;
3167 selection.mark.col = selection.beg.col;
3168 }
3169 }
3170 else
3171 { /* button1 drag or button3 drag */
3172 if (ROWCOL_IS_AFTER (selection.mark, pos))
3173 {
3174 if ((selection.mark.row == selection.end.row)
3175 && (selection.mark.col == selection.end.col)
3176 && clickchange && selection.clicks == 2)
3177 selection.mark.col--;
3178
3179 selection.beg.row = pos.row;
3180 selection.beg.col = pos.col;
3181 selection.end.row = selection.mark.row;
3182 selection.end.col = selection.mark.col + (selection.clicks == 2);
3183 }
3184 else
3185 {
3019 R->selection.beg.row = R->selection.mark.row; 3186 selection.beg.row = selection.mark.row;
3187 selection.beg.col = selection.mark.col;
3188 selection.end.row = pos.row;
3189 selection.end.col = pos.col;
3190 }
3191 }
3192
3193 if (selection.clicks == 1)
3194 {
3195 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196
3197 if (end_col != -1 && selection.beg.col > end_col)
3198 {
3199#if 1
3200 selection.beg.col = ncol;
3201#else
3202 if (selection.beg.row != selection.end.row)
3203 selection.beg.col = ncol;
3204 else
3020 R->selection.beg.col = R->selection.mark.col; 3205 selection.beg.col = selection.mark.col;
3206#endif
3207 }
3208
3209 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210
3211 if (end_col != -1 && selection.end.col > end_col)
3212 selection.end.col = ncol;
3213 }
3214 else if (selection.clicks == 2)
3215 {
3216 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3217 selection.end.col--;
3218
3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3221 }
3222 else if (selection.clicks == 3)
3223 {
3224#if ENABLE_FRILLS
3225 if ((options & Opt_tripleclickwords))
3226 {
3227 int end_row;
3228
3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3231
3232 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3233 {
3234 end_col = screen.tlen[end_row + TermWin.saveLines];
3235
3236 if (end_col != -1)
3021 } else { 3237 {
3022 R->selection.mark.row = R->selection.beg.row; 3238 selection.end.row = end_row;
3023 R->selection.mark.col = R->selection.beg.col; 3239 selection.end.col = end_col;
3240 selection_remove_trailing_spaces ();
3241 break;
3024 } 3242 }
3025 } 3243 }
3026 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3027 R->selection.end.row = R->selection.mark.row;
3028 R->selection.end.col = R->selection.mark.col + 1;
3029 R->selection.beg.row = pos.row;
3030 R->selection.beg.col = pos.col;
3031 } else {
3032 R->selection.beg.row = R->selection.mark.row;
3033 R->selection.beg.col = R->selection.mark.col;
3034 R->selection.end.row = pos.row;
3035 R->selection.end.col = pos.col + 1;
3036 } 3244 }
3037 } else if (R->selection.clicks == 2) { 3245 else
3038 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3246#endif
3039 &(R->selection.beg)); 3247 {
3040 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3248 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3041 &(R->selection.end)); 3249 selection.mark.col++;
3042 R->hate_those_clicks = 1;
3043 } else if (R->selection.clicks == 3) {
3044 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3045 R->selection.beg.col = 0; 3250 selection.beg.col = 0;
3046 R->selection.end.col = ncol; 3251 selection.end.col = ncol;
3047 R->hate_those_clicks = 1;
3048 }
3049 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3050 return;
3051 }
3052#endif /* ! NO_OLD_SELECTION */
3053#ifndef NO_NEW_SELECTION
3054/* selection_style must not be OLD_SELECT to get here */
3055/*
3056 * This is mainly xterm style selection with a couple of differences, mainly
3057 * in the way button3 drag extension works.
3058 * We're either doing: button1 drag; button3 press; or button3 drag
3059 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3060 * is always at the left/right edge of the R->selection.
3061 * b) button3 press: extend/contract character/word/line at whichever edge of
3062 * the selection we are closest to.
3063 * c) button3 drag : extend/contract character/word/line - we select around
3064 * a point/word/line which is either the start or end of the selection
3065 * and it was decided by whichever point/word/line was `fixed' at the
3066 * time of the most recent button3 press
3067 */
3068 if (button3 && buttonpress) { /* button3 press */
3069 /* 3252 }
3070 * first determine which edge of the selection we are closest to 3253 }
3071 */ 3254
3072 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3255 if (button3 && buttonpress)
3073 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3256 { /* mark may need to be changed */
3074 && (((pos.col - R->selection.beg.col)
3075 + ((pos.row - R->selection.beg.row) * ncol))
3076 < ((R->selection.end.col - pos.col)
3077 + ((R->selection.end.row - pos.row) * ncol)))))
3078 closeto = LEFT;
3079 if (closeto == LEFT) { 3257 if (closeto == LEFT)
3080 R->selection.beg.row = pos.row; 3258 {
3081 R->selection.beg.col = pos.col;
3082 R->selection.mark.row = R->selection.end.row; 3259 selection.mark.row = selection.end.row;
3083 R->selection.mark.col = R->selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3084 - (R->selection.clicks == 2); 3261 }
3085 } else { 3262 else
3086 R->selection.end.row = pos.row; 3263 {
3087 R->selection.end.col = pos.col;
3088 R->selection.mark.row = R->selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3089 R->selection.mark.col = R->selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3090 }
3091 } else { /* button1 drag or button3 drag */
3092 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) {
3093 if ((R->selection.mark.row == R->selection.end.row)
3094 && (R->selection.mark.col == R->selection.end.col)
3095 && clickchange && R->selection.clicks == 2)
3096 R->selection.mark.col--;
3097 R->selection.beg.row = pos.row;
3098 R->selection.beg.col = pos.col;
3099 R->selection.end.row = R->selection.mark.row;
3100 R->selection.end.col = R->selection.mark.col
3101 + (R->selection.clicks == 2);
3102 } else {
3103 R->selection.beg.row = R->selection.mark.row;
3104 R->selection.beg.col = R->selection.mark.col;
3105 R->selection.end.row = pos.row;
3106 R->selection.end.col = pos.col;
3107 }
3108 }
3109
3110 if (R->selection.clicks == 1) {
3111 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines];
3112 if (end_col != -1 && R->selection.beg.col > end_col) {
3113#if 1
3114 R->selection.beg.col = ncol;
3115#else
3116 if (R->selection.beg.row != R->selection.end.row)
3117 R->selection.beg.col = ncol;
3118 else
3119 R->selection.beg.col = R->selection.mark.col;
3120#endif
3121 }
3122 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines];
3123 if (end_col != -1 && R->selection.end.col > end_col)
3124 R->selection.end.col = ncol;
3125
3126 } else if (R->selection.clicks == 2) {
3127 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg))
3128 R->selection.end.col--;
3129 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3130 &(R->selection.beg));
3131 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end),
3132 &(R->selection.end));
3133 } else if (R->selection.clicks == 3) {
3134#ifndef NO_FRILLS
3135 if ((R->Options & Opt_tripleclickwords)) {
3136 int end_row;
3137
3138 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3139 &(R->selection.beg));
3140 end_row = R->screen.tlen[R->selection.mark.row
3141 + R->TermWin.saveLines];
3142 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow;
3143 end_row++) {
3144 end_col = R->screen.tlen[end_row + R->TermWin.saveLines];
3145 if (end_col != -1) {
3146 R->selection.end.row = end_row;
3147 R->selection.end.col = end_col;
3148 rxvt_selection_remove_trailing_spaces(aR);
3149 break;
3150 }
3151 }
3152 } else
3153#endif
3154 { 3266 }
3155 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg))
3156 R->selection.mark.col++;
3157 R->selection.beg.col = 0;
3158 R->selection.end.col = ncol;
3159 }
3160 } 3267 }
3161 if (button3 && buttonpress) { /* mark may need to be changed */
3162 if (closeto == LEFT) {
3163 R->selection.mark.row = R->selection.end.row;
3164 R->selection.mark.col = R->selection.end.col
3165 - (R->selection.clicks == 2);
3166 } else {
3167 R->selection.mark.row = R->selection.beg.row;
3168 R->selection.mark.col = R->selection.beg.col;
3169 }
3170 }
3171 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3172#endif /* ! NO_NEW_SELECTION */
3173} 3268}
3174 3269
3175#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3176/* INTPROTO */
3177void 3271void
3178rxvt_selection_remove_trailing_spaces(pR) 3272rxvt_term::selection_remove_trailing_spaces ()
3179{ 3273{
3180 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3181 text_t *stp; 3275 text_t *stp;
3182 3276
3183 end_col = R->selection.end.col; 3277 end_col = selection.end.col;
3184 end_row = R->selection.end.row; 3278 end_row = selection.end.row;
3185 for ( ; end_row >= R->selection.beg.row; ) { 3279 for ( ; end_row >= selection.beg.row; )
3280 {
3186 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3281 stp = screen.text[end_row + TermWin.saveLines];
3187 while (--end_col >= 0) { 3282 while (--end_col >= 0)
3283 {
3188 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3284 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3189 break;
3190 }
3191 if (end_col >= 0
3192 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) {
3193 R->selection.end.col = end_col + 1;
3194 R->selection.end.row = end_row;
3195 break; 3285 break;
3196 } 3286 }
3287 if (end_col >= 0
3288 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3289 {
3290 selection.end.col = end_col + 1;
3291 selection.end.row = end_row;
3292 break;
3293 }
3197 end_row--; 3294 end_row--;
3198 end_col = R->TermWin.ncol; 3295 end_col = TermWin.ncol;
3199 } 3296 }
3200 if (R->selection.mark.row > R->selection.end.row) { 3297 if (selection.mark.row > selection.end.row)
3298 {
3201 R->selection.mark.row = R->selection.end.row; 3299 selection.mark.row = selection.end.row;
3202 R->selection.mark.col = R->selection.end.col; 3300 selection.mark.col = selection.end.col;
3301 }
3203 } else if (R->selection.mark.row == R->selection.end.row 3302 else if (selection.mark.row == selection.end.row
3204 && R->selection.mark.col > R->selection.end.col) 3303 && selection.mark.col > selection.end.col)
3205 R->selection.mark.col = R->selection.end.col; 3304 selection.mark.col = selection.end.col;
3206} 3305}
3207#endif 3306#endif
3208 3307
3209/* ------------------------------------------------------------------------- */ 3308/* ------------------------------------------------------------------------- */
3210/* 3309/*
3211 * Double click on button 3 when already selected 3310 * Double click on button 3 when already selected
3212 * EXT: button 3 double click 3311 * EXT: button 3 double click
3213 */ 3312 */
3214/* EXTPROTO */
3215void 3313void
3216rxvt_selection_rotate(pR_ int x, int y) 3314rxvt_term::selection_rotate (int x, int y)
3217{ 3315{
3218 R->selection.clicks = R->selection.clicks % 3 + 1; 3316 selection.clicks = selection.clicks % 3 + 1;
3219 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3317 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3220} 3318}
3221 3319
3222/* ------------------------------------------------------------------------- */ 3320/* ------------------------------------------------------------------------- */
3223/* 3321/*
3224 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3322 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3225 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3323 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3226 * the X11 protocol. 3324 * the X11 protocol.
3227 */ 3325 */
3228typedef CARD32 Atom32; 3326typedef CARD32 Atom32;
3229 3327
3230/* ------------------------------------------------------------------------- */ 3328/* ------------------------------------------------------------------------- */
3231/* 3329/*
3232 * Respond to a request for our current selection 3330 * Respond to a request for our current selection
3233 * EXT: SelectionRequest 3331 * EXT: SelectionRequest
3234 */ 3332 */
3235/* EXTPROTO */
3236void 3333void
3237rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3334rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3238{ 3335{
3239 XSelectionEvent ev; 3336 XSelectionEvent ev;
3240#ifdef USE_XIM
3241 Atom32 target_list[4];
3242#else
3243 Atom32 target_list[3];
3244#endif
3245 Atom target;
3246 XTextProperty ct; 3337 XTextProperty ct;
3247 XICCEncodingStyle style; 3338 XICCEncodingStyle style;
3248 char *cl[2], dummy[1]; 3339 Atom target;
3249 3340
3250 ev.type = SelectionNotify; 3341 ev.type = SelectionNotify;
3251 ev.property = None; 3342 ev.property = None;
3252 ev.display = rq->display; 3343 ev.display = rq.display;
3253 ev.requestor = rq->requestor; 3344 ev.requestor = rq.requestor;
3254 ev.selection = rq->selection; 3345 ev.selection = rq.selection;
3255 ev.target = rq->target; 3346 ev.target = rq.target;
3256 ev.time = rq->time; 3347 ev.time = rq.time;
3257 3348
3258 if (rq->target == R->xa[XA_TARGETS]) { 3349 if (rq.target == xa[XA_TARGETS])
3350 {
3351 Atom32 target_list[6];
3352 Atom32 *target = target_list;
3353
3259 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3354 *target++ = (Atom32) xa[XA_TARGETS];
3355 *target++ = (Atom32) xa[XA_TIMESTAMP];
3260 target_list[1] = (Atom32) XA_STRING; 3356 *target++ = (Atom32) XA_STRING;
3261 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3357 *target++ = (Atom32) xa[XA_TEXT];
3262#ifdef USE_XIM
3263 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3358 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3359#if X_HAVE_UTF8_STRING
3360 *target++ = (Atom32) xa[XA_UTF8_STRING];
3264#endif 3361#endif
3362
3265 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3363 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3266 (8 * sizeof(target_list[0])), PropModeReplace, 3364 (8 * sizeof (target_list[0])), PropModeReplace,
3267 (unsigned char *)target_list, 3365 (unsigned char *)target_list,
3268 (sizeof(target_list) / sizeof(target_list[0]))); 3366 target - target_list);
3269 ev.property = rq->property; 3367 ev.property = rq.property;
3368 }
3369#if TODO // TODO
3270 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3370 else if (rq.target == xa[XA_MULTIPLE])
3371 {
3271 /* TODO: Handle MULTIPLE */ 3372 /* TODO: Handle MULTIPLE */
3373 }
3374#endif
3272 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3376 {
3273 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3274 (8 * sizeof(Time)), PropModeReplace, 3378 (8 * sizeof (Time)), PropModeReplace,
3275 (unsigned char *)&R->selection_time, 1); 3379 (unsigned char *)&selection_time, 1);
3276 ev.property = rq->property; 3380 ev.property = rq.property;
3381 }
3277 } else if (rq->target == XA_STRING 3382 else if (rq.target == XA_STRING
3383 || rq.target == xa[XA_TEXT]
3278 || rq->target == R->xa[XA_COMPOUND_TEXT] 3384 || rq.target == xa[XA_COMPOUND_TEXT]
3279 || rq->target == R->xa[XA_TEXT]) { 3385 || rq.target == xa[XA_UTF8_STRING]
3280#ifdef USE_XIM 3386 )
3387 {
3281 short freect = 0; 3388 short freect = 0;
3282#endif 3389 int selectlen;
3283 int selectlen; 3390 wchar_t *cl;
3284 3391
3285#ifdef USE_XIM 3392 target = rq.target;
3393
3286 if (rq->target != XA_STRING) { 3394 if (target == XA_STRING)
3395 // we actually don't do XA_STRING, but who cares, as i18n clients
3396 // will ask for another format anyways.
3397 style = XStringStyle;
3398 else if (target == xa[XA_TEXT])
3399 style = XStdICCTextStyle;
3400 else if (target == xa[XA_COMPOUND_TEXT])
3401 style = XCompoundTextStyle;
3402#if X_HAVE_UTF8_STRING
3403 else if (target == xa[XA_UTF8_STRING])
3404 style = XUTF8StringStyle;
3405#endif
3406 else
3407 {
3287 target = R->xa[XA_COMPOUND_TEXT]; 3408 target = xa[XA_COMPOUND_TEXT];
3288 style = (rq->target == R->xa[XA_COMPOUND_TEXT]) 3409 style = XCompoundTextStyle;
3289 ? XCompoundTextStyle : XStdICCTextStyle;
3290 } else
3291#endif
3292 { 3410 }
3293 target = XA_STRING; 3411
3294 style = XStringStyle; 3412 if (selection.text)
3295 } 3413 {
3296 if (R->selection.text) {
3297 cl[0] = (char *)R->selection.text; 3414 cl = selection.text;
3298 selectlen = R->selection.len; 3415 selectlen = selection.len;
3416 }
3299 } else { 3417 else
3300 cl[0] = dummy; 3418 {
3301 *dummy = '\0'; 3419 cl = L"";
3302 selectlen = 0; 3420 selectlen = 0;
3303 } 3421 }
3304#ifdef USE_XIM 3422
3423 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3424 // manually for XUTF8StringStyle.
3305 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3425 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3306 == Success) /* if we failed to convert then send it raw */
3307 freect = 1; 3426 freect = 1;
3308 else 3427 else
3309#endif
3310 { 3428 {
3429 /* if we failed to convert then send it raw */
3311 ct.value = (unsigned char *)cl[0]; 3430 ct.value = (unsigned char *)cl;
3312 ct.nitems = selectlen; 3431 ct.nitems = selectlen;
3313 } 3432 }
3433
3314 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3434 XChangeProperty (display->display, rq.requestor, rq.property,
3315 target, 8, PropModeReplace, 3435 target, 8, PropModeReplace,
3316 ct.value, (int)ct.nitems); 3436 ct.value, (int)ct.nitems);
3317 ev.property = rq->property; 3437 ev.property = rq.property;
3318#ifdef USE_XIM 3438
3319 if (freect) 3439 if (freect)
3320 XFree(ct.value); 3440 XFree (ct.value);
3321#endif
3322 } 3441 }
3442
3323 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3443 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3324} 3444}
3325 3445
3326/* ------------------------------------------------------------------------- * 3446/* ------------------------------------------------------------------------- *
3327 * MOUSE ROUTINES * 3447 * MOUSE ROUTINES *
3328 * ------------------------------------------------------------------------- */ 3448 * ------------------------------------------------------------------------- */
3329 3449
3330/* 3450/*
3331 * return col/row values corresponding to x/y pixel values 3451 * return col/row values corresponding to x/y pixel values
3332 */ 3452 */
3333/* EXTPROTO */
3334void 3453void
3335rxvt_pixel_position(pR_ int *x, int *y) 3454rxvt_term::pixel_position (int *x, int *y)
3336{ 3455{
3337 *x = Pixel2Col(*x); 3456 *x = Pixel2Col (*x);
3338/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3457 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3339 *y = Pixel2Row(*y); 3458 *y = Pixel2Row (*y);
3340/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3459 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3341} 3460}
3461
3342/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3343#ifdef USE_XIM 3463#ifdef USE_XIM
3344/* EXTPROTO */
3345void 3464void
3346rxvt_setPosition(pR_ XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3347{ 3466{
3348 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3349 3468
3350 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3351 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3470
3352 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3353 - R->TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3354} 3473}
3355#endif 3474#endif
3356/* ------------------------------------------------------------------------- */ 3475
3357 3476#if ENABLE_OVERLAY
3477void
3478rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3479{
3480 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3481 return;
3482
3483 want_refresh = 1;
3484
3485 scr_overlay_off ();
3486
3487 if (x < 0) x = TermWin.ncol - w;
3488 if (y < 0) y = TermWin.nrow - h;
3489
3490 // make space for border
3491 w += 2; MIN_IT (w, TermWin.ncol);
3492 h += 2; MIN_IT (h, TermWin.nrow);
3493
3494 x -= 1; MAX_IT (x, 0);
3495 y -= 1; MAX_IT (y, 0);
3496
3497 MIN_IT (x, TermWin.ncol - w);
3498 MIN_IT (y, TermWin.nrow - h);
3499
3500 ov_x = x; ov_y = y;
3501 ov_w = w; ov_h = h;
3502
3503 ov_text = new text_t *[h];
3504 ov_rend = new rend_t *[h];
3505
3506 for (y = 0; y < h; y++)
3507 {
3508 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w];
3510
3511 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);
3513
3514 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3518 else
3519 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3520
3521 *tp++ = t0;
3522 *rp++ = r;
3523
3524 for (x = w - 2; x > 0; --x)
3525 {
3526 *tp++ = t1;
3527 *rp++ = r;
3528 }
3529
3530 *tp = t2;
3531 *rp = r;
3532 }
3533}
3534
3535void
3536rxvt_term::scr_overlay_off ()
3537{
3538 if (!ov_text)
3539 return;
3540
3541 want_refresh = 1;
3542
3543 for (int y = 0; y < ov_h; y++)
3544 {
3545 delete [] ov_text[y];
3546 delete [] ov_rend[y];
3547 }
3548
3549 delete [] ov_text; ov_text = 0;
3550 delete [] ov_rend; ov_rend = 0;
3551}
3552
3553void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h)
3557 return;
3558
3559 x++, y++;
3560
3561 ov_text[y][x] = text;
3562 ov_rend[y][x] = rend;
3563}
3564
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_term::scr_swap_overlay ()
3574{
3575 if (!ov_text)
3576 return;
3577
3578 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3579
3580 // swap screen mem with overlay
3581 for (int y = ov_h; y--; )
3582 {
3583 text_t *t1 = ov_text[y];
3584 rend_t *r1 = ov_rend[y];
3585
3586 text_t *t2 = screen.text[y + row_offset] + ov_x;
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588
3589 for (int x = ov_w; x--; )
3590 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));
3593 }
3594 }
3595}
3596
3597#endif
3358/* ------------------------------------------------------------------------- * 3598/* ------------------------------------------------------------------------- */
3359 * DEBUG ROUTINES *
3360 * ------------------------------------------------------------------------- */
3361#if 0
3362/* INTPROTO */
3363void
3364rxvt_debug_colors(void)
3365{
3366 int color;
3367 const char *name[] = {
3368 "fg", "bg",
3369 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3370 };
3371
3372 fprintf(stderr, "Color ( ");
3373 if (R->rstyle & RS_RVid)
3374 fprintf(stderr, "rvid ");
3375 if (R->rstyle & RS_Bold)
3376 fprintf(stderr, "bold ");
3377 if (R->rstyle & RS_Blink)
3378 fprintf(stderr, "blink ");
3379 if (R->rstyle & RS_Uline)
3380 fprintf(stderr, "uline ");
3381 fprintf(stderr, "): ");
3382
3383 color = GET_FGCOLOR(R->rstyle);
3384#ifndef NO_BRIGHTCOLOR
3385 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3386 color -= (minBrightCOLOR - minCOLOR);
3387 fprintf(stderr, "bright ");
3388 }
3389#endif
3390 fprintf(stderr, "%s on ", name[color]);
3391
3392 color = GET_BGCOLOR(R->rstyle);
3393#ifndef NO_BRIGHTCOLOR
3394 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3395 color -= (minBrightCOLOR - minCOLOR);
3396 fprintf(stderr, "bright ");
3397 }
3398#endif
3399 fprintf(stderr, "%s\n", name[color]);
3400}
3401#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines