ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.78 by root, Fri Jul 30 18:35:11 2004 UTC

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

Diff Legend

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