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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
83 XK_Right, 0x2192, 84 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193, 86 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90 89
91 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
92 XK_Next, 0x21df, 91 XK_Next, 0x21df,
93 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
109 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
110 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
111 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
114 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
117 XK_Break, 0x238a, 119 XK_Break, 0x238a,
118 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
121 124
122 XK_space, 0x2423, 125 XK_space, 0x2423,
123 126
124#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
130 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
131#endif 134#endif
132 0, 135 0,
133}; 136};
134 137
135void 138void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
137{ 140{
138 x = Pixel2Col (x); 141 x = Pixel2Col (x);
139 y = Pixel2Row (y); 142 y = Pixel2Row (y);
140 143
… …
148 151
149 text_t t = l.t[x]; 152 text_t t = l.t[x];
150 153
151 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
152 { 155 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
155 break; 158 break;
156 } 159 }
157 160
158 x--; 161 x--;
159 } 162 }
160} 163}
161 164
162void 165void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 167{
165 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 170 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 171
172# if ENABLE_COMBINING 172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
174 { 174 {
175 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
176 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
178 } 178 }
179 else 179 else
180# endif 180# endif
… …
183 183
184 alloc = 0; 184 alloc = 0;
185 chr = &ch2; 185 chr = &ch2;
186 len = 1; 186 len = 1;
187 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 191
189 char attr[80]; // plenty 192 char attr[80]; // plenty
190 193
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 195 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
200 203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
202 212
203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
205 214
206 if (y >= 0) 215 if (y >= 0)
207 { 216 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 218 x = 0;
210 } 219 }
211 220
212 scr_overlay_new (x, y, width, len + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
213 224
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 226
216 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
217 { 228 {
218 char buf[9]; 229 char buf[9];
219 230
220 ch = *chr++; 231 ch = *chr++;
221 232
222 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 236# if !UNICODE_3
226 if (ch >= 0x10000) 237 if (ch >= 0x10000)
227 ch = 0xfffd; 238 ch = 0xfffd;
228# endif 239# endif
229 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
230 241
231 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 244 }
234 245
235// { 246// {
236// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
239// } 250// }
240 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
241 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 255 free (fname[i]);
256 }
244 257
245# if ENABLE_COMBINING 258# if ENABLE_COMBINING
246 if (alloc) 259 if (alloc)
247 delete [] alloc; 260 delete [] alloc;
248# endif 261# endif
249} 262}
250#endif 263#endif
251 264
252void 265void ecb_cold
253rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
254{ 267{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 269
260 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
261 { 271 {
262 char mb[16]; 272 char mb[MB_LEN_MAX];
263 int len; 273 int len;
264 274
265 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
268 else 278 else
269 { 279 {
270 mb[0] = ch[0]; 280 mb[0] = ch;
271 len = 1; 281 len = 1;
272 } 282 }
273 283
274 if (len > 0) 284 if (len > 0)
275 tt_write (mb, len); 285 tt_write (mb, len);
… …
278 } 288 }
279 289
280 iso14755buf = 0; 290 iso14755buf = 0;
281} 291}
282 292
283int 293static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
285{ 295{
286 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
289 { 299 {
290 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
291 301
… …
297 307
298 return -1; 308 return -1;
299} 309}
300#endif 310#endif
301 311
302void 312static inline KeySym ecb_cold
313translate_keypad (KeySym keysym, bool kp)
314{
315#ifdef XK_KP_Home
316 static const KeySym keypadtrans[] = {
317 XK_KP_7, // XK_KP_Home
318 XK_KP_4, // XK_KP_Left
319 XK_KP_8, // XK_KP_Up
320 XK_KP_6, // XK_KP_Right
321 XK_KP_2, // XK_KP_Down
322 XK_KP_9, // XK_KP_Prior
323 XK_KP_3, // XK_KP_Next
324 XK_KP_1, // XK_KP_End
325 XK_KP_5, // XK_KP_Begin
326 };
327
328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
329 {
330 unsigned int index = keysym - XK_KP_Home;
331 keysym = kp ? keypadtrans[index] : XK_Home + index;
332 }
333 else if (keysym == XK_KP_Insert)
334 keysym = kp ? XK_KP_0 : XK_Insert;
335# ifndef NO_DELETE_KEY
336 else if (keysym == XK_KP_Delete)
337 keysym = kp ? XK_KP_Decimal : XK_Delete;
338# endif
339#endif
340 return keysym;
341}
342
343static inline int ecb_cold
344map_function_key (KeySym keysym)
345{
346 int param = 0;
347
348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
349 {
350 param = 11 + keysym - XK_F1;
351 if (keysym >= XK_F17)
352 param += 4;
353 else if (keysym >= XK_F15)
354 param += 3;
355 else if (keysym >= XK_F11)
356 param += 2;
357 else if (keysym >= XK_F6)
358 param += 1;
359 }
360 else
361 switch (keysym)
362 {
363 case XK_Find:
364 param = 1;
365 break;
366 case XK_Insert:
367 param = 2;
368 break;
369#ifdef DXK_Remove
370 case DXK_Remove:
371#endif
372 case XK_Execute:
373 param = 3;
374 break;
375 case XK_Select:
376 param = 4;
377 break;
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390 case XK_Help:
391 param = 28;
392 break;
393 case XK_Menu:
394 param = 29;
395 break;
396 }
397 return param;
398}
399
400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
409void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
304{ 411{
305 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
306 unsigned int newlen; 413 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
310 416
311#if ISO_14755 417#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
313 return; 419 return;
314#endif 420#endif
… …
321 */ 427 */
322 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
325 431
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 432 kbuf[0] = 0;
333 433
334#ifdef USE_XIM 434#if USE_XIM
335 if (Input_Context) 435 if (Input_Context)
336 { 436 {
337 Status status_return; 437 Status status_return;
338 438
339#if 0 439#if 0
… …
377 } 477 }
378 } 478 }
379 else 479 else
380 len = 0; 480 len = 0;
381 } 481 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 482 }
386 else 483 else
387#endif 484#endif
388 { 485 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
391 } 490 {
491 KeySym orig_keysym = keysym;
392 492
393 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
394 { 706 {
395#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 709 return;
398#endif 710#endif
399 711
400 if (saveLines) 712 if (saveLines)
401 { 713 {
… …
410#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 724#else
413 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
414#endif 726#endif
727 max_it (lnsppg, 1);
728
415 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
416 { 730 {
417 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
418 return; 732 return;
419 } 733 }
420 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
421 { 735 {
422 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
423 return; 737 return;
424 } 738 }
425 } 739 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
428 { 742 {
429 if (keysym == XK_Up) 743 if (keysym == XK_Up)
430 { 744 {
431 scr_page (UP, 1); 745 scr_page (1);
432 return; 746 return;
433 } 747 }
434 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
435 { 749 {
436 scr_page (DN, 1); 750 scr_page (-1);
437 return; 751 return;
438 } 752 }
439 } 753 }
440#endif 754#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
443 { 757 {
444 if (keysym == XK_Home) 758 if (keysym == XK_Home)
445 { 759 {
446 scr_move_to (0, 1); 760 scr_changeview (top_row);
447 return; 761 return;
448 } 762 }
449 else if (keysym == XK_End) 763 else if (keysym == XK_End)
450 { 764 {
451 scr_move_to (1, 1); 765 scr_changeview (0);
452 return; 766 return;
453 } 767 }
454 } 768 }
455#endif 769#endif
456 } 770 }
457 771
458 if (shft) 772 if (shft)
459 { 773 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 775 {
468 switch (keysym) 776 switch (keysym)
469 { 777 {
470 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 780 selection_request (ev.time);
473 return; 781 return;
474#if TODO 782#if TODO
475 /* rxvt extras */ 783 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 785 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 787 return;
482#endif 788#endif
483 } 789 }
484 } 790 }
485 } 791 }
486 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
487#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 809 // ISO 14755 support
489 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 811 {
491 int hv; 812 int hv;
492 813
493 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 845 scr_overlay_off ();
525# endif 846# endif
526 iso14755buf = 0; 847 iso14755buf = 0;
527 } 848 }
528 } 849 }
850 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
532 { 854 {
533 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 856# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 865 {
544 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
545 return; 867 return;
546 } 868 }
547#endif 869#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 }
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0)
800 kbuf[len - 1] |= 0x80;
801#endif
802
803 }
804 else if (ctrl && keysym == XK_minus)
805 {
806 len = 1;
807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
814 else
815 {
816#ifdef META8_OPTION
817 /* set 8-bit on */
818 if (meta && (meta_char == 0x80))
819 {
820 char *ch;
821
822 for (ch = kbuf; ch < kbuf + len; ch++)
823 *ch |= 0x80;
824
825 meta = 0;
826 }
827#endif
828 /* nil */ ;
829 }
830 } 870 }
831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834 871
835 if (len <= 0) 872 if (len <= 0)
836 return; /* not mapped */ 873 return; /* not mapped */
837 874
838 if (option (Opt_scrollTtyKeypress))
839 if (view_start)
840 {
841 view_start = 0;
842 want_refresh = 1;
843 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
871} 876}
872 877
873void 878void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
875{ 880{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 882 KeySym keysym;
878 883
… …
898 commit_iso14755 (); 903 commit_iso14755 ();
899 904
900 return; 905 return;
901 } 906 }
902 907
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 909 if (i[0] == keysym)
905 { 910 {
906 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 912 commit_iso14755 ();
908 913
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
947#endif 952#endif
948} 953}
949 954
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 955void
984rxvt_term::flush () 956rxvt_term::flush ()
985{ 957{
986 flush_ev.stop (); 958 flush_ev.stop ();
987 959
988#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
990 { 962 {
991// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 964 scr_touch (false);
993 } 965 }
994#endif 966#endif
995 967
996 if (want_refresh) 968 if (want_refresh)
… …
1032 } 1004 }
1033 while (row < end_row); 1005 while (row < end_row);
1034 } 1006 }
1035 1007
1036 scr_refresh (); 1008 scr_refresh ();
1037 scrollbar_show (1); 1009 scrollBar.show (1);
1038#ifdef USE_XIM 1010#if USE_XIM
1039 IMSendSpot (); 1011 im_send_spot ();
1040#endif 1012#endif
1041 } 1013 }
1042 1014
1043 display->flush (); 1015 display->flush ();
1044} 1016}
1045 1017
1046/* checks wether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1047void 1019void
1048rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1049{ 1021{
1050 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1052 1024
1053 display->flush (); 1025 display->flush ();
1054} 1026}
1055 1027
1056void 1028void
… …
1061 refresh_count = 0; 1033 refresh_count = 0;
1062 flush (); 1034 flush ();
1063} 1035}
1064 1036
1065#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (!focus)
1042 return;
1043
1044 if (hidden_cursor)
1045 {
1046 hidden_cursor = 0;
1047 want_refresh = 1;
1048 }
1049
1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1051 cursor_blink_ev.again ();
1052 else
1053 cursor_blink_ev.stop ();
1054}
1055
1066void 1056void
1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1068{ 1058{
1069 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1070 want_refresh = 1; 1060 want_refresh = 1;
… …
1078{ 1068{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1070 {
1081 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
1082 want_refresh = 1; 1072 want_refresh = 1;
1083 refresh_check (); 1073 refresh_check ();
1084 } 1074 }
1085 else 1075 else
1086 w.stop (); 1076 w.stop ();
1087} 1077}
1088#endif 1078#endif
1089 1079
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1081void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1083{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1096 { 1086 {
1097 want_refresh = 1; 1087 want_refresh = 1;
1098 refresh_check (); 1088 refresh_check ();
1099 } 1089 }
1100 else 1090 else
… …
1104 1094
1105#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1106void 1096void
1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1108{ 1098{
1109 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1110 { 1100 {
1111 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1112 want_refresh = 1; 1102 want_refresh = 1;
1113 refresh_check (); 1103 refresh_check ();
1114 } 1104 }
… …
1119 1109
1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1121void 1111void
1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1123{ 1113{
1124 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1125 { 1115 {
1126 want_refresh = 1; 1116 want_refresh = 1;
1127 refresh_check (); 1117 refresh_check ();
1128 } 1118 }
1129 1119
… …
1144 { 1134 {
1145 // this should really be sched_yield(), but the linux guys thought 1135 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1136 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is 1137 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS. 1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1149 1142
1150 struct timespec ts = { 0, 0 }; 1143 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1144 nanosleep (&ts, 0);
1152 1145
1153 w.stop (); 1146 w.stop ();
1154 } 1147 }
1155 1148
… …
1158 { 1151 {
1159 } 1152 }
1160} event_handler; 1153} event_handler;
1161#endif 1154#endif
1162 1155
1156/* make sure all the cmd data is at beginning of cmdbuf */
1157void
1158rxvt_term::cmdbuf_reify ()
1159{
1160 if (cmdbuf_ptr == cmdbuf_base)
1161 return;
1162
1163 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, used);
1166 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + used;
1168
1169}
1170
1171#if defined (KEYSYM_RESOURCE)
1172void
1173rxvt_term::cmdbuf_append (const char *str, size_t count)
1174{
1175 cmdbuf_reify ();
1176
1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (count > avail)
1180 return;
1181
1182 memcpy (cmdbuf_endp, str, count);
1183 cmdbuf_endp += count;
1184
1185 cmd_parse ();
1186}
1187#endif
1188
1163bool 1189bool
1164rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1165{ 1191{
1166 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1167 1193
1168 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1169 { 1195
1170 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1171 n = 0;
1172 } 1197 {
1173 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
1175 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1176 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1177 1203
1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1179 1205
1180 if (r > 0) 1206 if (r > 0)
1181 { 1207 {
1182 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1183 return true; 1209 return true;
… …
1205{ 1231{
1206 make_current (); 1232 make_current ();
1207 1233
1208 if (revents & ev::READ) 1234 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1237 cmd_parse ();
1212 break;
1213 1238
1214 if (revents & ev::WRITE) 1239 if (revents & ev::WRITE)
1215 pty_write (); 1240 pty_write ();
1216 1241
1217 refresh_check (); 1242 refresh_check ();
1218} 1243}
1219 1244
1220void 1245void ecb_cold
1221rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1222{ 1247{
1223 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1224 recolour_cursor (); 1249 recolor_cursor ();
1225 1250
1226#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1227 hidden_pointer = 0; 1252 hidden_pointer = 0;
1228 1253
1229 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1230 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1231#endif 1256#endif
1232} 1257}
1233 1258
1234#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1235void 1260void ecb_cold
1236rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1237{ 1262{
1238 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1239 return; 1264 return;
1240 1265
… …
1242 XFlush (dpy); 1267 XFlush (dpy);
1243 1268
1244 hidden_pointer = 1; 1269 hidden_pointer = 1;
1245} 1270}
1246 1271
1247void 1272void ecb_cold
1248rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1249{ 1274{
1250 make_current (); 1275 make_current ();
1251 1276
1252 pointer_blank (); 1277 pointer_blank ();
… …
1254#endif 1279#endif
1255 1280
1256void 1281void
1257rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1258{ 1283{
1259 int button_number, key_state = 0; 1284 int button_number, state = 0;
1260 int x, y; 1285 int x, y;
1261 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1262 1287
1263 x = Pixel2Col (ev.x); 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1264 y = Pixel2Row (ev.y); 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1290
1265 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1266 { 1292 {
1267 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1268 return; 1294 return;
1295
1269 mouse_row = x; 1296 mouse_row = x;
1270 mouse_col = y; 1297 mouse_col = y;
1271 code += 32; 1298 state += 32;
1272 }
1273
1274 if (MEvent.button == AnyButton)
1275 button_number = 3;
1276 else
1277 { 1299 }
1300
1278 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1279 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1280 if (button_number >= 3) 1306 else if (button_number >= 3)
1281 button_number += (64 - 3); 1307 button_number += 64 - 3;
1282 }
1283 1308
1284 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1285 { 1310 {
1286 /* 1311 /*
1287 * do not report ButtonRelease 1312 * do not report ButtonRelease
1288 * no state info allowed 1313 * no state info allowed
1289 */ 1314 */
1290 key_state = 0; 1315 if (release)
1291 if (button_number == 3)
1292 return; 1316 return;
1293 } 1317 }
1294 else 1318 else
1295 { 1319 {
1296 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1298 * 8 = Meta 1322 * 8 = Meta
1299 * 16 = Control 1323 * 16 = Control
1300 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1301 * 32 = Double Click 1325 * 32 = Double Click
1302 */ 1326 */
1303 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1304 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1305 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1306#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1307 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1308#endif 1332#endif
1309 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1310 1336
1311#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1312 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1313 if (key_state & 16) 1339 if (state & 16)
1314 fputc ('C', stderr); 1340 fputc ('C', stderr);
1315 if (key_state & 4) 1341 if (state & 4)
1316 fputc ('S', stderr); 1342 fputc ('S', stderr);
1317 if (key_state & 8) 1343 if (state & 8)
1318 fputc ('A', stderr); 1344 fputc ('A', stderr);
1319 if (key_state & 32) 1345 if (state & 32)
1320 fputc ('2', stderr); 1346 fputc ('2', stderr);
1321 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1322 button_number, 1348 button_number,
1323 x + 1, 1349 x,
1324 y + 1); 1350 y);
1325#endif 1351#endif
1326 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1327 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1328 (code + button_number + key_state), 1380 code,
1329 (32 + x + 1), 1381 32 + x,
1330 (32 + y + 1)); 1382 32 + y);
1331} 1383}
1332 1384
1333/*{{{ process an X event */ 1385/*{{{ process an X event */
1334void 1386void ecb_hot
1335rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1336{ 1388{
1337 make_current (); 1389 make_current ();
1338 1390
1339 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
… …
1437 && ev.xfocus.mode != NotifyGrab) 1489 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1490 focus_out ();
1439 break; 1491 break;
1440 1492
1441 case ConfigureNotify: 1493 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1445 if (ev.xconfigure.window == parent[0]) 1494 if (ev.xconfigure.window == parent)
1446 { 1495 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1497 ;
1498
1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1502 {
1503 int x, y;
1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1519 }
1449 1520
1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1522 {
1452 seen_resize = 1; 1523 seen_resize = 1;
1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1525 }
1455 else 1526
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1528 }
1464 break; 1529 break;
1465 1530
1466 case PropertyNotify: 1531 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1533 break;
1473 1534
1474 case SelectionClear: 1535 case SelectionClear:
1475 selection_clear (); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break;
1477
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break; 1537 break;
1482 1538
1483 case SelectionRequest: 1539 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1485 break; 1541 break;
… …
1505 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1506 { 1562 {
1507 do 1563 do
1508 { 1564 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1567 }
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1513 1569
1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1515 1571
1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 { 1573 {
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1520 } 1576 }
1521 1577
1522 want_refresh = 1; 1578 want_refresh = 1;
1523 } 1579 }
1524 else 1580 else
… …
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1585 ;
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1587 ;
1532 1588
1533 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1590 {
1535 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1536 scrollbar_show (0); 1592 scrollBar.show (0);
1537 } 1593 }
1538 } 1594 }
1539 break; 1595 break;
1540 1596
1541 case MotionNotify: 1597 case MotionNotify:
1542#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1543 if (hidden_pointer) 1599 if (hidden_pointer)
1544 pointer_unblank (); 1600 pointer_unblank ();
1545#endif 1601#endif
1602 if (!bypass_keystate
1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1547 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1548 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1550 break; 1607 break;
1551 1608
1552 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1564 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1623 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1570 { 1628 {
1571#endif
1572#if ISO_14755 1629#if ISO_14755
1573 // 5.4 1630 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 { 1632 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1582 1639
1583#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1643 {
1644 page_dirn scroll_selection_dir;
1587 int dist; 1645 int dist;
1588 1646
1589 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1591 */ 1649 */
… …
1606 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1607 } 1665 }
1608 else 1666 else
1609 { 1667 {
1610 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1612 } 1670 }
1613 1671
1614 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1674 + 1;
1617 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1619 } 1678 }
1620 else 1679 else
1621 { 1680 {
1622 /* we are within the text window, so we 1681 /* we are within the text window, so we
1623 * shouldn't be scrolling 1682 * shouldn't be scrolling
1624 */ 1683 */
1625 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1626 } 1685 }
1627#endif 1686#endif
1628#ifdef MOUSE_THRESHOLD
1629 } 1687 }
1630#endif
1631 } 1688 }
1632 } 1689 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1691 {
1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1637 ; 1694 ;
1638 1695
1639 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1640 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1641 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1643 &unused_mask); 1700 &unused_mask);
1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1645 scrollbar_size ()); 1702 scrollBar.size ());
1646 want_refresh = 1; 1703 want_refresh = 1;
1647 scrollbar_show (1); 1704 scrollBar.show (1);
1648 } 1705 }
1649 break; 1706 break;
1650 } 1707 }
1651 1708
1652#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1653 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1654 {
1655 if (hidden_cursor)
1656 {
1657 hidden_cursor = 0;
1658 want_refresh = 1;
1659 }
1660
1661 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1662 }
1663#endif 1712#endif
1664 1713
1665#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1667 { 1716 {
… …
1677#endif 1726#endif
1678 1727
1679 refresh_check (); 1728 refresh_check ();
1680} 1729}
1681 1730
1682void 1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1683rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1684{ 1750{
1685 if (!focus) 1751 if (!focus)
1686 { 1752 {
1687 focus = 1; 1753 focus = 1;
1688 want_refresh = 1; 1754 want_refresh = 1;
1689 1755
1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1691
1692#if USE_XIM 1756#if USE_XIM
1693 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1694 { 1758 {
1695 IMSetPosition (); 1759 im_set_position ();
1696 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1697 } 1761 }
1698#endif 1762#endif
1699#if CURSOR_BLINK 1763#if CURSOR_BLINK
1700 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1702#endif 1766#endif
1703#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1704 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1705 { 1769 {
1706 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1707 scr_recolour (); 1771 scr_recolor ();
1708 } 1772 }
1709#endif 1773#endif
1710#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1712 { 1776 set_urgency (0);
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif
1720 }
1721}
1722 1777
1723void 1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 }
1784}
1785
1786void ecb_cold
1724rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1725{ 1788{
1726 if (focus) 1789 if (focus)
1727 { 1790 {
1728 focus = 0; 1791 focus = 0;
1729 want_refresh = 1; 1792 want_refresh = 1;
1730 1793
1731 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1794#if ENABLE_FRILLS
1795 if (option (Opt_urgentOnBell))
1796 set_urgency (0);
1732 1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1800#endif
1733#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1734 if (iso14755buf) 1802 if (iso14755buf)
1735 { 1803 {
1736 iso14755buf = 0; 1804 iso14755buf = 0;
1737# if ISO_14755 1805# if ISO_14755
… …
1751#endif 1819#endif
1752#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1754 { 1822 {
1755 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1756 scr_recolour (); 1824 scr_recolor ();
1757 } 1825 }
1758#endif 1826#endif
1759 }
1760}
1761 1827
1762void 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1829 }
1830}
1831
1832void ecb_cold
1763rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1764{ 1834{
1765#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1766 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1767 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1768 rgba c; 1841 rgba c;
1769 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1771 } 1844 }
1772#endif 1845#endif
1773} 1846}
1774 1847
1775#if ENABLE_TRANSPARENCY || ENABLE_PERL 1848#if ENABLE_PERL
1776void 1849void ecb_hot
1777rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1778{ 1851{
1779 make_current (); 1852 make_current ();
1780 1853
1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1783 return; 1856 return;
1784 1857
1785# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1858 switch (ev.type)
1787 { 1859 {
1788 case PropertyNotify: 1860 case PropertyNotify:
1789 /* 1861 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1792 */ 1864 */
1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1867 {
1796 bgPixmap.set_root_pixmap (); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1797 update_background ();
1798 } 1869 }
1870
1799 break; 1871 break;
1800 } 1872 }
1801# endif
1802 1873
1803 refresh_check (); 1874 refresh_check ();
1804} 1875}
1805#endif 1876#endif
1806 1877
… …
1829 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1830 return; 1901 return;
1831 } 1902 }
1832#endif 1903#endif
1833 1904
1834 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1835 1906
1836 if (reportmode) 1907 if (reportmode)
1837 { 1908 {
1838 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1839 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1840 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1841#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1842 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1843 { 1914 {
1844 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1845 MEvent.clicks++; 1916 MEvent.clicks++;
1846 1917
1847 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1848 { 1919 {
1849 /* only report double clicks */ 1920 /* only report double clicks */
… …
1921 } 1992 }
1922 1993
1923 /* 1994 /*
1924 * Scrollbar window processing of button press 1995 * Scrollbar window processing of button press
1925 */ 1996 */
1926 if (isScrollbarWindow (ev.window)) 1997 if (scrollBar.state && ev.window == scrollBar.win)
1927 { 1998 {
1928 scrollBar.setIdle (); 1999 page_dirn direction = NO_DIR;
2000
2001 if (scrollBar.upButton (ev.y))
2002 direction = UP; /* up */
2003 else if (scrollBar.dnButton (ev.y))
2004 direction = DN; /* down */
2005
2006 scrollBar.state = SB_STATE_IDLE;
1929 /* 2007 /*
1930 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1931 * move up if mouse is above slider 2009 * move up if mouse is above slider
1932 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1933 * 2011 *
… …
1942 /* 2020 /*
1943 * Mouse report disabled scrollbar: 2021 * Mouse report disabled scrollbar:
1944 * arrow buttons - send up/down 2022 * arrow buttons - send up/down
1945 * click on scrollbar - send pageup/down 2023 * click on scrollbar - send pageup/down
1946 */ 2024 */
1947 if ((scrollBar.style == R_SB_NEXT 2025 if (direction == UP)
1948 && scrollbarnext_upButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_upButton (ev.y)))
1951 tt_printf ("\033[A"); 2026 tt_printf ("\033[A");
1952 else if ((scrollBar.style == R_SB_NEXT 2027 else if (direction == DN)
1953 && scrollbarnext_dnButton (ev.y))
1954 || (scrollBar.style == R_SB_RXVT
1955 && scrollbarrxvt_dnButton (ev.y)))
1956 tt_printf ("\033[B"); 2028 tt_printf ("\033[B");
1957 else 2029 else
1958 switch (ev.button) 2030 switch (ev.button)
1959 { 2031 {
1960 case Button2: 2032 case Button2:
… …
1968 break; 2040 break;
1969 } 2041 }
1970 } 2042 }
1971 else 2043 else
1972#endif /* NO_SCROLLBAR_REPORT */ 2044#endif /* NO_SCROLLBAR_REPORT */
1973
1974 {
1975 char upordown = 0;
1976
1977 if (scrollBar.style == R_SB_NEXT)
1978 { 2045 {
1979 if (scrollbarnext_upButton (ev.y)) 2046 if (direction != NO_DIR)
1980 upordown = -1; /* up */
1981 else if (scrollbarnext_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 else if (scrollBar.style == R_SB_RXVT)
1985 {
1986 if (scrollbarrxvt_upButton (ev.y))
1987 upordown = -1; /* up */
1988 else if (scrollbarrxvt_dnButton (ev.y))
1989 upordown = 1; /* down */
1990 }
1991
1992 if (upordown)
1993 { 2047 {
1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ()) 2049 if (!cont_scroll_ev.is_active ())
1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997#endif 2051#endif
1998 if (scr_page (upordown < 0 ? UP : DN, 1)) 2052 if (scr_page (direction, 1))
1999 { 2053 {
2000 if (upordown < 0) 2054 if (direction == UP)
2001 scrollBar.setUp (); 2055 scrollBar.state = SB_STATE_UP;
2002 else 2056 else
2003 scrollBar.setDn (); 2057 scrollBar.state = SB_STATE_DOWN;
2004 } 2058 }
2005 } 2059 }
2006 else 2060 else
2007 switch (ev.button) 2061 switch (ev.button)
2008 { 2062 {
2009 case Button2: 2063 case Button2:
2010 switch (scrollbar_align) 2064 switch (scrollBar.align)
2011 { 2065 {
2012 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
2013 csrO = 0; 2067 csrO = 0;
2014 break; 2068 break;
2015 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
2016 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
2017 break; 2071 break;
2018 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
2019 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
2020 break; 2074 break;
2021 } 2075 }
2022 2076
2023 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
2024 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
2025 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2027 2081
2028 scrollBar.setMotion (); 2082 scrollBar.state = SB_STATE_MOTION;
2029 break; 2083 break;
2030 2084
2031 case Button1: 2085 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
2035 2089
2036 case Button3: 2090 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
2038 { 2092 {
2039 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
2040# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2041 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
2042# else 2096# else
2043 scr_page (UP, nrow / 4); 2097 scr_page (UP, nrow / 4);
2044# endif 2098# endif
2045 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
2046# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
2047 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2048# else 2102# else
2049 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2050# endif 2104# endif
2051 else 2105 else
2052 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
2053 } 2107 }
2054 else 2108 else
2055 { 2109 {
2056 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2057 (nrow 2111 (nrow
2058 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
2059 / scrollbar_size ())); 2113 / scrollBar.size ()));
2060 } 2114 }
2061 2115
2062 break; 2116 break;
2063 } 2117 }
2064 } 2118 }
… …
2074 2128
2075 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2076 if (!bypass_keystate) 2130 if (!bypass_keystate)
2077 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2078 2132
2079 if (scrollbar_isUpDn ()) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2080 { 2134 {
2081 scrollBar.setIdle (); 2135 scrollBar.state = SB_STATE_IDLE;
2082 scrollbar_show (0); 2136 scrollBar.show (0);
2083 } 2137 }
2084 2138
2085#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2086 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
2087#endif 2141#endif
… …
2099 2153
2100 if (reportmode) 2154 if (reportmode)
2101 { 2155 {
2102 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2103 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2104 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2105 return; 2159 return;
2106#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2107 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2108 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2109 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2110 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2111 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2112 { 2166 {
2113 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2114 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2115 mouse_report (ev); 2169 mouse_report (ev);
2116 } 2170 }
2117#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2118 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2119 mouse_report (ev); 2173 mouse_report (ev);
2120#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2121 return; 2175 return;
2122 } 2176 }
2123 2177
… …
2136 case Button3: 2190 case Button3:
2137 selection_make (ev.time); 2191 selection_make (ev.time);
2138 break; 2192 break;
2139 2193
2140 case Button2: 2194 case Button2:
2141 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2142 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2143 break; 2197 break;
2144 2198
2145#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2146 case Button4: 2200 case Button4:
2147 case Button5: 2201 case Button5:
2148 { 2202 {
2149 int i; 2203 int lines;
2150 page_dirn v; 2204 page_dirn dirn;
2151 2205
2152 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2153 2207
2154 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2155 i = 1; 2209 lines = 1;
2156 else if (option (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2157 i = nrow - 1; 2211 lines = nrow - 1;
2158 else 2212 else
2159 i = 5; 2213 lines = 5;
2160 2214
2161# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2162 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2163 { 2217 {
2164 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2167 2220
2168 if (!slip_wheel_ev.is_active ()) 2221 if (!slip_wheel_ev.is_active ())
2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 } 2223 }
2171 else 2224 else
2225# endif
2172 { 2226 {
2173# endif
2174 scr_page (v, i); 2227 scr_page (dirn, lines);
2175 scrollbar_show (1); 2228 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2229 }
2178# endif
2179 } 2230 }
2180 break; 2231 break;
2181#endif 2232#endif
2182 } 2233 }
2183 } 2234 }
2184} 2235}
2185 2236
2186/*}}} */ 2237/*}}} */
2187 2238
2188bool 2239void ecb_hot
2189rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2190{ 2241{
2191 bool flag = false;
2192 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2194 2244
2195 for (;;) 2245 for (;;)
2196 { 2246 {
2197 if (ch == NOCHAR) 2247 if (ecb_unlikely (ch == NOCHAR))
2198 { 2248 {
2199 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2250 ch = next_char ();
2201 2251
2202 if (ch == NOCHAR) 2252 if (ch == NOCHAR)
2203 break; 2253 break;
2204 } 2254 }
2205 2255
2206 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2257 {
2208 if (!seen_input) 2258 if (ecb_unlikely (!seen_input))
2209 { 2259 {
2210 seen_input = 1; 2260 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2276 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2278
2229 for (;;) 2279 for (;;)
2230 { 2280 {
2231 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2282 break;
2233 2283
2234 *str++ = ch; 2284 *str++ = ch;
2235 2285
2236 if (ch == C0_LF || str >= eol) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2287 {
2238 if (ch == C0_LF) 2288 if (ch == C0_LF)
2239 nlines++; 2289 nlines++;
2240 2290
2241 refresh_count++; 2291 refresh_count++;
… …
2290 * What the heck we'll cheat and only refresh less than every page-full. 2340 * What the heck we'll cheat and only refresh less than every page-full.
2291 * if skipScroll is enabled. 2341 * if skipScroll is enabled.
2292 */ 2342 */
2293 if (refreshnow) 2343 if (refreshnow)
2294 { 2344 {
2295 flag = true;
2296 scr_refresh (); 2345 scr_refresh ();
2297 want_refresh = 1; 2346 want_refresh = 1;
2298 } 2347 }
2299
2300 } 2348 }
2301 else 2349 else
2302 { 2350 {
2303 try 2351 try
2304 { 2352 {
… …
2312 } 2360 }
2313 2361
2314 ch = NOCHAR; 2362 ch = NOCHAR;
2315 } 2363 }
2316 } 2364 }
2317
2318 return flag;
2319} 2365}
2320 2366
2321// read the next character 2367// read the next character
2322wchar_t 2368wchar_t ecb_hot
2323rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2324{ 2370{
2325 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2326 { 2372 {
2327 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2329 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2330 2376
2331 wchar_t wc; 2377 wchar_t wc;
2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333 2379
… …
2337 cmdbuf_ptr = cmdbuf_endp; 2383 cmdbuf_ptr = cmdbuf_endp;
2338 break; 2384 break;
2339 } 2385 }
2340 2386
2341 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2388 {
2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2343 2394
2344 // assume wchar == unicode 2395 // assume wchar == unicode
2345 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2346 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2347 } 2398 }
2348 2399
2349 return NOCHAR; 2400 return NOCHAR;
2350} 2401}
2351 2402
2352// read the next octet 2403// read the next octet
2353uint32_t 2404uint32_t ecb_hot
2354rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2355{ 2406{
2356 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2357 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2358 : NOCHAR; 2409 : NOCHAR;
2359} 2410}
2360 2411
2361static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2362 2413
2363/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2364/* 2415rxvt_term::cmd_getc ()
2365 * Return the next input character after first passing any keyboard input
2366 * to the command.
2367 */
2368wchar_t
2369rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2416{
2371 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2372 2418
2373 if (c == NOCHAR) 2419 if (c == NOCHAR)
2374 throw out_of_input; 2420 throw out_of_input;
2375 2421
2376 return c; 2422 return c;
2377} 2423}
2378 2424
2379uint32_t 2425uint32_t ecb_hot
2380rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2381{ 2427{
2382 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2383 2429
2384 if (c == NOCHAR) 2430 if (c == NOCHAR)
2385 throw out_of_input; 2431 throw out_of_input;
… …
2388} 2434}
2389 2435
2390/*{{{ print pipe */ 2436/*{{{ print pipe */
2391/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2393FILE * 2439FILE * ecb_cold
2394rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2395{ 2441{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2443
2398 if (stream == NULL) 2444 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2446
2401 return stream; 2447 return stream;
2402} 2448}
2403 2449
2404int 2450int ecb_cold
2405rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2406{ 2452{
2407 fflush (stream); 2453 fflush (stream);
2408 return pclose (stream); 2454 return pclose (stream);
2409} 2455}
2410 2456
2411/* 2457/*
2412 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2413 */ 2459 */
2414void 2460void ecb_cold
2415rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2416{ 2462{
2417 int done; 2463 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2464
2420 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2421 return; 2466 return;
2422 2467
2423 /* 2468 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2470 * is received.
2426 */ 2471 */
2427 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2428 { 2473 {
2429 unsigned char buf[8]; 2474 unsigned char buf[8];
2430 unicode_t ch; 2475 unicode_t ch;
2431 unsigned int i, len; 2476 unsigned int i, len;
2432 2477
… …
2466 pclose_printer (fd); 2511 pclose_printer (fd);
2467} 2512}
2468#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2469/*}}} */ 2514/*}}} */
2470 2515
2471/* *INDENT-OFF* */
2472enum { 2516enum {
2473 C1_40 = 0x40, 2517 C1_40 = 0x40,
2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2475 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2476 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478}; 2522};
2479/* *INDENT-ON* */
2480 2523
2481/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2482void 2525void ecb_hot
2483rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2527{
2485 switch (ch) 2528 switch (ch)
2486 { 2529 {
2487 case C0_ESC: 2530 case C0_ESC:
… …
2517 scr_charset_choose (0); 2560 scr_charset_choose (0);
2518 break; 2561 break;
2519 2562
2520#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2521 // 8-bit controls 2564 // 8-bit controls
2522 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2523 process_dcs_seq (); 2566 process_dcs_seq ();
2524 break; 2567 break;
2525 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2526 process_csi_seq (); 2569 process_csi_seq ();
2527 break; 2570 break;
2528 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2529 process_osc_seq (); 2572 process_osc_seq ();
2530 break; 2573 break;
2531#endif 2574#endif
2532 } 2575 }
2533} 2576}
2534/*}}} */ 2577/*}}} */
2535 2578
2536 2579
2537/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2538void 2581void ecb_cold
2539rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2540{ 2583{
2541 int row, col; 2584 int row, col;
2542 2585
2543 switch (ch) 2586 switch (ch)
… …
2577 break; 2620 break;
2578 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2623 break;
2581 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2582 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2583 break; 2626 break;
2584 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2586 /* unimplemented */ 2629 /* unimplemented */
2587 break; 2630 break;
… …
2593} 2636}
2594/*}}} */ 2637/*}}} */
2595 2638
2596 2639
2597/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2598void 2641void ecb_hot
2599rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2600{ 2643{
2601 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2602 2645
2603 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2606 return; 2649 return;
2607 } 2650 }
2608 2651
2609 switch (ch) 2652 switch (ch)
2610 { 2653 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2654 case '#':
2613 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2614 scr_E (); 2656 scr_E ();
2615 break; 2657 break;
2616 case '(': 2658 case '(':
… …
2639#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2640 case '9': 2682 case '9':
2641 scr_forwardindex (); 2683 scr_forwardindex ();
2642 break; 2684 break;
2643#endif 2685#endif
2686 // DECPAM/DECPNM
2644 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2645 case '>': 2690 case '>':
2646 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
2647 break; 2692 break;
2648 2693
2649 case C1_40: 2694 case C1_40:
2650 cmd_getc (); 2695 cmd_getc ();
2651 break; 2696 break;
… …
2655 2700
2656 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2658 { 2703 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2706 }
2662 break; 2707 break;
2663 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2666 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2715 break;
2716#endif
2668 2717
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2720 scr_set_tab (1);
2672 break; 2721 break;
… …
2675 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2676 scr_index (DN); 2725 scr_index (DN);
2677 break; 2726 break;
2678 2727
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2681 2730
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2684 2733
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2736 process_dcs_seq ();
2688 break; 2737 break;
… …
2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2694 2743
2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2697 process_csi_seq (); 2746 process_csi_seq ();
2698 break; 2747 break;
2699 2748
2700 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
2702 process_osc_seq (); 2751 process_osc_seq ();
2703 break; 2752 break;
2704 2753
2705 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706 case 'c': 2755 case 'c':
2707 mbstate.reset (); 2756 mbstate.reset ();
2708 scr_poweron (); 2757 scr_poweron ();
2709 scrollbar_show (1); 2758 scrollBar.show (1);
2710 break; 2759 break;
2711 2760
2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713 case 'n': 2762 case 'n':
2714 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
2721 } 2770 }
2722} 2771}
2723/*}}} */ 2772/*}}} */
2724 2773
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2775enum {
2728 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2729 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2730 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2731 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2785};
2738 2786
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2792
2745const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2746 { 2794 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2752 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2753 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2754 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2755 }; 2803 };
2756/* *INDENT-ON* */
2757 2804
2758void 2805void ecb_hot
2759rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2760{ 2807{
2761 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
2762 unsigned int nargs, p; 2809 unsigned int nargs, p;
2763 int n, ndef; 2810 int n, ndef;
2764 int arg[ESC_ARGS] = { }; 2811 int arg[ESC_ARGS] = { };
2765 2812
2766 nargs = 0; 2813 nargs = 0;
2767 2814
2768 priv = 0; 2815 priv = 0;
2769 ch = cmd_getc (); 2816 ch = cmd_getc ();
2770 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 { 2818 {
2772 /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
2773 priv = ch; 2820 priv = ch;
2774 ch = cmd_getc (); 2821 ch = cmd_getc ();
2775 } 2822 }
2776 2823
2824 prev_ch = 0;
2777 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2778 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2779 { 2827 {
2780 if (isdigit (ch)) 2828 if (isdigit (ch))
2781 { 2829 {
… …
2791 n = -1; 2839 n = -1;
2792 } 2840 }
2793 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
2794 process_nonprinting (ch); 2842 process_nonprinting (ch);
2795 2843
2844 prev_ch = ch;
2796 ch = cmd_getc (); 2845 ch = cmd_getc ();
2797 } 2846 }
2798 2847
2799 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2800 return; 2849 return;
… …
2826 // versions. 2875 // versions.
2827 // 2876 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2877 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2878 }
2830 break; 2879 break;
2880
2831 case '?': 2881 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2886 break;
2887
2888 case '!':
2889 if (ch == CSI_70)
2890 {
2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2892 scr_soft_reset ();
2893
2894 static const int pm_h[] = { 7, 25 };
2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2896
2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2835 } 2899 }
2900 break;
2901 }
2902
2836 return; 2903 return;
2837 } 2904 }
2838 2905
2839 switch (ch) 2906 switch (ch)
2840 { 2907 {
… …
2854 } 2921 }
2855 break; 2922 break;
2856#endif 2923#endif
2857 2924
2858 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2859 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2860 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
2861 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
2862 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2863 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2864 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2865 break; 2932 break;
2866 2933
2867 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2868 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2869#ifdef ISO6429 2936#ifdef ISO6429
2870 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2871#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2872 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2873#endif 2940#endif
… …
2964 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
2965 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
2966 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2967 break; 3034 break;
2968 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2970 break; 3041 break;
3042 }
2971 } 3043 }
2972 break; 3044 break;
2973 3045
2974 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2975 switch (arg[0]) 3047 switch (arg[0])
… …
3018 scr_insert_mode (1); 3090 scr_insert_mode (1);
3019 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3020 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3021 break; 3093 break;
3022 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3023 /* 3100 /*
3024 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3025 */ 3102 */
3026 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3027 if (nargs == 1) 3104 if (nargs == 1)
… …
3055 } 3132 }
3056} 3133}
3057/*}}} */ 3134/*}}} */
3058 3135
3059#if !ENABLE_MINIMAL 3136#if !ENABLE_MINIMAL
3060/* ARGSUSED */
3061void 3137void
3062rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3063{ 3139{
3064 int x, y; 3140 int x, y;
3065 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
… …
3074 { 3150 {
3075 /* 3151 /*
3076 * commands 3152 * commands
3077 */ 3153 */
3078 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3079 XMapWindow (dpy, parent[0]); 3155 XMapWindow (dpy, parent);
3080 break; 3156 break;
3081 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3082 XIconifyWindow (dpy, parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3083 break; 3159 break;
3084 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3085 XMoveWindow (dpy, parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3086 break; 3162 break;
3087 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3089 break; 3165 break;
3090 case 5: /* raise window */ 3166 case 5: /* raise window */
3091 XRaiseWindow (dpy, parent[0]); 3167 XRaiseWindow (dpy, parent);
3092 break; 3168 break;
3093 case 6: /* lower window */ 3169 case 6: /* lower window */
3094 XLowerWindow (dpy, parent[0]); 3170 XLowerWindow (dpy, parent);
3095 break; 3171 break;
3096 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3097 scr_touch (true); 3173 scr_touch (true);
3098 break; 3174 break;
3099 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
… …
3102 break; 3178 break;
3103 3179
3104 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3105 default: 3181 default:
3106 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3107 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3108 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3109 break; 3185 break;
3110 3186
3111 /* 3187 /*
3112 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3113 */ 3189 */
3114 case 11: /* report window state */ 3190 case 11: /* report window state */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3117 break; 3193 break;
3118 case 13: /* report window position */ 3194 case 13: /* report window position */
3119 XGetWindowAttributes (dpy, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3120 XTranslateCoordinates (dpy, parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3121 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3122 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3123 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3124 break; 3200 break;
3125 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3128 break; 3204 break;
3129 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3130 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3131 break; 3207 break;
… …
3133 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3134 break; 3210 break;
3135 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3136 { 3212 {
3137 char *s; 3213 char *s;
3138 XGetIconName (dpy, parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3140 XFree (s); 3216 XFree (s);
3141 } 3217 }
3142 break; 3218 break;
3143 case 21: /* report window title */ 3219 case 21: /* report window title */
3144 { 3220 {
3145 char *s; 3221 char *s;
3146 XFetchName (dpy, parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3148 XFree (s); 3224 XFree (s);
3149 } 3225 }
3150 break; 3226 break;
3151 } 3227 }
… …
3156/* 3232/*
3157 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3158 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3159 */ 3235 */
3160char * 3236char *
3161rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3162{ 3238{
3163 unicode_t ch; 3239 unicode_t ch;
3164 bool seen_esc = false; 3240 bool seen_esc = false;
3165 unsigned int n = 0; 3241 unsigned int n = 0;
3166 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3167 3243
3168 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3169 { 3245 {
3170 if (seen_esc) 3246 if (seen_esc)
3171 { 3247 {
… …
3186 else if (ch < 0x20) 3262 else if (ch < 0x20)
3187 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3188 3264
3189 seen_esc = false; 3265 seen_esc = false;
3190 3266
3191 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3192 // stop at some sane length 3268 // stop at some sane length
3193 return NULL; 3269 return NULL;
3194 3270
3195 string[n++] = ch; 3271 string[n++] = ch;
3196 } 3272 }
3197 3273
3198 string[n++] = '\0'; 3274 string[n++] = '\0';
3199 3275
3200 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3201 3281
3202 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3203} 3283}
3204 3284
3205/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3207 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3208 */ 3288 */
3209void 3289void
3210rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3211{ 3291{
3212 char *s;
3213 unicode_t eh;
3214
3215 /* 3292 /*
3216 * Not handled yet 3293 * Not handled yet
3217 */ 3294 */
3295
3296 string_term st;
3218 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3219 if (s) 3298 if (s)
3220 free (s); 3299 free (s);
3221 3300
3222 return; 3301 return;
3223} 3302}
… …
3227 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3228 */ 3307 */
3229void 3308void
3230rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3231{ 3310{
3232 unicode_t ch, eh;
3233 int arg; 3311 int arg;
3234 3312
3235 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3236 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3237 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3238 3316
3239 if (ch == ';') 3317 if (ch == ';')
3240 { 3318 {
3319 string_term st;
3241 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3242 3321
3243 if (s) 3322 if (s)
3244 { 3323 {
3245 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3246 free (s); 3325 free (s);
3247 } 3326 }
3248 } 3327 }
3249} 3328}
3250 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3251void 3433void
3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3253{ 3435{
3254 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3255 { 3437 {
3256 rgba c; 3438 rgba c;
3257 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3258 3441
3259#if XFT 3442#if XFT
3260 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3262 else 3445 else
3263#endif 3446#endif
3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3265 } 3453 }
3266 else 3454 else
3267 set_window_color (color, str); 3455 set_window_color (color, str);
3268} 3456}
3269 3457
3270/* 3458/*
3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272 */ 3460 */
3273void 3461void
3274rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3275{ 3463{
3276 int color; 3464 int color;
3277 char *buf, *name; 3465 char *buf, *name;
3278 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3279 int saveop = op; 3467 int saveop = op;
… …
3306 unsigned long bytes_after; 3494 unsigned long bytes_after;
3307 unsigned char *value = 0; 3495 unsigned char *value = 0;
3308 const char *str = ""; 3496 const char *str = "";
3309 3497
3310 if (prop 3498 if (prop
3311 && XGetWindowProperty (dpy, parent[0], 3499 && XGetWindowProperty (dpy, parent,
3312 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3313 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3314 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3315 && actual_type != None 3503 && actual_type != None
3316 && actual_format == 8) 3504 && actual_format == 8)
3317 str = (const char *)(value); 3505 str = (const char *)(value);
3318 3506
3319 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3320 3508
3321 XFree (value); 3509 XFree (value);
3322 } 3510 }
3323 else 3511 else
3324 { 3512 {
3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3513 char *eq = strchr (str, '=');
3326 3514
3327 if (eq) 3515 if (eq)
3328 { 3516 {
3329 *eq = 0; 3517 *eq = 0;
3330 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3331 } 3519 }
3332 else 3520 else
3333 XDeleteProperty (dpy, parent[0], 3521 XDeleteProperty (dpy, parent,
3334 display->atom (str)); 3522 display->atom (str));
3335 } 3523 }
3336 break; 3524 break;
3337 3525
3338 case XTerm_Color: 3526 case XTerm_Color:
… …
3348 break; 3536 break;
3349 3537
3350 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3351 *buf++ = '\0'; 3539 *buf++ = '\0';
3352 3540
3353 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3354 } 3542 }
3355 break; 3543 break;
3544 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3545 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3358 break; 3547 break;
3548 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3549 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3361 break; 3551 break;
3362#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3364 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3365 break; 3555 break;
3366#endif 3556#endif
3367 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3368 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3369 break; 3559 break;
3370 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3371 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3372 break; 3562 break;
3563#ifdef OPTION_HC
3564 case XTerm_Color_HC:
3565 process_color_seq (op, Color_HC, str, st);
3566 break;
3567 case XTerm_Color_HTC:
3568 process_color_seq (op, Color_HTC, str, st);
3569 break;
3570#endif
3373#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3374 case XTerm_Color_RV:
3375 process_color_seq (op, Color_RV, str, resp);
3376 break;
3377 case Rxvt_Color_BD:
3378 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3380 break; 3574 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3384 break; 3577 break;
3385 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3387 break; 3580 break;
3388#endif 3581#endif
3389#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3582 case URxvt_Color_border:
3391 process_color_seq (op, Color_tint, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3392 {
3393 bool changed = false;
3394 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3406 case Rxvt_Pixmap:
3407 if (!strcmp (str, "?"))
3408 {
3409 char str[256];
3410
3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3415 }
3416 else
3417 {
3418 int changed = 0;
3419
3420 if (*str != ';')
3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3430 while (str)
3431 {
3432 str++;
3433 if (bgPixmap.set_geometry (str))
3434 changed++;
3435 str = strchr (str, ';');
3436 }
3437 if (changed)
3438 update_background ();
3439 }
3440 break;
3441#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break; 3584 break;
3449 3585
3450 case XTerm_logfile: 3586 case XTerm_logfile:
3451 // TODO, when secure mode? 3587 // TODO, when secure mode?
3452 break; 3588 break;
… …
3470 case URxvt_boldFont: 3606 case URxvt_boldFont:
3471 case URxvt_italicFont: 3607 case URxvt_italicFont:
3472 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3473#endif 3609#endif
3474 if (query) 3610 if (query)
3475 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3477 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3478 resp); 3614 st.v);
3479 else 3615 else
3480 { 3616 {
3481 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3482 3618
3483 res = strdup (str); 3619 res = strdup (str);
… …
3486 } 3622 }
3487 break; 3623 break;
3488 3624
3489 case URxvt_version: 3625 case URxvt_version:
3490 if (query) 3626 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3492 op, 3628 op,
3493 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp); 3630 st.v);
3495 break; 3631 break;
3496 3632
3497#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3498 case URxvt_locale: 3641 case URxvt_locale:
3499 if (query) 3642 if (query)
3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3501 else 3644 else
3502 { 3645 {
3503 set_locale (str); 3646 set_locale (str);
3504 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3505 init_xlocale (); 3648 init_xlocale ();
… …
3520 break; 3663 break;
3521#endif 3664#endif
3522 3665
3523#if ENABLE_PERL 3666#if ENABLE_PERL
3524 case URxvt_perl: 3667 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3526 ; // no responses yet
3527 break; 3669 break;
3528#endif 3670#endif
3529 } 3671 }
3530} 3672}
3531/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3538 * 's' = save 3680 * 's' = save
3539 * 'r' = restore 3681 * 'r' = restore
3540 * 't' = toggle 3682 * 't' = toggle
3541 * so no need for fancy checking 3683 * so no need for fancy checking
3542 */ 3684 */
3543int 3685int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3687{
3546 int state; 3688 int state;
3547 3689
3548 if (mode == 's') 3690 if (mode == 's')
3549 { 3691 {
3550 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3551 return -1; 3696 return -1;
3552 } 3697 }
3553 else 3698 else
3554 { 3699 {
3555 if (mode == 'r') 3700 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3702 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 PrivMode (state, bit); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
3560 } 3709 }
3561 3710
3562 return state; 3711 return state;
3563} 3712}
3564 3713
3565/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
3566void 3715void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3717{
3569 unsigned int i, j; 3718 unsigned int i, j;
3570 int state; 3719 int state;
3571 3720
3572 static const struct 3721 static const struct
3573 { 3722 {
3574 const int argval; 3723 const int argval;
3575 const unsigned long bit; 3724 const unsigned long bit;
3576 } argtopriv[] = { 3725 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3726 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3728 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3730 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3731 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3732 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3733 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related
3587 { 25, PrivMode_VisibleCursor }, 3735 { 12, PrivMode_BlinkingCursor },
3736 // 18 end FF to printer after print screen
3737 // 19 Print screen prints full screen/scroll region
3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3741#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3743 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3746 // 45 margin bell NYI
3595 // 46 start logging 3747 // 46 start logging
3596 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3749 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3751 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3752#endif
3601 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3774 { 2004, PrivMode_BracketPaste },
3775#endif
3613 }; 3776 };
3614 3777
3615 if (nargs == 0) 3778 if (nargs == 0)
3616 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3617 3798
3618 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3619 if (mode == 'l') 3800 if (mode == 'l')
3620 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3621 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3624 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
3625 { 3806 {
3626 state = -1; 3807 state = -1;
3627 3808
3628 /* basic handling */ 3809 /* basic handling */
3629 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
3630 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
3631 { 3812 {
3632 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
3633 break; 3814 break;
3634 } 3815 }
… …
3642 3823
3643 scr_touch (true); 3824 scr_touch (true);
3644 break; 3825 break;
3645#endif 3826#endif
3646 case 1048: /* alternative cursor save */ 3827 case 1048: /* alternative cursor save */
3647 case 1049:
3648 if (option (Opt_secondaryScreen)) 3828 if (option (Opt_secondaryScreen))
3649 if (mode == 0) 3829 if (mode == 0)
3650 scr_cursor (RESTORE); 3830 scr_cursor (RESTORE);
3651 else if (mode == 1) 3831 else if (mode == 1)
3652 scr_cursor (SAVE); 3832 scr_cursor (SAVE);
… …
3661 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
3662 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
3663 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
3664 * within VT52 mode 3844 * within VT52 mode
3665 */ 3845 */
3666 PrivMode (1, PrivMode_vt52); 3846 priv_modes |= PrivMode_vt52;
3667 break; 3847 break;
3668 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 break; 3851 break;
3672 case 4: /* smooth scrolling */ 3852 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3853 set_option (Opt_jumpScroll, !state);
3674 break; 3854 break;
3675 case 5: /* reverse video */ 3855 case 5: /* reverse video */
… …
3686 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688 break; 3868 break;
3689#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
3690 case scrollBar_esc: 3870 case scrollBar_esc:
3691 if (scrollbar_mapping (state)) 3871 scrollBar.map (state);
3692 {
3693 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3694 scr_touch (true); 3873 scr_touch (true);
3695 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3696 break; 3879 break;
3697#endif 3880#endif
3698 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3699 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3700 break; 3883 break;
… …
3713 case 1003: 3896 case 1003:
3714 if (state) 3897 if (state)
3715 { 3898 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3718 vt_emask_mouse = PointerMotionMask; 3902 vt_emask_mouse = PointerMotionMask;
3719 } 3903 }
3720 else 3904 else
3721 vt_emask_mouse = NoEventMask; 3905 vt_emask_mouse = NoEventMask;
3906
3722 vt_select_input (); 3907 vt_select_input ();
3723 break; 3908 break;
3724 case 1010: /* scroll to bottom on TTY output inhibit */ 3909 case 1010: /* scroll to bottom on TTY output inhibit */
3725 set_option (Opt_scrollTtyOutput, !state); 3910 set_option (Opt_scrollTtyOutput, !state);
3726 break; 3911 break;
3727 case 1011: /* scroll to bottom on key press */ 3912 case 1011: /* scroll to bottom on key press */
3728 set_option (Opt_scrollTtyKeypress, state); 3913 set_option (Opt_scrollTtyKeypress, state);
3729 break; 3914 break;
3730 case 1047: /* secondary screen w/ clearing last */ 3915 case 1047: /* secondary screen w/ clearing last */
3731 if (option (Opt_secondaryScreen)) 3916 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3917 if (!state)
3733 scr_erase_screen (2); 3918 scr_erase_screen (2);
3919
3734 scr_change_screen (state); 3920 scr_change_screen (state);
3735 break; 3921 break;
3736 case 1049: /* secondary screen w/ clearing first */ 3922 case 1049: /* secondary screen w/ clearing first */
3923 if (option (Opt_secondaryScreen))
3924 if (state)
3925 scr_cursor (SAVE);
3926
3737 scr_change_screen (state); 3927 scr_change_screen (state);
3928
3738 if (option (Opt_secondaryScreen)) 3929 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3930 if (state)
3740 scr_erase_screen (2); 3931 scr_erase_screen (2);
3932 else
3933 scr_cursor (RESTORE);
3741 break; 3934 break;
3742 default: 3935 default:
3743 break; 3936 break;
3744 } 3937 }
3745 } 3938 }
3746} 3939}
3747/*}}} */ 3940/*}}} */
3748 3941
3749/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
3750void 3943void ecb_hot
3751rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3752{ 3945{
3753 unsigned int i; 3946 unsigned int i;
3754 short rendset; 3947 short rendset;
3755 int rendstyle; 3948 int rendstyle;
… …
3797 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3798 //case 20: // gothic 3991 //case 20: // gothic
3799 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3800 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3801 break; 3994 break;
3802 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3803 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3804 break; 3997 break;
3805 case 23: // disable italic 3998 case 23: // disable italic
3806 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3807 break; 4000 break;
3808 case 24: 4001 case 24: // underline off (vt220)
3809 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3810 break; 4003 break;
3811 case 25: 4004 case 25: // blink off (vt220)
3812 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3813 break; 4006 break;
3814 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3815 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3816 break; 4009 break;
3817 case 27: 4010 case 27: // reverse off (vt220)
3818 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3819 break; 4012 break;
3820 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3821 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3822 } 4015 }
… …
3837 case 35: 4030 case 35:
3838 case 36: 4031 case 36:
3839 case 37: 4032 case 37:
3840 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3841 break; 4034 break;
3842 case 38: // set fg color, ISO 8613-6
3843 if (nargs > i + 2 && arg[i + 1] == 5)
3844 {
3845 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3846 i += 2;
3847 }
3848 break;
3849 case 39: /* default fg */ 4035 case 39: /* default fg */
3850 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3851 break; 4037 break;
3852 4038
3853 case 40: 4039 case 40:
… …
3858 case 45: 4044 case 45:
3859 case 46: 4045 case 46:
3860 case 47: 4046 case 47:
3861 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3862 break; 4048 break;
3863 case 48: // set bg color, ISO 8613-6
3864 if (nargs > i + 2 && arg[i + 1] == 5)
3865 {
3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3867 i += 2;
3868 }
3869 break;
3870 case 49: /* default bg */ 4049 case 49: /* default bg */
3871 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3872 break; 4080 break;
3873 4081
3874 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3875 4083
3876#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
3896 break; 4104 break;
3897#endif 4105#endif
3898 } 4106 }
3899 } 4107 }
3900} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
3901/*}}} */ 4129/*}}} */
3902 4130
3903/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3904void
3905rxvt_term::process_graphics ()
3906{
3907 unicode_t ch, cmd = cmd_getc ();
3908
3909 if (cmd == 'Q')
3910 {
3911 /* query graphics */
3912 tt_printf ("\033G0\012"); /* no graphics */
3913 return;
3914 }
3915 /* swallow other graphics sequences until terminating ':' */
3916 do
3917 ch = cmd_getc ();
3918 while (ch != ':');
3919}
3920/*}}} */
3921
3922/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
3923 4135
3924/* 4136/*
3925 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
3926 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
3927 */ 4139 */
… …
3935 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3936 va_end (arg_ptr); 4148 va_end (arg_ptr);
3937 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
3938} 4150}
3939 4151
3940/* ---------------------------------------------------------------------- */
3941/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
3942 * or generated by us in response to a query ESC sequence. 4153void
3943 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3944const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
3945 4168
3946void 4169void
3947rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
3948{ 4171{
3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3950 return; 4173 return;
3951 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
3952 if (pty->pty < 0) 4183 if (pty->pty < 0)
3953 return; 4184 return;
3954 4185
3955 if (v_buflen == 0) 4186 if (v_buflen == 0)
3956 { 4187 {
3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3958 4189
4190 max_it (written, 0);
4191
3959 if ((unsigned int)written == len) 4192 if (written == len)
3960 return; 4193 return;
3961 4194
3962 data += written; 4195 data += written;
3963 len -= written; 4196 len -= written;
3964 } 4197 }
3965 4198
3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3967 4200
3968 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
3969 v_buflen += len; 4202 v_buflen += len;
3970 4203
3971 pty_ev.set (ev::READ | ev::WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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