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

Diff Legend

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