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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC

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

Diff Legend

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