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.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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