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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.37 by pcg, Tue Feb 24 23:58:13 2004 UTC

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

Diff Legend

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