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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC

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

Diff Legend

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