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

Diff Legend

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