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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.8 by pcg, Wed Dec 17 09:00:35 2003 UTC

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

Diff Legend

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