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

Diff Legend

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