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.489 by sf-exg, Sat Jul 9 13:40:13 2011 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 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-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * 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,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
131 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
132#endif 134#endif
133 0, 135 0,
134}; 136};
135 137
136void 138void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
138{ 140{
139 x = Pixel2Col (x); 141 x = Pixel2Col (x);
140 y = Pixel2Row (y); 142 y = Pixel2Row (y);
141 143
… …
149 151
150 text_t t = l.t[x]; 152 text_t t = l.t[x];
151 153
152 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
153 { 155 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
156 break; 158 break;
157 } 159 }
158 160
159 x--; 161 x--;
160 } 162 }
161} 163}
162 164
163void 165void ecb_cold
164rxvt_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)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 169 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
181 183
182 alloc = 0; 184 alloc = 0;
183 chr = &ch2; 185 chr = &ch2;
184 len = 1; 186 len = 1;
185 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 191
187 char attr[80]; // plenty 192 char attr[80]; // plenty
188 193
189 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",
190 (int)r, 195 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 209 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 211 }
207 212
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
210 214
211 if (y >= 0) 215 if (y >= 0)
212 { 216 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 218 x = 0;
215 } 219 }
216 220
217 scr_overlay_new (x, y, width, len * 2 + 1); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
218 224
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 226
221 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
222 { 228 {
223 char buf[9]; 229 char buf[9];
224 230
225 ch = *chr++; 231 ch = *chr++;
226 232
227 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 236# if !UNICODE_3
231 if (ch >= 0x10000) 237 if (ch >= 0x10000)
232 ch = 0xfffd; 238 ch = 0xfffd;
233# endif 239# endif
234 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
235 241
236 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 244 }
239 245
240// { 246// {
241// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
244// } 250// }
245 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 252 for (int i = 0; i < len; i++)
247 { 253 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 255 free (fname[i]);
250 } 256 }
251 257
252# if ENABLE_COMBINING 258# if ENABLE_COMBINING
253 if (alloc) 259 if (alloc)
254 delete [] alloc; 260 delete [] alloc;
255# endif 261# endif
256} 262}
257#endif 263#endif
258 264
259void 265void ecb_cold
260rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
261{ 267{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 269
264 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
… …
282 } 288 }
283 289
284 iso14755buf = 0; 290 iso14755buf = 0;
285} 291}
286 292
287static int 293static int ecb_cold
288hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
289{ 295{
290 // check whether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
… …
301 307
302 return -1; 308 return -1;
303} 309}
304#endif 310#endif
305 311
306static inline KeySym 312static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 313translate_keypad (KeySym keysym, bool kp)
308{ 314{
309#ifdef XK_KP_Home 315#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 316 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
325 }; 326 };
326 327
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 338# endif
338#endif 339#endif
339 return keysym; 340 return keysym;
340} 341}
341 342
342static inline int 343static inline int ecb_cold
343map_function_key (KeySym keysym) 344map_function_key (KeySym keysym)
344{ 345{
345 int param = 0; 346 int param = 0;
346 347
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 373 param = 3;
373 break; 374 break;
374 case XK_Select: 375 case XK_Select:
375 param = 4; 376 param = 4;
376 break; 377 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 378 case XK_Prior:
379 param = 5; 379 param = 5;
380 break; 380 break;
381 case XK_Next: 381 case XK_Next:
382 param = 6; 382 param = 6;
… …
385 param = 7; 385 param = 7;
386 break; 386 break;
387 case XK_End: 387 case XK_End:
388 param = 8; 388 param = 8;
389 break; 389 break;
390#endif
391 case XK_Help: 390 case XK_Help:
392 param = 28; 391 param = 28;
393 break; 392 break;
394 case XK_Menu: 393 case XK_Menu:
395 param = 29; 394 param = 29;
396 break; 395 break;
397 } 396 }
398 return param; 397 return param;
399} 398}
400 399
401void 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
402rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
403{ 411{
404 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
405 KeySym keysym; 413 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
408 416
409#if ISO_14755 417#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
411 return; 419 return;
412#endif 420#endif
… …
421 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
423 431
424 kbuf[0] = 0; 432 kbuf[0] = 0;
425 433
426#ifdef USE_XIM 434#if USE_XIM
427 if (Input_Context) 435 if (Input_Context)
428 { 436 {
429 Status status_return; 437 Status status_return;
430 438
431#if 0 439#if 0
… …
469 } 477 }
470 } 478 }
471 else 479 else
472 len = 0; 480 len = 0;
473 } 481 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 482 }
478 else 483 else
479#endif 484#endif
480 { 485 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
483 } 490 {
491 KeySym orig_keysym = keysym;
484 492
485 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)
486 { 706 {
487#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 709 return;
490#endif 710#endif
491 711
492 if (saveLines) 712 if (saveLines)
493 { 713 {
… …
506#endif 726#endif
507 max_it (lnsppg, 1); 727 max_it (lnsppg, 1);
508 728
509 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
510 { 730 {
511 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
512 return; 732 return;
513 } 733 }
514 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
515 { 735 {
516 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
517 return; 737 return;
518 } 738 }
519 } 739 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
522 { 742 {
523 if (keysym == XK_Up) 743 if (keysym == XK_Up)
524 { 744 {
525 scr_page (UP, 1); 745 scr_page (1);
526 return; 746 return;
527 } 747 }
528 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
529 { 749 {
530 scr_page (DN, 1); 750 scr_page (-1);
531 return; 751 return;
532 } 752 }
533 } 753 }
534#endif 754#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
537 { 757 {
538 if (keysym == XK_Home) 758 if (keysym == XK_Home)
539 { 759 {
540 scr_move_to (0, 1); 760 scr_changeview (top_row);
541 return; 761 return;
542 } 762 }
543 else if (keysym == XK_End) 763 else if (keysym == XK_End)
544 { 764 {
545 scr_move_to (1, 1); 765 scr_changeview (0);
546 return; 766 return;
547 } 767 }
548 } 768 }
549#endif 769#endif
550 } 770 }
551 771
552 if (shft) 772 if (shft)
553 { 773 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 775 {
562 switch (keysym) 776 switch (keysym)
563 { 777 {
564 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 787 return;
574#endif 788#endif
575 } 789 }
576 } 790 }
791 }
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;
577 } 806 }
578 807
579#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 809 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 865 {
637 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
638 return; 867 return;
639 } 868 }
640#endif 869#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 /*
782 * Pass meta for all function keys, if 'meta' option set
783 */
784#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0)
786 kbuf[len - 1] |= 0x80;
787#endif
788
789 }
790 else if (ctrl && keysym == XK_minus)
791 {
792 len = 1;
793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
800 else
801 {
802#ifdef META8_OPTION
803 /* set 8-bit on */
804 if (meta && (meta_char == 0x80))
805 {
806 char *ch;
807
808 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80;
810
811 meta = 0;
812 }
813#endif
814 /* nil */ ;
815 }
816 } 870 }
817
818 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819 return;
820 871
821 if (len <= 0) 872 if (len <= 0)
822 return; /* not mapped */ 873 return; /* not mapped */
823 874
824 if (option (Opt_scrollTtyKeypress))
825 if (view_start)
826 {
827 view_start = 0;
828 want_refresh = 1;
829 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */
846 if (meta
847#ifdef META8_OPTION
848 && meta_char == C0_ESC
849#endif
850 )
851 {
852 const char ch = C0_ESC;
853 tt_write (&ch, 1);
854 }
855
856 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
857} 876}
858 877
859void 878void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
861{ 880{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 882 KeySym keysym;
864 883
… …
936void 955void
937rxvt_term::flush () 956rxvt_term::flush ()
938{ 957{
939 flush_ev.stop (); 958 flush_ev.stop ();
940 959
941#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 961 if (bg_flags & BG_NEEDS_REFRESH)
943 { 962 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 963 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 964 scr_touch (false);
946 } 965 }
… …
986 while (row < end_row); 1005 while (row < end_row);
987 } 1006 }
988 1007
989 scr_refresh (); 1008 scr_refresh ();
990 scrollBar.show (1); 1009 scrollBar.show (1);
991#ifdef USE_XIM 1010#if USE_XIM
992 im_send_spot (); 1011 im_send_spot ();
993#endif 1012#endif
994 } 1013 }
995 1014
996 display->flush (); 1015 display->flush ();
… …
999/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1000void 1019void
1001rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1002{ 1021{
1003 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1005 1024
1006 display->flush (); 1025 display->flush ();
1007} 1026}
1008 1027
1009void 1028void
… …
1014 refresh_count = 0; 1033 refresh_count = 0;
1015 flush (); 1034 flush ();
1016} 1035}
1017 1036
1018#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
1019void 1056void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1058{
1022 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1060 want_refresh = 1;
… …
1042 1079
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1081void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1083{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1086 {
1050 want_refresh = 1; 1087 want_refresh = 1;
1051 refresh_check (); 1088 refresh_check ();
1052 } 1089 }
1053 else 1090 else
… …
1057 1094
1058#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1059void 1096void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1098{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1063 { 1100 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1102 want_refresh = 1;
1066 refresh_check (); 1103 refresh_check ();
1067 } 1104 }
… …
1072 1109
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1111void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1113{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1078 { 1115 {
1079 want_refresh = 1; 1116 want_refresh = 1;
1080 refresh_check (); 1117 refresh_check ();
1081 } 1118 }
1082 1119
… …
1203 pty_write (); 1240 pty_write ();
1204 1241
1205 refresh_check (); 1242 refresh_check ();
1206} 1243}
1207 1244
1208void 1245void ecb_cold
1209rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1210{ 1247{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1249 recolor_cursor ();
1213 1250
1214#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1215 hidden_pointer = 0; 1252 hidden_pointer = 0;
1216 1253
1217 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1218 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1219#endif 1256#endif
1220} 1257}
1221 1258
1222#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1223void 1260void ecb_cold
1224rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1225{ 1262{
1226 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1227 return; 1264 return;
1228 1265
… …
1230 XFlush (dpy); 1267 XFlush (dpy);
1231 1268
1232 hidden_pointer = 1; 1269 hidden_pointer = 1;
1233} 1270}
1234 1271
1235void 1272void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1274{
1238 make_current (); 1275 make_current ();
1239 1276
1240 pointer_blank (); 1277 pointer_blank ();
… …
1242#endif 1279#endif
1243 1280
1244void 1281void
1245rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1246{ 1283{
1247 int button_number, key_state = 0; 1284 int button_number, state = 0;
1248 int x, y; 1285 int x, y;
1249 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1250 1287
1251 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1252 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1253 1290
1254 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1255 { 1292 {
1256 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1257 return; 1294 return;
1258 1295
1259 mouse_row = x; 1296 mouse_row = x;
1260 mouse_col = y; 1297 mouse_col = y;
1261 code += 32; 1298 state += 32;
1262 } 1299 }
1263 1300
1264 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1265 button_number = 3; 1302 button_number = 3;
1266 else 1303 else
1267 { 1304 {
1268 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1306 if (button_number > 10)
1307 return;
1308 else if (button_number >= 7)
1309 button_number += 128 - 7;
1270 if (button_number >= 3) 1310 else if (button_number >= 3)
1271 button_number += 64 - 3; 1311 button_number += 64 - 3;
1272 } 1312 }
1273 1313
1274 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1275 { 1315 {
1276 /* 1316 /*
1277 * do not report ButtonRelease 1317 * do not report ButtonRelease
1278 * no state info allowed 1318 * no state info allowed
1279 */ 1319 */
1280 key_state = 0; 1320 if (release)
1281 if (button_number == 3)
1282 return; 1321 return;
1283 } 1322 }
1284 else 1323 else
1285 { 1324 {
1286 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1288 * 8 = Meta 1327 * 8 = Meta
1289 * 16 = Control 1328 * 16 = Control
1290 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1291 * 32 = Double Click 1330 * 32 = Double Click
1292 */ 1331 */
1293 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1294 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1295 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1296#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1297 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1298#endif 1337#endif
1299 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1300 1341
1301#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1302 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1303 if (key_state & 16) 1344 if (state & 16)
1304 fputc ('C', stderr); 1345 fputc ('C', stderr);
1305 if (key_state & 4) 1346 if (state & 4)
1306 fputc ('S', stderr); 1347 fputc ('S', stderr);
1307 if (key_state & 8) 1348 if (state & 8)
1308 fputc ('A', stderr); 1349 fputc ('A', stderr);
1309 if (key_state & 32) 1350 if (state & 32)
1310 fputc ('2', stderr); 1351 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1353 button_number,
1313 x, 1354 x,
1314 y); 1355 y);
1315#endif 1356#endif
1316 1357
1317#if ENABLE_FRILLS 1358#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight) 1359 if (priv_modes & PrivMode_ExtMouseSGR)
1360 tt_printf ("\033[<%d;%d;%d%c",
1361 button_number + state,
1362 x,
1363 y,
1364 release ? 'm' : 'M');
1365 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1319 tt_printf ("\033[%d;%d;%dM", 1366 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state, 1367 code,
1321 x, 1368 x,
1322 y); 1369 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse) 1370 else if (priv_modes & PrivMode_ExtMouseUTF8)
1371 if (code < 128)
1324 tt_printf ("\033[M%c%lc%lc", 1372 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state, 1373 code,
1326 wint_t (32 + x), 1374 wint_t (32 + x),
1327 wint_t (32 + y)); 1375 wint_t (32 + y));
1376 else
1377 tt_printf ("\033[M%c%c%lc%lc",
1378 0xc0 + (code >> 6),
1379 0x80 + (code & 0x3f),
1380 wint_t (32 + x),
1381 wint_t (32 + y));
1328 else 1382 else
1329#endif 1383#endif
1330 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1331 code + button_number + key_state, 1385 code,
1332 32 + x, 1386 32 + x,
1333 32 + y); 1387 32 + y);
1334} 1388}
1335 1389
1336/*{{{ process an X event */ 1390/*{{{ process an X event */
1337void 1391void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1392rxvt_term::x_cb (XEvent &ev)
1339{ 1393{
1340 make_current (); 1394 make_current ();
1341 1395
1342 dLocal (Display *, dpy); 1396 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1499 if (ev.xconfigure.window == parent)
1446 { 1500 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1502 ;
1449 1503
1450#ifdef HAVE_BG_PIXMAP 1504 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1451 bool moved = false; 1505
1452 if (bg_window_position_sensitive ()) 1506 if (want_position_change)
1453 { 1507 {
1454 int x, y; 1508 int x, y;
1509
1455 if (ev.xconfigure.send_event) 1510 if (ev.xconfigure.send_event)
1456 { 1511 {
1457 x = ev.xconfigure.x; 1512 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1513 y = ev.xconfigure.y;
1459 } 1514 }
1460 else 1515 else
1461 get_window_origin (x, y); 1516 get_window_origin (x, y);
1462 1517
1463 if (bg_set_position (x, y) 1518 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1519 {
1465 moved = true; 1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 }
1466 } 1524 }
1467#endif
1468 1525
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1527 {
1471 seen_resize = 1; 1528 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473 } 1530 }
1474 else
1475 {
1476#ifdef HAVE_BG_PIXMAP
1477 if (moved)
1478 {
1479 if (mapped)
1480 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif
1485 }
1486 1531
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1533 }
1489 break; 1534 break;
1490 1535
… …
1499 case SelectionRequest: 1544 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1501 break; 1546 break;
1502 1547
1503 case MapNotify: 1548 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025);
1519#endif
1520 mapped = 1; 1549 mapped = 1;
1521#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1551 text_blink_ev.start ();
1523#endif 1552#endif
1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1592 ;
1564 1593
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1595 {
1567 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1597 scrollBar.show (0);
1569 } 1598 }
1570 } 1599 }
1571 break; 1600 break;
1572 1601
1573 case MotionNotify: 1602 case MotionNotify:
1574#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1604 if (hidden_pointer)
1576 pointer_unblank (); 1605 pointer_unblank ();
1577#endif 1606#endif
1607 if (!bypass_keystate
1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1608 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1579 || priv_modes & PrivMode_MouseAnyEvent) 1609 || priv_modes & PrivMode_MouseAnyEvent))
1580 mouse_report (ev.xbutton); 1610 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1611 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1612 break;
1583 1613
1584 if (ev.xany.window == vt) 1614 if (ev.xany.window == vt)
… …
1596 &unused_root_x, &unused_root_y, 1626 &unused_root_x, &unused_root_y,
1597 &ev.xbutton.x, &ev.xbutton.y, 1627 &ev.xbutton.x, &ev.xbutton.y,
1598 &ev.xbutton.state); 1628 &ev.xbutton.state);
1599#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1600 /* deal with a `jumpy' mouse */ 1630 /* deal with a `jumpy' mouse */
1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1631 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1632#endif
1602 { 1633 {
1603#endif
1604#if ISO_14755 1634#if ISO_14755
1605 // 5.4 1635 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1636 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 { 1637 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1638 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1614 1644
1615#ifdef SELECTION_SCROLLING 1645#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1646 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1647 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1648 {
1649 page_dirn scroll_selection_dir;
1619 int dist; 1650 int dist;
1620 1651
1621 /* don't clobber the current delay if we are 1652 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1653 * already in the middle of scrolling.
1623 */ 1654 */
… …
1638 dist = int_bwidth - ev.xbutton.y; 1669 dist = int_bwidth - ev.xbutton.y;
1639 } 1670 }
1640 else 1671 else
1641 { 1672 {
1642 scroll_selection_dir = DN; 1673 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1674 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1675 }
1645 1676
1646 scroll_selection_lines = Pixel2Height (dist) 1677 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1678 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1679 + 1;
1649 min_it (scroll_selection_lines, 1680 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1681 SELECTION_SCROLL_MAX_LINES);
1682 scroll_selection_lines *= scroll_selection_dir;
1651 } 1683 }
1652 else 1684 else
1653 { 1685 {
1654 /* we are within the text window, so we 1686 /* we are within the text window, so we
1655 * shouldn't be scrolling 1687 * shouldn't be scrolling
1656 */ 1688 */
1657 sel_scroll_ev.stop(); 1689 sel_scroll_ev.stop();
1658 } 1690 }
1659#endif 1691#endif
1660#ifdef MOUSE_THRESHOLD
1661 } 1692 }
1662#endif
1663 } 1693 }
1664 } 1694 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1695 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1696 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1697 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1698 MotionNotify, &ev))
1669 ; 1699 ;
1670 1700
1671 XQueryPointer (dpy, scrollBar.win, 1701 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1702 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1703 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1704 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1705 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1706 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1707 scrollBar.size ());
1678 want_refresh = 1; 1708 want_refresh = 1;
1679 scrollBar.show (1); 1709 scrollBar.show (1);
1680 } 1710 }
1681 break; 1711 break;
1682 } 1712 }
1683 1713
1684#if defined(CURSOR_BLINK) 1714#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1715 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1716 cursor_blink_reset ();
1694 }
1695#endif 1717#endif
1696 1718
1697#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1721 {
… …
1710 1732
1711 refresh_check (); 1733 refresh_check ();
1712} 1734}
1713 1735
1714#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1715void 1737void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1738rxvt_term::set_urgency (bool enable)
1717{ 1739{
1718 if (enable == urgency_hint) 1740 if (enable == urgency_hint)
1719 return; 1741 return;
1720 1742
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1743 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1744 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1745 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1746 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1747 urgency_hint = enable;
1748 XFree (h);
1726 } 1749 }
1727} 1750}
1728#endif 1751#endif
1729 1752
1730void 1753void ecb_cold
1731rxvt_term::focus_in () 1754rxvt_term::focus_in ()
1732{ 1755{
1733 if (!focus) 1756 if (!focus)
1734 { 1757 {
1735 focus = 1; 1758 focus = 1;
… …
1748#endif 1771#endif
1749#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1750 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1751 { 1774 {
1752 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1753 scr_recolour (); 1776 scr_recolor ();
1754 } 1777 }
1755#endif 1778#endif
1756#if ENABLE_FRILLS 1779#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell)) 1780 if (option (Opt_urgentOnBell))
1758 set_urgency (0); 1781 set_urgency (0);
1782
1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1759#endif 1785#endif
1760 1786
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1788 }
1763} 1789}
1764 1790
1765void 1791void ecb_cold
1766rxvt_term::focus_out () 1792rxvt_term::focus_out ()
1767{ 1793{
1768 if (focus) 1794 if (focus)
1769 { 1795 {
1770 focus = 0; 1796 focus = 0;
1771 want_refresh = 1; 1797 want_refresh = 1;
1772 1798
1773#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1775 set_urgency (0); 1801 set_urgency (0);
1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1776#endif 1805#endif
1777#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1778 if (iso14755buf) 1807 if (iso14755buf)
1779 { 1808 {
1780 iso14755buf = 0; 1809 iso14755buf = 0;
… …
1795#endif 1824#endif
1796#if OFF_FOCUS_FADING 1825#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1826 if (rs[Rs_fade])
1798 { 1827 {
1799 pix_colors = pix_colors_unfocused; 1828 pix_colors = pix_colors_unfocused;
1800 scr_recolour (); 1829 scr_recolor ();
1801 } 1830 }
1802#endif 1831#endif
1803 1832
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1833 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1834 }
1806} 1835}
1807 1836
1808void 1837void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1838rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1810{ 1839{
1811#if OFF_FOCUS_FADING 1840#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1841 if (rs[Rs_fade])
1813 { 1842 {
1843 if (!first_time)
1844 pix_colors_focused [idx].free (this);
1845
1814 rgba c; 1846 rgba c;
1815 pix_colors [Color_fade].get (c); 1847 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1848 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1849 }
1818#endif 1850#endif
1819} 1851}
1820 1852
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1853#if ENABLE_PERL
1822void 1854void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1856{
1825 make_current (); 1857 make_current ();
1826 1858
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1859 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1860 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1861 return;
1830 1862
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1863 switch (ev.type)
1833 { 1864 {
1834 case PropertyNotify: 1865 case PropertyNotify:
1835 /* 1866 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1867 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1868 * use the property to determine the pixmap. We use it later on.
1838 */ 1869 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1872 {
1842 bg_set_root_pixmap (); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1843 update_background ();
1844 } 1874 }
1845 1875
1846 break; 1876 break;
1847 } 1877 }
1848# endif
1849 1878
1850 refresh_check (); 1879 refresh_check ();
1851} 1880}
1852#endif 1881#endif
1853 1882
… …
1876 iso14755_54 (ev.x, ev.y); 1905 iso14755_54 (ev.x, ev.y);
1877 return; 1906 return;
1878 } 1907 }
1879#endif 1908#endif
1880 1909
1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1910 clickintime = ev.time - MEvent.time < multiClickTime;
1882 1911
1883 if (reportmode) 1912 if (reportmode)
1884 { 1913 {
1885 /* mouse report from vt window */ 1914 /* mouse report from vt window */
1886 /* save the xbutton state (for ButtonRelease) */ 1915 /* save the xbutton state (for ButtonRelease) */
… …
1977 if (scrollBar.upButton (ev.y)) 2006 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 2007 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2008 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2009 direction = DN; /* down */
1981 2010
1982 scrollBar.state = STATE_IDLE; 2011 scrollBar.state = SB_STATE_IDLE;
1983 /* 2012 /*
1984 * Rxvt-style scrollbar: 2013 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2014 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2015 * move dn if mouse is below slider
1987 * 2016 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2055 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2056#endif
2028 if (scr_page (direction, 1)) 2057 if (scr_page (direction, 1))
2029 { 2058 {
2030 if (direction == UP) 2059 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2060 scrollBar.state = SB_STATE_UP;
2032 else 2061 else
2033 scrollBar.state = STATE_DOWN; 2062 scrollBar.state = SB_STATE_DOWN;
2034 } 2063 }
2035 } 2064 }
2036 else 2065 else
2037 switch (ev.button) 2066 switch (ev.button)
2038 { 2067 {
2039 case Button2: 2068 case Button2:
2040 switch (scrollBar.align) 2069 switch (scrollBar.align)
2041 { 2070 {
2042 case R_SB_ALIGN_TOP: 2071 case SB_ALIGN_TOP:
2043 csrO = 0; 2072 csrO = 0;
2044 break; 2073 break;
2045 case R_SB_ALIGN_CENTRE: 2074 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2075 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2076 break;
2048 case R_SB_ALIGN_BOTTOM: 2077 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2078 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2079 break;
2051 } 2080 }
2052 2081
2053 if (scrollBar.style == R_SB_XTERM 2082 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2083 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2084 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2085 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2086
2058 scrollBar.state = STATE_MOTION; 2087 scrollBar.state = SB_STATE_MOTION;
2059 break; 2088 break;
2060 2089
2061 case Button1: 2090 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2091 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2092 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2093 /* FALLTHROUGH */
2065 2094
2066 case Button3: 2095 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2096 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2097 {
2069 if (scrollbar_above_slider (ev.y)) 2098 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2100 scr_page (UP, nrow - 1);
2072# else 2101# else
2073 scr_page (UP, nrow / 4); 2102 scr_page (UP, nrow / 4);
2074# endif 2103# endif
2075 else if (scrollbar_below_slider (ev.y)) 2104 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2106 scr_page (DN, nrow - 1);
2078# else 2107# else
2079 scr_page (DN, nrow / 4); 2108 scr_page (DN, nrow / 4);
2080# endif 2109# endif
2081 else 2110 else
2082 scrollBar.state = STATE_MOTION; 2111 scrollBar.state = SB_STATE_MOTION;
2083 } 2112 }
2084 else 2113 else
2085 { 2114 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2115 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2116 (nrow
2088 * scrollbar_position (ev.y) 2117 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2118 / scrollBar.size ()));
2090 } 2119 }
2091 2120
2092 break; 2121 break;
2093 } 2122 }
… …
2104 2133
2105 csrO = 0; /* reset csr Offset */ 2134 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2135 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2136 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2137
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2138 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2139 {
2111 scrollBar.state = STATE_IDLE; 2140 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2141 scrollBar.show (0);
2113 } 2142 }
2114 2143
2115#ifdef SELECTION_SCROLLING 2144#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2145 sel_scroll_ev.stop();
… …
2129 2158
2130 if (reportmode) 2159 if (reportmode)
2131 { 2160 {
2132 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2133 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2134 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2135 return; 2164 return;
2136#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2137 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2138 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2139 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2140 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2141 > MULTICLICK_TIME / 2))) 2170 > multiClickTime / 2)))
2142 { 2171 {
2143 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2144 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2145 mouse_report (ev); 2174 mouse_report (ev);
2146 } 2175 }
2147#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2148 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2149 mouse_report (ev);
2150#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2151 return; 2181 return;
2152 } 2182 }
2153 2183
2154 /* 2184 /*
… …
2166 case Button3: 2196 case Button3:
2167 selection_make (ev.time); 2197 selection_make (ev.time);
2168 break; 2198 break;
2169 2199
2170 case Button2: 2200 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2201 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2202 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2203 break;
2174 2204
2175#ifdef MOUSE_WHEEL 2205#ifdef MOUSE_WHEEL
2176 case Button4: 2206 case Button4:
2177 case Button5: 2207 case Button5:
2178 { 2208 {
2179 int i; 2209 int lines;
2180 page_dirn v; 2210 page_dirn dirn;
2181 2211
2182 v = ev.button == Button4 ? UP : DN; 2212 dirn = ev.button == Button4 ? UP : DN;
2183 2213
2184 if (ev.state & ShiftMask) 2214 if (ev.state & ShiftMask)
2185 i = 1; 2215 lines = 1;
2186 else if (option (Opt_mouseWheelScrollPage)) 2216 else if (option (Opt_mouseWheelScrollPage))
2187 i = nrow - 1; 2217 lines = nrow - 1;
2188 else 2218 else
2189 i = 5; 2219 lines = 5;
2190 2220
2191# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2192 if (ev.state & ControlMask) 2222 if (ev.state & ControlMask)
2193 { 2223 {
2194 mouse_slip_wheel_speed += v ? -1 : 1; 2224 mouse_slip_wheel_speed += dirn;
2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2225 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197 2226
2198 if (!slip_wheel_ev.is_active ()) 2227 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2228 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200 } 2229 }
2201 else 2230 else
2202# endif 2231# endif
2203 { 2232 {
2204 scr_page (v, i); 2233 scr_page (dirn, lines);
2205 scrollBar.show (1); 2234 scrollBar.show (1);
2206 } 2235 }
2207 } 2236 }
2208 break; 2237 break;
2209#endif 2238#endif
… …
2211 } 2240 }
2212} 2241}
2213 2242
2214/*}}} */ 2243/*}}} */
2215 2244
2216void 2245void ecb_hot
2217rxvt_term::cmd_parse () 2246rxvt_term::cmd_parse ()
2218{ 2247{
2219 wchar_t ch = NOCHAR; 2248 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2249 char *seq_begin; // remember start of esc-sequence here
2221 2250
… …
2340 } 2369 }
2341 } 2370 }
2342} 2371}
2343 2372
2344// read the next character 2373// read the next character
2345wchar_t 2374wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2347{ 2376{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2378 {
2350 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2352 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2353 2382
2354 wchar_t wc; 2383 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2384 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2385
… …
2362 } 2391 }
2363 2392
2364 if (len == (size_t)-1) 2393 if (len == (size_t)-1)
2365 { 2394 {
2366 mbstate.reset (); // reset now undefined conversion state 2395 mbstate.reset (); // reset now undefined conversion state
2396 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2397 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2398 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2399 }
2369 2400
2370 // assume wchar == unicode 2401 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
… …
2374 2405
2375 return NOCHAR; 2406 return NOCHAR;
2376} 2407}
2377 2408
2378// read the next octet 2409// read the next octet
2379uint32_t 2410uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2381{ 2412{
2382 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2415 : NOCHAR;
2385} 2416}
2386 2417
2387static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2388 2419
2389wchar_t 2420wchar_t ecb_hot
2390rxvt_term::cmd_getc () THROW ((class out_of_input)) 2421rxvt_term::cmd_getc ()
2391{ 2422{
2392 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2393 2424
2394 if (c == NOCHAR) 2425 if (c == NOCHAR)
2395 throw out_of_input; 2426 throw out_of_input;
2396 2427
2397 return c; 2428 return c;
2398} 2429}
2399 2430
2400uint32_t 2431uint32_t ecb_hot
2401rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2402{ 2433{
2403 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2404 2435
2405 if (c == NOCHAR) 2436 if (c == NOCHAR)
2406 throw out_of_input; 2437 throw out_of_input;
… …
2409} 2440}
2410 2441
2411/*{{{ print pipe */ 2442/*{{{ print pipe */
2412/*----------------------------------------------------------------------*/ 2443/*----------------------------------------------------------------------*/
2413#ifdef PRINTPIPE 2444#ifdef PRINTPIPE
2414FILE * 2445FILE * ecb_cold
2415rxvt_term::popen_printer () 2446rxvt_term::popen_printer ()
2416{ 2447{
2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2448 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418 2449
2419 if (stream == NULL) 2450 if (stream == NULL)
2420 rxvt_warn ("can't open printer pipe, not printing.\n"); 2451 rxvt_warn ("can't open printer pipe, not printing.\n");
2421 2452
2422 return stream; 2453 return stream;
2423} 2454}
2424 2455
2425int 2456int ecb_cold
2426rxvt_term::pclose_printer (FILE *stream) 2457rxvt_term::pclose_printer (FILE *stream)
2427{ 2458{
2428 fflush (stream); 2459 fflush (stream);
2429 return pclose (stream); 2460 return pclose (stream);
2430} 2461}
2431 2462
2432/* 2463/*
2433 * simulate attached vt100 printer 2464 * simulate attached vt100 printer
2434 */ 2465 */
2435void 2466void ecb_cold
2436rxvt_term::process_print_pipe () 2467rxvt_term::process_print_pipe ()
2437{ 2468{
2438 FILE *fd = popen_printer (); 2469 FILE *fd = popen_printer ();
2439 2470
2440 if (!fd) 2471 if (!fd)
… …
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2526 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2527 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2528};
2498 2529
2499/*{{{ process non-printing single characters */ 2530/*{{{ process non-printing single characters */
2500void 2531void ecb_hot
2501rxvt_term::process_nonprinting (unicode_t ch) 2532rxvt_term::process_nonprinting (unicode_t ch)
2502{ 2533{
2503 switch (ch) 2534 switch (ch)
2504 { 2535 {
2505 case C0_ESC: 2536 case C0_ESC:
… …
2535 scr_charset_choose (0); 2566 scr_charset_choose (0);
2536 break; 2567 break;
2537 2568
2538#ifdef EIGHT_BIT_CONTROLS 2569#ifdef EIGHT_BIT_CONTROLS
2539 // 8-bit controls 2570 // 8-bit controls
2540 case 0x90: /* DCS */ 2571 case 0x90: /* DCS */
2541 process_dcs_seq (); 2572 process_dcs_seq ();
2542 break; 2573 break;
2543 case 0x9b: /* CSI */ 2574 case 0x9b: /* CSI */
2544 process_csi_seq (); 2575 process_csi_seq ();
2545 break; 2576 break;
2546 case 0x9d: /* OSC */ 2577 case 0x9d: /* OSC */
2547 process_osc_seq (); 2578 process_osc_seq ();
2548 break; 2579 break;
2549#endif 2580#endif
2550 } 2581 }
2551} 2582}
2552/*}}} */ 2583/*}}} */
2553 2584
2554 2585
2555/*{{{ process VT52 escape sequences */ 2586/*{{{ process VT52 escape sequences */
2556void 2587void ecb_cold
2557rxvt_term::process_escape_vt52 (unicode_t ch) 2588rxvt_term::process_escape_vt52 (unicode_t ch)
2558{ 2589{
2559 int row, col; 2590 int row, col;
2560 2591
2561 switch (ch) 2592 switch (ch)
… …
2595 break; 2626 break;
2596 case 'Z': /* identify the terminal type */ 2627 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2628 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2629 break;
2599 case '<': /* turn off VT52 mode */ 2630 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2631 priv_modes &= ~PrivMode_vt52;
2601 break; 2632 break;
2602 case 'F': /* use special graphics character set */ 2633 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2634 case 'G': /* use regular character set */
2604 /* unimplemented */ 2635 /* unimplemented */
2605 break; 2636 break;
… …
2611} 2642}
2612/*}}} */ 2643/*}}} */
2613 2644
2614 2645
2615/*{{{ process escape sequences */ 2646/*{{{ process escape sequences */
2616void 2647void ecb_hot
2617rxvt_term::process_escape_seq () 2648rxvt_term::process_escape_seq ()
2618{ 2649{
2619 unicode_t ch = cmd_getc (); 2650 unicode_t ch = cmd_getc ();
2620 2651
2621 if (priv_modes & PrivMode_vt52) 2652 if (priv_modes & PrivMode_vt52)
… …
2656#if !ENABLE_MINIMAL 2687#if !ENABLE_MINIMAL
2657 case '9': 2688 case '9':
2658 scr_forwardindex (); 2689 scr_forwardindex ();
2659 break; 2690 break;
2660#endif 2691#endif
2692 // DECPAM/DECPNM
2661 case '=': 2693 case '=':
2694 priv_modes |= PrivMode_aplKP;
2695 break;
2662 case '>': 2696 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2697 priv_modes &= ~PrivMode_aplKP;
2664 break; 2698 break;
2665 2699
2666 case C1_40: 2700 case C1_40:
2667 cmd_getc (); 2701 cmd_getc ();
2668 break; 2702 break;
… …
2676 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678 } 2712 }
2679 break; 2713 break;
2680 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2681 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2682 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2683 // used by original rxvt for rob nations own graphics mode 2718 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q') 2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2686 break; 2721 break;
2722#endif
2687 2723
2688 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2689 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2690 scr_set_tab (1); 2726 scr_set_tab (1);
2691 break; 2727 break;
… …
2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2806 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2807 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2808 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773 }; 2809 };
2774 2810
2775void 2811void ecb_hot
2776rxvt_term::process_csi_seq () 2812rxvt_term::process_csi_seq ()
2777{ 2813{
2778 unicode_t ch, priv, i; 2814 unicode_t ch, priv, prev_ch, i;
2779 unsigned int nargs, p; 2815 unsigned int nargs, p;
2780 int n, ndef; 2816 int n, ndef;
2781 int arg[ESC_ARGS] = { }; 2817 int arg[ESC_ARGS] = { };
2782 2818
2783 nargs = 0; 2819 nargs = 0;
… …
2789 /* '<' '=' '>' '?' '!' */ 2825 /* '<' '=' '>' '?' '!' */
2790 priv = ch; 2826 priv = ch;
2791 ch = cmd_getc (); 2827 ch = cmd_getc ();
2792 } 2828 }
2793 2829
2830 prev_ch = 0;
2794 /* read any numerical arguments */ 2831 /* read any numerical arguments */
2795 for (n = -1; ch < CSI_ICH; ) 2832 for (n = -1; ch < CSI_ICH; )
2796 { 2833 {
2797 if (isdigit (ch)) 2834 if (isdigit (ch))
2798 { 2835 {
… …
2808 n = -1; 2845 n = -1;
2809 } 2846 }
2810 else if (IS_CONTROL (ch)) 2847 else if (IS_CONTROL (ch))
2811 process_nonprinting (ch); 2848 process_nonprinting (ch);
2812 2849
2850 prev_ch = ch;
2813 ch = cmd_getc (); 2851 ch = cmd_getc ();
2814 } 2852 }
2815 2853
2816 if (ch > CSI_7F) 2854 if (ch > CSI_7F)
2817 return; 2855 return;
… …
2847 break; 2885 break;
2848 2886
2849 case '?': 2887 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2889 process_terminal_mode (ch, priv, nargs, arg);
2890 if (prev_ch == '$' && ch == 'p')
2891 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2892 break;
2853 2893
2854 case '!': 2894 case '!':
2855 if (ch == CSI_70) 2895 if (ch == CSI_70)
2856 { 2896 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset (); 2898 scr_soft_reset ();
2859 2899
2860 static const int pm_h[] = { 7, 25 }; 2900 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2862 2902
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2903 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865 } 2905 }
2866 break; 2906 break;
… …
2887 } 2927 }
2888 break; 2928 break;
2889#endif 2929#endif
2890 2930
2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2931 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2932 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893 arg[0] = -arg[0]; 2933 arg[0] = -arg[0];
2894 /* FALLTHROUGH */ 2934 /* FALLTHROUGH */
2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2935 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2898 break; 2938 break;
2899 2939
2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2902#ifdef ISO6429 2942#ifdef ISO6429
2903 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2904#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2905 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2906#endif 2946#endif
… …
2997 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
2998 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
2999 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3000 break; 3040 break;
3001 case 8: /* unofficial extension */ 3041 case 8: /* unofficial extension */
3042 {
3043 string_term st;
3044 st.v[0] = CHAR_ST;
3045 st.v[1] = '\0';
3002 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3003 break; 3047 break;
3048 }
3004 } 3049 }
3005 break; 3050 break;
3006 3051
3007 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3008 switch (arg[0]) 3053 switch (arg[0])
… …
3051 scr_insert_mode (1); 3096 scr_insert_mode (1);
3052 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3053 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3054 break; 3099 break;
3055 3100
3101 case CSI_71: // DECSCUSR: set cursor style
3102 if (prev_ch == ' ')
3103 set_cursor_style (arg[0]);
3104 break;
3105
3056 /* 3106 /*
3057 * PRIVATE USE beyond this point. All CSI_7? sequences here 3107 * PRIVATE USE beyond this point. All CSI_7? sequences here
3058 */ 3108 */
3059 case CSI_72: /* DECSTBM: set top and bottom margins */ 3109 case CSI_72: /* DECSTBM: set top and bottom margins */
3060 if (nargs == 1) 3110 if (nargs == 1)
… …
3134 break; 3184 break;
3135 3185
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3186 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3187 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3188 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3189 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3190 (unsigned int) (args[1] * fheight));
3141 break; 3191 break;
3142 3192
3143 /* 3193 /*
3144 * reports - some output format copied from XTerm 3194 * reports - some output format copied from XTerm
… …
3188/* 3238/*
3189 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3190 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3191 */ 3241 */
3192char * 3242char *
3193rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3194{ 3244{
3195 unicode_t ch; 3245 unicode_t ch;
3196 bool seen_esc = false; 3246 bool seen_esc = false;
3197 unsigned int n = 0; 3247 unsigned int n = 0;
3198 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3199 3249
3200 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3201 { 3251 {
3202 if (seen_esc) 3252 if (seen_esc)
3203 { 3253 {
… …
3218 else if (ch < 0x20) 3268 else if (ch < 0x20)
3219 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3220 3270
3221 seen_esc = false; 3271 seen_esc = false;
3222 3272
3223 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3224 // stop at some sane length 3274 // stop at some sane length
3225 return NULL; 3275 return NULL;
3226 3276
3227 string[n++] = ch; 3277 string[n++] = ch;
3228 } 3278 }
3229 3279
3230 string[n++] = '\0'; 3280 string[n++] = '\0';
3231 3281
3232 ends_how = (ch == 0x5c ? C0_ESC : ch); 3282 n = 0;
3283 if (ch == 0x5c)
3284 st.v[n++] = C0_ESC;
3285 st.v[n++] = ch;
3286 st.v[n] = '\0';
3233 3287
3234 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3235} 3289}
3236 3290
3237/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3243{ 3297{
3244 /* 3298 /*
3245 * Not handled yet 3299 * Not handled yet
3246 */ 3300 */
3247 3301
3248 unicode_t eh; 3302 string_term st;
3249 char *s = get_to_st (eh); 3303 char *s = get_to_st (st);
3250 if (s) 3304 if (s)
3251 free (s); 3305 free (s);
3252 3306
3253 return; 3307 return;
3254} 3308}
… …
3266 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3267 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3268 3322
3269 if (ch == ';') 3323 if (ch == ';')
3270 { 3324 {
3271 unicode_t eh; 3325 string_term st;
3272 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3273 3327
3274 if (s) 3328 if (s)
3275 { 3329 {
3276 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3277 free (s); 3331 free (s);
3278 } 3332 }
3279 } 3333 }
3280} 3334}
3281 3335
3336static unsigned int
3337colorcube_index (unsigned int idx_r,
3338 unsigned int idx_g,
3339 unsigned int idx_b)
3340{
3341 assert (idx_r < Red_levels);
3342 assert (idx_g < Green_levels);
3343 assert (idx_b < Blue_levels);
3344
3345 return idx_r * Blue_levels * Green_levels +
3346 idx_g * Blue_levels +
3347 idx_b;
3348}
3349
3350/*
3351 * Find the nearest color slot in the hidden color cube,
3352 * adapt its value to the 32bit RGBA color.
3353 */
3354unsigned int
3355rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3356{
3357 r &= 0xff;
3358 g &= 0xff;
3359 b &= 0xff;
3360 a &= 0xff;
3361
3362 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3363
3364 /* we allow one of the 6 closest neighbouring colours */
3365 /* to replace the current color, if they not used recently */
3366 #if 0
3367 static const unsigned char dxyz[][3] = {
3368 0, 0, 0,
3369 0, 0, 4,
3370 0, 4, 4,
3371 4, 4, 0,
3372 4, 0, 4,
3373 0, 4, 0,
3374 4, 0, 0,
3375 };
3376 #else
3377 // silly compressed verlapping triplets version of above
3378 static const unsigned char dxyz[] = {
3379 0, 0, 0, 4, 4, 0, 4, 0, 0,
3380 };
3381 #endif
3382
3383 static const unsigned char color_level[8][32] = {
3384 // neighbour index
3385 {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},
3386 {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},
3387 {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},
3388 {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},
3389 // Red_levels/Green_levels/Blue_levels index
3390 {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},
3391 {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},
3392 {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},
3393 {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},
3394 };
3395
3396 unsigned int idx;
3397
3398 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3399 {
3400 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3401 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3402 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3403 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3404
3405 if (n == 0)
3406 idx = index;
3407
3408 if (rgb24_color[index] == color)
3409 {
3410 rgb24_seqno[index] = ++rgb24_sequence;
3411 return index + minTermCOLOR24;
3412 }
3413
3414 // minor issue: could update index 0 few more times
3415 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3416 {
3417 idx = index;
3418 goto update;
3419 }
3420
3421 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3422 // but also handles wrap around values well enough
3423 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3424 idx = index;
3425 }
3426
3427update:
3428 rgb24_color[idx] = color;
3429 rgb24_seqno[idx] = ++rgb24_sequence;
3430
3431 idx += minTermCOLOR24;
3432 pix_colors_focused [idx].free (this);
3433 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3434 update_fade_color (idx, false);
3435
3436 return idx;
3437}
3438
3282void 3439void
3283rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3440rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3284{ 3441{
3285 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3286 { 3443 {
3287 rgba c; 3444 rgba c;
3288 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3289 3447
3290#if XFT 3448#if XFT
3291 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3292 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3450 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3293 else 3451 else
3294#endif 3452#endif
3295 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3453 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3454
3455 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3456 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3457 else
3458 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3296 } 3459 }
3297 else 3460 else
3298 set_window_color (color, str); 3461 set_window_color (color, str);
3299} 3462}
3300 3463
3301/* 3464/*
3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3303 */ 3466 */
3304void 3467void
3305rxvt_term::process_xterm_seq (int op, char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3306{ 3469{
3307 int color; 3470 int color;
3308 char *buf, *name; 3471 char *buf, *name;
3309 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3310 int saveop = op; 3473 int saveop = op;
… …
3345 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3346 && actual_type != None 3509 && actual_type != None
3347 && actual_format == 8) 3510 && actual_format == 8)
3348 str = (const char *)(value); 3511 str = (const char *)(value);
3349 3512
3350 tt_printf ("\033]%d;%s%c", op, str, resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3351 3514
3352 XFree (value); 3515 XFree (value);
3353 } 3516 }
3354 else 3517 else
3355 { 3518 {
… …
3379 break; 3542 break;
3380 3543
3381 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3382 *buf++ = '\0'; 3545 *buf++ = '\0';
3383 3546
3384 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3385 } 3548 }
3386 break; 3549 break;
3387 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3388 case XTerm_Color00: 3551 case XTerm_Color00:
3389 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3390 break; 3553 break;
3391 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3392 case XTerm_Color01: 3555 case XTerm_Color01:
3393 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3394 break; 3557 break;
3395#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3396 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3397 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3398 break; 3561 break;
3399#endif 3562#endif
3400 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3401 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3402 break; 3565 break;
3403 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3404 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3405 break; 3568 break;
3406#ifdef OPTION_HC 3569#ifdef OPTION_HC
3407 case XTerm_Color_HC: 3570 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp); 3571 process_color_seq (op, Color_HC, str, st);
3409 break; 3572 break;
3410 case XTerm_Color_HTC: 3573 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp); 3574 process_color_seq (op, Color_HTC, str, st);
3412 break; 3575 break;
3413#endif 3576#endif
3414#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3415 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3416 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3417 break; 3580 break;
3418 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3420 break; 3583 break;
3421 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3422 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3423 break; 3586 break;
3424#endif 3587#endif
3425 case URxvt_Color_border: 3588 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3427 break; 3590 break;
3428#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3433
3434 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3436
3437 if (changed)
3438 update_background ();
3439 }
3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?"))
3447 {
3448 char str[256];
3449
3450 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767),
3452 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 }
3455 else
3456 {
3457 int changed = 0;
3458
3459 if (*str != ';')
3460 {
3461 if (bg_set_file (str)) /* change pixmap */
3462 {
3463 changed++;
3464 str = strchr (str, ';');
3465 if (str == NULL)
3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3470 }
3471 else
3472 {
3473 str++;
3474 if (bg_set_geometry (str, true))
3475 changed++;
3476 }
3477
3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3486 update_background ();
3487 }
3488 }
3489 break;
3490#endif
3491 3591
3492 case XTerm_logfile: 3592 case XTerm_logfile:
3493 // TODO, when secure mode? 3593 // TODO, when secure mode?
3494 break; 3594 break;
3495 3595
… …
3512 case URxvt_boldFont: 3612 case URxvt_boldFont:
3513 case URxvt_italicFont: 3613 case URxvt_italicFont:
3514 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3515#endif 3615#endif
3516 if (query) 3616 if (query)
3517 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3518 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3519 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3520 resp); 3620 st.v);
3521 else 3621 else
3522 { 3622 {
3523 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3524 3624
3525 res = strdup (str); 3625 res = strdup (str);
… …
3528 } 3628 }
3529 break; 3629 break;
3530 3630
3531 case URxvt_version: 3631 case URxvt_version:
3532 if (query) 3632 if (query)
3533 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3534 op, 3634 op,
3535 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3536 resp); 3636 st.v);
3537 break; 3637 break;
3538 3638
3539#if !ENABLE_MINIMAL 3639#if !ENABLE_MINIMAL
3640 case URxvt_cellinfo:
3641 if (query)
3642 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3643 fwidth, fheight, fbase,
3644 st.v);
3645 break;
3646
3540 case URxvt_locale: 3647 case URxvt_locale:
3541 if (query) 3648 if (query)
3542 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3649 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3543 else 3650 else
3544 { 3651 {
3545 set_locale (str); 3652 set_locale (str);
3546 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3547 init_xlocale (); 3654 init_xlocale ();
… …
3562 break; 3669 break;
3563#endif 3670#endif
3564 3671
3565#if ENABLE_PERL 3672#if ENABLE_PERL
3566 case URxvt_perl: 3673 case URxvt_perl:
3567 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3568 break; 3675 break;
3569#endif 3676#endif
3570 } 3677 }
3571} 3678}
3572/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3579 * 's' = save 3686 * 's' = save
3580 * 'r' = restore 3687 * 'r' = restore
3581 * 't' = toggle 3688 * 't' = toggle
3582 * so no need for fancy checking 3689 * so no need for fancy checking
3583 */ 3690 */
3584int 3691int ecb_cold
3585rxvt_term::privcases (int mode, unsigned long bit) 3692rxvt_term::privcases (int mode, unsigned long bit)
3586{ 3693{
3587 int state; 3694 int state;
3588 3695
3589 if (mode == 's') 3696 if (mode == 's')
3590 { 3697 {
3591 SavedModes |= (priv_modes & bit); 3698 if (priv_modes & bit)
3699 SavedModes |= bit;
3700 else
3701 SavedModes &= ~bit;
3592 return -1; 3702 return -1;
3593 } 3703 }
3594 else 3704 else
3595 { 3705 {
3596 if (mode == 'r') 3706 if (mode == 'r')
3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3707 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598 else 3708 else
3599 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3709 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600 3710
3601 set_privmode (bit, state); 3711 if (state)
3712 priv_modes |= bit;
3713 else
3714 priv_modes &= ~bit;
3602 } 3715 }
3603 3716
3604 return state; 3717 return state;
3605} 3718}
3606 3719
… …
3615 { 3728 {
3616 const int argval; 3729 const int argval;
3617 const unsigned long bit; 3730 const unsigned long bit;
3618 } argtopriv[] = { 3731 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3732 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3733 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3734 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3735 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3736 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3737 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3738 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3739 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3740 { 9, PrivMode_MouseX10 },
3741 { 12, PrivMode_BlinkingCursor },
3628 // 18 end FF to printer after print screen 3742 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3743 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3744 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3746 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3747#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3748 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3749 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3750 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3751 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3752 // 45 margin bell NYI
3639 // 46 start logging 3753 // 46 start logging
3640 { 47, PrivMode_Screen }, 3754 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3755 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3756#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3757 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3758#endif
3645 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3647 { 1003, PrivMode_MouseAnyEvent }, 3761 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS 3762#if ENABLE_FRILLS
3763 { 1004, PrivMode_FocusEvent },
3649 { 1005, PrivMode_ExtModeMouse }, 3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3650#endif 3766#endif
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3653#if ENABLE_FRILLS 3769#if ENABLE_FRILLS
3654 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3655#endif 3771#endif
3656 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3657 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3658 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3659 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3660 // 1048 save and restore cursor, implemented in code 3776 // 1048 save and restore cursor, implemented in code
3661 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3777 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3663 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3664 }; 3782 };
3665 3783
3666 if (nargs == 0) 3784 if (nargs == 0)
3667 return; 3785 return;
3786
3787 // DECRQM
3788 if (mode == 'p')
3789 {
3790 int status = 0;
3791 if (nargs != 1)
3792 return;
3793
3794 for (j = 0; j < ecb_array_length (argtopriv); j++)
3795 if (argtopriv[j].argval == arg[0])
3796 {
3797 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3798 break;
3799 }
3800
3801 tt_printf ("\33[?%d;%d$y", arg[0], status);
3802 return;
3803 }
3668 3804
3669 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3670 if (mode == 'l') 3806 if (mode == 'l')
3671 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3672 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3711 case 2: /* VT52 mode */ 3847 case 2: /* VT52 mode */
3712 /* oddball mode. should be set regardless of set/reset 3848 /* oddball mode. should be set regardless of set/reset
3713 * parameter. Return from VT52 mode with an ESC < from 3849 * parameter. Return from VT52 mode with an ESC < from
3714 * within VT52 mode 3850 * within VT52 mode
3715 */ 3851 */
3716 set_privmode (PrivMode_vt52, 1); 3852 priv_modes |= PrivMode_vt52;
3717 break; 3853 break;
3718 case 3: /* 80/132 */ 3854 case 3: /* 80/132 */
3719 if (priv_modes & PrivMode_132OK) 3855 if (priv_modes & PrivMode_132OK)
3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3856 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721 break; 3857 break;
… …
3736 if (state) /* orthogonal */ 3872 if (state) /* orthogonal */
3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3873 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738 break; 3874 break;
3739#ifdef scrollBar_esc 3875#ifdef scrollBar_esc
3740 case scrollBar_esc: 3876 case scrollBar_esc:
3741 if (scrollBar.map (state)) 3877 scrollBar.map (state);
3742 {
3743 resize_all_windows (0, 0, 0); 3878 resize_all_windows (0, 0, 0);
3744 scr_touch (true); 3879 scr_touch (true);
3745 } 3880 break;
3881#endif
3882#ifdef CURSOR_BLINK
3883 case 12:
3884 cursor_blink_reset ();
3746 break; 3885 break;
3747#endif 3886#endif
3748 case 25: /* visible/invisible cursor */ 3887 case 25: /* visible/invisible cursor */
3749 scr_cursor_visible (state); 3888 scr_cursor_visible (state);
3750 break; 3889 break;
… …
3805 } 3944 }
3806} 3945}
3807/*}}} */ 3946/*}}} */
3808 3947
3809/*{{{ process sgr sequences */ 3948/*{{{ process sgr sequences */
3810void 3949void ecb_hot
3811rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3950rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3812{ 3951{
3813 unsigned int i; 3952 unsigned int i;
3814 short rendset; 3953 short rendset;
3815 int rendstyle; 3954 int rendstyle;
… …
3857 //case 19: // ninth alt font 3996 //case 19: // ninth alt font
3858 //case 20: // gothic 3997 //case 20: // gothic
3859 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3998 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3860 rendset = 0, rendstyle = RS_Bold; 3999 rendset = 0, rendstyle = RS_Bold;
3861 break; 4000 break;
3862 case 22: // normal intensity 4001 case 22: // bold off (vt220)
3863 rendset = 0, rendstyle = RS_Bold; 4002 rendset = 0, rendstyle = RS_Bold;
3864 break; 4003 break;
3865 case 23: // disable italic 4004 case 23: // disable italic
3866 rendset = 0, rendstyle = RS_Italic; 4005 rendset = 0, rendstyle = RS_Italic;
3867 break; 4006 break;
3868 case 24: 4007 case 24: // underline off (vt220)
3869 rendset = 0, rendstyle = RS_Uline; 4008 rendset = 0, rendstyle = RS_Uline;
3870 break; 4009 break;
3871 case 25: 4010 case 25: // blink off (vt220)
3872 rendset = 0, rendstyle = RS_Blink; 4011 rendset = 0, rendstyle = RS_Blink;
3873 break; 4012 break;
3874 case 26: // variable spacing (iso 8613) 4013 case 26: // variable spacing (iso 8613)
3875 rendset = 0, rendstyle = RS_Blink; 4014 rendset = 0, rendstyle = RS_Blink;
3876 break; 4015 break;
3877 case 27: 4016 case 27: // reverse off (vt220)
3878 rendset = 0, rendstyle = RS_RVid; 4017 rendset = 0, rendstyle = RS_RVid;
3879 break; 4018 break;
3880 //case 28: // visible. NYI 4019 //case 28: // visible. NYI
3881 //case 29: // not crossed-out 4020 //case 29: // not crossed-out
3882 } 4021 }
… …
3897 case 35: 4036 case 35:
3898 case 36: 4037 case 36:
3899 case 37: 4038 case 37:
3900 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3901 break; 4040 break;
3902 case 38: // set fg color, ISO 8613-6
3903 if (nargs > i + 2 && arg[i + 1] == 5)
3904 {
3905 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3906 i += 2;
3907 }
3908 break;
3909 case 39: /* default fg */ 4041 case 39: /* default fg */
3910 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
3911 break; 4043 break;
3912 4044
3913 case 40: 4045 case 40:
… …
3918 case 45: 4050 case 45:
3919 case 46: 4051 case 46:
3920 case 47: 4052 case 47:
3921 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3922 break; 4054 break;
3923 case 48: // set bg color, ISO 8613-6
3924 if (nargs > i + 2 && arg[i + 1] == 5)
3925 {
3926 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3927 i += 2;
3928 }
3929 break;
3930 case 49: /* default bg */ 4055 case 49: /* default bg */
3931 scr_color (Color_bg, Color_bg); 4056 scr_color (Color_bg, Color_bg);
4057 break;
4058
4059 case 38: // set fg color, ISO 8613-6
4060 case 48: // set bg color, ISO 8613-6
4061 {
4062 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4063 unsigned int idx;
4064
4065 if (nargs > i + 2 && arg[i + 1] == 5)
4066 {
4067 idx = minCOLOR + arg[i + 2];
4068 i += 2;
4069
4070 scr_color (idx, fgbg);
4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int a = 0xff;
4078
4079 idx = map_rgb24_color (r, g, b, a);
4080
4081 i += 4;
4082
4083 scr_color (idx, fgbg);
4084 }
4085 }
3932 break; 4086 break;
3933 4087
3934 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
3935 4089
3936#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL
… …
3956 break; 4110 break;
3957#endif 4111#endif
3958 } 4112 }
3959 } 4113 }
3960} 4114}
4115
4116void
4117rxvt_term::set_cursor_style (int style)
4118{
4119 if (!IN_RANGE_INC (style, 0, 6))
4120 return;
4121
4122 if (style == 0)
4123 style = 1;
4124
4125 cursor_type = (style - 1) / 2;
4126 set_option (Opt_cursorUnderline, cursor_type == 1);
4127
4128#ifdef CURSOR_BLINK
4129 set_option (Opt_cursorBlink, style & 1);
4130 cursor_blink_reset ();
4131#endif
4132
4133 want_refresh = 1;
4134}
3961/*}}} */ 4135/*}}} */
3962 4136
3963/* ------------------------------------------------------------------------- */ 4137/* ---------------------------------------------------------------------- */
4138/* Write data to the pty as typed by the user, pasted with the mouse,
4139 * or generated by us in response to a query ESC sequence.
4140 */
3964 4141
3965/* 4142/*
3966 * Send printf () formatted output to the command. 4143 * Send printf () formatted output to the command.
3967 * Only use for small amounts of data. 4144 * Only use for small amounts of data.
3968 */ 4145 */
… …
3976 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4153 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3977 va_end (arg_ptr); 4154 va_end (arg_ptr);
3978 tt_write (buf, strlen (buf)); 4155 tt_write (buf, strlen (buf));
3979} 4156}
3980 4157
3981/* ---------------------------------------------------------------------- */
3982/* Write data to the pty as typed by the user, pasted with the mouse, 4158/* Write data to the pty as typed by the user. */
3983 * or generated by us in response to a query ESC sequence. 4159void
3984 */ 4160rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4161{
4162 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4163 return;
4164
4165 if (option (Opt_scrollTtyKeypress))
4166 if (view_start)
4167 {
4168 view_start = 0;
4169 want_refresh = 1;
4170 }
4171
4172 tt_write_ (data, len);
4173}
3986 4174
3987void 4175void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4176rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4177{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4178 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991 return; 4179 return;
3992 4180
4181 tt_write_ (data, len);
4182}
4183
4184static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4185
4186void
4187rxvt_term::tt_write_ (const char *data, unsigned int len)
4188{
3993 if (pty->pty < 0) 4189 if (pty->pty < 0)
3994 return; 4190 return;
3995 4191
3996 if (v_buflen == 0) 4192 if (v_buflen == 0)
3997 { 4193 {

Diff Legend

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