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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.37 by pcg, Tue Feb 24 23:58:13 2004 UTC

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

Diff Legend

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