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

Diff Legend

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