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.477 by root, Mon Feb 21 07:41:00 2011 UTC vs.
Revision 1.559 by root, Fri Nov 14 10:08:20 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 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)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
489 { 704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
554 769
555 if (shft) 770 if (shft)
556 { 771 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 773 {
565 switch (keysym) 774 switch (keysym)
566 { 775 {
567 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 778 selection_request (ev.time);
570 return; 779 return;
571#if TODO 780#if TODO
572 /* rxvt extras */ 781 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 783 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 785 return;
579#endif 786#endif
580 } 787 }
581 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
582 } 804 }
583 805
584#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 807 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 863 {
642 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
643 return; 865 return;
644 } 866 }
645#endif 867#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 868 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 869
826 if (len <= 0) 870 if (len <= 0)
827 return; /* not mapped */ 871 return; /* not mapped */
828 872
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 880 KeySym keysym;
869 881
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
938#endif 950#endif
939} 951}
940 952
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 953void
975rxvt_term::flush () 954rxvt_term::flush ()
976{ 955{
977 flush_ev.stop (); 956 flush_ev.stop ();
978 957
979#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
980 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
981 { 960 {
982 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 962 scr_touch (false);
984 } 963 }
… …
1024 while (row < end_row); 1003 while (row < end_row);
1025 } 1004 }
1026 1005
1027 scr_refresh (); 1006 scr_refresh ();
1028 scrollBar.show (1); 1007 scrollBar.show (1);
1029#ifdef USE_XIM 1008#if USE_XIM
1030 IMSendSpot (); 1009 im_send_spot ();
1031#endif 1010#endif
1032 } 1011 }
1033 1012
1034 display->flush (); 1013 display->flush ();
1035} 1014}
… …
1053 flush (); 1032 flush ();
1054} 1033}
1055 1034
1056#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1057void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1053{
1060 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1055 want_refresh = 1;
1062 refresh_check (); 1056 refresh_check ();
… …
1080 1074
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1076void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1078{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1081 {
1088 want_refresh = 1; 1082 want_refresh = 1;
1089 refresh_check (); 1083 refresh_check ();
1090 } 1084 }
1091 else 1085 else
… …
1095 1089
1096#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1097void 1091void
1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1099{ 1093{
1100 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1101 { 1095 {
1102 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1103 want_refresh = 1; 1097 want_refresh = 1;
1104 refresh_check (); 1098 refresh_check ();
1105 } 1099 }
… …
1110 1104
1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112void 1106void
1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114{ 1108{
1115 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1116 { 1110 {
1117 want_refresh = 1; 1111 want_refresh = 1;
1118 refresh_check (); 1112 refresh_check ();
1119 } 1113 }
1120 1114
… …
1152 { 1146 {
1153 } 1147 }
1154} event_handler; 1148} event_handler;
1155#endif 1149#endif
1156 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1157bool 1184bool
1158rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1159{ 1186{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1161 1188
1162 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1190
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1165 n = 0;
1166 } 1192 {
1167 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1171 1198
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1200
1174 if (r > 0) 1201 if (r > 0)
1175 { 1202 {
1176 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1177 return true; 1204 return true;
… …
1208 pty_write (); 1235 pty_write ();
1209 1236
1210 refresh_check (); 1237 refresh_check ();
1211} 1238}
1212 1239
1213void 1240void ecb_cold
1214rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1215{ 1242{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1244 recolour_cursor ();
1218 1245
… …
1223 pointer_ev.start (pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1224#endif 1251#endif
1225} 1252}
1226 1253
1227#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1228void 1255void ecb_cold
1229rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1230{ 1257{
1231 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1232 return; 1259 return;
1233 1260
… …
1235 XFlush (dpy); 1262 XFlush (dpy);
1236 1263
1237 hidden_pointer = 1; 1264 hidden_pointer = 1;
1238} 1265}
1239 1266
1240void 1267void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1269{
1243 make_current (); 1270 make_current ();
1244 1271
1245 pointer_blank (); 1272 pointer_blank ();
… …
1337 32 + x, 1364 32 + x,
1338 32 + y); 1365 32 + y);
1339} 1366}
1340 1367
1341/*{{{ process an X event */ 1368/*{{{ process an X event */
1342void 1369void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1344{ 1371{
1345 make_current (); 1372 make_current ();
1346 1373
1347 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1472 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1473 focus_out ();
1447 break; 1474 break;
1448 1475
1449 case ConfigureNotify: 1476 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1451 { 1478 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1480 ;
1454 1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1486 if (bg_window_position_sensitive ())
1458 { 1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1459 int x, y; 1496 int x, y;
1497
1460 if (ev.xconfigure.send_event) 1498 if (ev.xconfigure.send_event)
1461 { 1499 {
1462 x = ev.xconfigure.x; 1500 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1501 y = ev.xconfigure.y;
1464 } 1502 }
1465 else 1503 else
1466 get_window_origin (x, y); 1504 get_window_origin (x, y);
1467 1505
1468 if (bg_set_position (x, y) 1506 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1511 moved = true;
1512 }
1471 } 1513 }
1472#endif
1473 1514
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1516 {
1476 seen_resize = 1; 1517 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1519 }
1479 else 1520 else
1480 { 1521 {
1481#ifdef HAVE_BG_PIXMAP 1522#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1523 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1524 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1525#endif
1490 } 1526 }
1491 1527
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1529 }
… …
1505 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1506 break; 1542 break;
1507 1543
1508 case MapNotify: 1544 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP 1545#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a 1546 // This is needed at startup for the case of no window manager
1511 * non-reparenting window manager. In those cases we never get first 1547 // or a non-reparenting window manager and also because we
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1548 // defer bg image updates if the window is not mapped. The
1513 * care of multiplicity of ConfigureNotify events arriving while WM does 1549 // short delay is to optimize for multiple ConfigureNotify
1514 * reparenting. 1550 // events at startup when the window manager reparents the
1515 * We should not render background immediately, as there could be several 1551 // window, so as to perform the computation after we have
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1552 // received all of them.
1517 * by scheduling background redraw as soon as we can, but giving a short 1553 if (bg_img == 0)
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025); 1554 update_background_ev.start (0.025);
1524#endif 1555#endif
1525 mapped = 1; 1556 mapped = 1;
1526#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1527 text_blink_ev.start (); 1558 text_blink_ev.start ();
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1599 ;
1569 1600
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1602 {
1572 scrollBar.state = STATE_IDLE; 1603 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1604 scrollBar.show (0);
1574 } 1605 }
1575 } 1606 }
1576 break; 1607 break;
1577 1608
… …
1619 1650
1620#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1621 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1622 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1623 { 1654 {
1655 page_dirn scroll_selection_dir;
1624 int dist; 1656 int dist;
1625 1657
1626 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1627 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1628 */ 1660 */
… …
1643 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1644 } 1676 }
1645 else 1677 else
1646 { 1678 {
1647 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1681 }
1650 1682
1651 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1685 + 1;
1654 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1655 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1656 } 1689 }
1657 else 1690 else
1658 { 1691 {
1659 /* we are within the text window, so we 1692 /* we are within the text window, so we
1660 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1665#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1666 } 1699 }
1667#endif 1700#endif
1668 } 1701 }
1669 } 1702 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1704 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1674 ; 1707 ;
1675 1708
1676 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1713 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1715 scrollBar.size ());
1683 want_refresh = 1; 1716 want_refresh = 1;
1684 scrollBar.show (1); 1717 scrollBar.show (1);
1685 } 1718 }
1686 break; 1719 break;
1687 } 1720 }
1688 1721
1689#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1724 cursor_blink_reset ();
1699 }
1700#endif 1725#endif
1701 1726
1702#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1729 {
… …
1715 1740
1716 refresh_check (); 1741 refresh_check ();
1717} 1742}
1718 1743
1719#if ENABLE_FRILLS 1744#if ENABLE_FRILLS
1720void 1745void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1746rxvt_term::set_urgency (bool enable)
1722{ 1747{
1723 if (enable == urgency_hint) 1748 if (enable == urgency_hint)
1724 return; 1749 return;
1725 1750
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1752 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1754 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1755 urgency_hint = enable;
1756 XFree (h);
1731 } 1757 }
1732} 1758}
1733#endif 1759#endif
1734 1760
1735void 1761void ecb_cold
1736rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1737{ 1763{
1738 if (!focus) 1764 if (!focus)
1739 { 1765 {
1740 focus = 1; 1766 focus = 1;
1741 want_refresh = 1; 1767 want_refresh = 1;
1742 1768
1743#if USE_XIM 1769#if USE_XIM
1744 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1745 { 1771 {
1746 IMSetPosition (); 1772 im_set_position ();
1747 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1748 } 1774 }
1749#endif 1775#endif
1750#if CURSOR_BLINK 1776#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
… …
1765 1791
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1793 }
1768} 1794}
1769 1795
1770void 1796void ecb_cold
1771rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1772{ 1798{
1773 if (focus) 1799 if (focus)
1774 { 1800 {
1775 focus = 0; 1801 focus = 0;
… …
1808 1834
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1836 }
1811} 1837}
1812 1838
1813void 1839void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1815{ 1841{
1816#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1818 { 1844 {
… …
1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1822 } 1848 }
1823#endif 1849#endif
1824} 1850}
1825 1851
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1827void 1853void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1855{
1830 make_current (); 1856 make_current ();
1831 1857
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1860 return;
1835 1861
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1862 switch (ev.type)
1838 { 1863 {
1839 case PropertyNotify: 1864 case PropertyNotify:
1840 /* 1865 /*
1841 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1842 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1843 */ 1868 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1871 {
1847 bg_set_root_pixmap (); 1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1848 update_background (); 1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1849 } 1880 }
1850 1881
1851 break; 1882 break;
1852 } 1883 }
1853# endif
1854 1884
1855 refresh_check (); 1885 refresh_check ();
1856} 1886}
1857#endif 1887#endif
1858 1888
… …
1881 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1882 return; 1912 return;
1883 } 1913 }
1884#endif 1914#endif
1885 1915
1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1887 1917
1888 if (reportmode) 1918 if (reportmode)
1889 { 1919 {
1890 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1891 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
… …
1982 if (scrollBar.upButton (ev.y)) 2012 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 2013 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 2014 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 2015 direction = DN; /* down */
1986 2016
1987 scrollBar.state = STATE_IDLE; 2017 scrollBar.state = SB_STATE_IDLE;
1988 /* 2018 /*
1989 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 2020 * move up if mouse is above slider
1991 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1992 * 2022 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2062#endif
2033 if (scr_page (direction, 1)) 2063 if (scr_page (direction, 1))
2034 { 2064 {
2035 if (direction == UP) 2065 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2066 scrollBar.state = SB_STATE_UP;
2037 else 2067 else
2038 scrollBar.state = STATE_DOWN; 2068 scrollBar.state = SB_STATE_DOWN;
2039 } 2069 }
2040 } 2070 }
2041 else 2071 else
2042 switch (ev.button) 2072 switch (ev.button)
2043 { 2073 {
2044 case Button2: 2074 case Button2:
2045 switch (scrollBar.align) 2075 switch (scrollBar.align)
2046 { 2076 {
2047 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2048 csrO = 0; 2078 csrO = 0;
2049 break; 2079 break;
2050 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2082 break;
2053 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2085 break;
2056 } 2086 }
2057 2087
2058 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2092
2063 scrollBar.state = STATE_MOTION; 2093 scrollBar.state = SB_STATE_MOTION;
2064 break; 2094 break;
2065 2095
2066 case Button1: 2096 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2070 2100
2071 case Button3: 2101 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2103 {
2074 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2077# else 2107# else
2078 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2079# endif 2109# endif
2080 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2083# else 2113# else
2084 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2085# endif 2115# endif
2086 else 2116 else
2087 scrollBar.state = STATE_MOTION; 2117 scrollBar.state = SB_STATE_MOTION;
2088 } 2118 }
2089 else 2119 else
2090 { 2120 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2122 (nrow
2093 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2124 / scrollBar.size ()));
2095 } 2125 }
2096 2126
2097 break; 2127 break;
2098 } 2128 }
… …
2109 2139
2110 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2141 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2143
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2145 {
2116 scrollBar.state = STATE_IDLE; 2146 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2147 scrollBar.show (0);
2118 } 2148 }
2119 2149
2120#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
… …
2141#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2142 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2143 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2144 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2145 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2146 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2147 { 2177 {
2148 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2149 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2150 mouse_report (ev); 2180 mouse_report (ev);
2151 } 2181 }
… …
2171 case Button3: 2201 case Button3:
2172 selection_make (ev.time); 2202 selection_make (ev.time);
2173 break; 2203 break;
2174 2204
2175 case Button2: 2205 case Button2:
2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2208 break;
2179 2209
2180#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2181 case Button4: 2211 case Button4:
2182 case Button5: 2212 case Button5:
2183 { 2213 {
2184 int i; 2214 int lines;
2185 page_dirn v; 2215 page_dirn dirn;
2186 2216
2187 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2188 2218
2189 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2190 i = 1; 2220 lines = 1;
2191 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2192 i = nrow - 1; 2222 lines = nrow - 1;
2193 else 2223 else
2194 i = 5; 2224 lines = 5;
2195 2225
2196# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2197 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2198 { 2228 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2231
2203 if (!slip_wheel_ev.is_active ()) 2232 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205 } 2234 }
2206 else 2235 else
2207# endif 2236# endif
2208 { 2237 {
2209 scr_page (v, i); 2238 scr_page (dirn, lines);
2210 scrollBar.show (1); 2239 scrollBar.show (1);
2211 } 2240 }
2212 } 2241 }
2213 break; 2242 break;
2214#endif 2243#endif
… …
2216 } 2245 }
2217} 2246}
2218 2247
2219/*}}} */ 2248/*}}} */
2220 2249
2221void 2250void ecb_hot
2222rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2223{ 2252{
2224 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2226 2255
2227 for (;;) 2256 for (;;)
2228 { 2257 {
2229 if (expect_false (ch == NOCHAR)) 2258 if (ecb_unlikely (ch == NOCHAR))
2230 { 2259 {
2231 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2261 ch = next_char ();
2233 2262
2234 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2235 break; 2264 break;
2236 } 2265 }
2237 2266
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2268 {
2240 if (expect_false (!seen_input)) 2269 if (ecb_unlikely (!seen_input))
2241 { 2270 {
2242 seen_input = 1; 2271 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2287 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2289
2261 for (;;) 2290 for (;;)
2262 { 2291 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2293 break;
2265 2294
2266 *str++ = ch; 2295 *str++ = ch;
2267 2296
2268 if (expect_false (ch == C0_LF || str >= eol)) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2298 {
2270 if (ch == C0_LF) 2299 if (ch == C0_LF)
2271 nlines++; 2300 nlines++;
2272 2301
2273 refresh_count++; 2302 refresh_count++;
… …
2345 } 2374 }
2346 } 2375 }
2347} 2376}
2348 2377
2349// read the next character 2378// read the next character
2350wchar_t 2379wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2352{ 2381{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2383 {
2355 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2358 2387
2359 wchar_t wc; 2388 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2390
… …
2367 } 2396 }
2368 2397
2369 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2370 { 2399 {
2371 mbstate.reset (); // reset now undefined conversion state 2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 } 2404 }
2374 2405
2375 // assume wchar == unicode 2406 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
… …
2379 2410
2380 return NOCHAR; 2411 return NOCHAR;
2381} 2412}
2382 2413
2383// read the next octet 2414// read the next octet
2384uint32_t 2415uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2386{ 2417{
2387 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2420 : NOCHAR;
2390} 2421}
2391 2422
2392static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2393 2424
2394/* rxvt_cmd_getc () - Return next input character */ 2425wchar_t ecb_hot
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2427{
2402 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2403 2429
2404 if (c == NOCHAR) 2430 if (c == NOCHAR)
2405 throw out_of_input; 2431 throw out_of_input;
2406 2432
2407 return c; 2433 return c;
2408} 2434}
2409 2435
2410uint32_t 2436uint32_t ecb_hot
2411rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412{ 2438{
2413 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2414 2440
2415 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2419} 2445}
2420 2446
2421/*{{{ print pipe */ 2447/*{{{ print pipe */
2422/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2423#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2424FILE * 2450FILE * ecb_cold
2425rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2426{ 2452{
2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2428 2454
2429 if (stream == NULL) 2455 if (stream == NULL)
2430 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2431 2457
2432 return stream; 2458 return stream;
2433} 2459}
2434 2460
2435int 2461int ecb_cold
2436rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2437{ 2463{
2438 fflush (stream); 2464 fflush (stream);
2439 return pclose (stream); 2465 return pclose (stream);
2440} 2466}
2441 2467
2442/* 2468/*
2443 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2444 */ 2470 */
2445void 2471void ecb_cold
2446rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2447{ 2473{
2448 FILE *fd = popen_printer (); 2474 FILE *fd = popen_printer ();
2449 2475
2450 if (!fd) 2476 if (!fd)
… …
2496 pclose_printer (fd); 2522 pclose_printer (fd);
2497} 2523}
2498#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
2499/*}}} */ 2525/*}}} */
2500 2526
2501/* *INDENT-OFF* */
2502enum { 2527enum {
2503 C1_40 = 0x40, 2528 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2533};
2509/* *INDENT-ON* */
2510 2534
2511/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2512void 2536void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2538{
2515 switch (ch) 2539 switch (ch)
2516 { 2540 {
2517 case C0_ESC: 2541 case C0_ESC:
… …
2547 scr_charset_choose (0); 2571 scr_charset_choose (0);
2548 break; 2572 break;
2549 2573
2550#ifdef EIGHT_BIT_CONTROLS 2574#ifdef EIGHT_BIT_CONTROLS
2551 // 8-bit controls 2575 // 8-bit controls
2552 case 0x90: /* DCS */ 2576 case 0x90: /* DCS */
2553 process_dcs_seq (); 2577 process_dcs_seq ();
2554 break; 2578 break;
2555 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
2556 process_csi_seq (); 2580 process_csi_seq ();
2557 break; 2581 break;
2558 case 0x9d: /* OSC */ 2582 case 0x9d: /* OSC */
2559 process_osc_seq (); 2583 process_osc_seq ();
2560 break; 2584 break;
2561#endif 2585#endif
2562 } 2586 }
2563} 2587}
2564/*}}} */ 2588/*}}} */
2565 2589
2566 2590
2567/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
2568void 2592void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2594{
2571 int row, col; 2595 int row, col;
2572 2596
2573 switch (ch) 2597 switch (ch)
… …
2607 break; 2631 break;
2608 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2634 break;
2611 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2636 priv_modes &= ~PrivMode_vt52;
2613 break; 2637 break;
2614 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
2616 /* unimplemented */ 2640 /* unimplemented */
2617 break; 2641 break;
… …
2623} 2647}
2624/*}}} */ 2648/*}}} */
2625 2649
2626 2650
2627/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
2628void 2652void ecb_hot
2629rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
2630{ 2654{
2631 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
2632 2656
2633 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
2636 return; 2660 return;
2637 } 2661 }
2638 2662
2639 switch (ch) 2663 switch (ch)
2640 { 2664 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2665 case '#':
2643 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
2644 scr_E (); 2667 scr_E ();
2645 break; 2668 break;
2646 case '(': 2669 case '(':
… …
2669#if !ENABLE_MINIMAL 2692#if !ENABLE_MINIMAL
2670 case '9': 2693 case '9':
2671 scr_forwardindex (); 2694 scr_forwardindex ();
2672 break; 2695 break;
2673#endif 2696#endif
2697 // DECPAM/DECPNM
2674 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
2675 case '>': 2701 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2702 priv_modes &= ~PrivMode_aplKP;
2677 break; 2703 break;
2678 2704
2679 case C1_40: 2705 case C1_40:
2680 cmd_getc (); 2706 cmd_getc ();
2681 break; 2707 break;
… …
2685 2711
2686 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
2688 { 2714 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2717 }
2692 break; 2718 break;
2693 2719
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
2696 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2725 break;
2698 2726
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2729 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
2706 scr_index (DN); 2734 scr_index (DN);
2707 break; 2735 break;
2708 2736
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
2711 2739
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
2714 2742
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2745 process_dcs_seq ();
2718 break; 2746 break;
… …
2751 } 2779 }
2752} 2780}
2753/*}}} */ 2781/*}}} */
2754 2782
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2784enum {
2758 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2783 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2784 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2785 }; 2812 };
2786/* *INDENT-ON* */
2787 2813
2788void 2814void ecb_hot
2789rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2790{ 2816{
2791 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2792 unsigned int nargs, p; 2818 unsigned int nargs, p;
2793 int n, ndef; 2819 int n, ndef;
2794 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2795 2821
2796 nargs = 0; 2822 nargs = 0;
… …
2802 /* '<' '=' '>' '?' '!' */ 2828 /* '<' '=' '>' '?' '!' */
2803 priv = ch; 2829 priv = ch;
2804 ch = cmd_getc (); 2830 ch = cmd_getc ();
2805 } 2831 }
2806 2832
2833 prev_ch = 0;
2807 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2808 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2809 { 2836 {
2810 if (isdigit (ch)) 2837 if (isdigit (ch))
2811 { 2838 {
… …
2821 n = -1; 2848 n = -1;
2822 } 2849 }
2823 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2824 process_nonprinting (ch); 2851 process_nonprinting (ch);
2825 2852
2853 prev_ch = ch;
2826 ch = cmd_getc (); 2854 ch = cmd_getc ();
2827 } 2855 }
2828 2856
2829 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2830 return; 2858 return;
… …
2871 scr_soft_reset (); 2899 scr_soft_reset ();
2872 2900
2873 static const int pm_h[] = { 7, 25 }; 2901 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875 2903
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878 } 2906 }
2879 break; 2907 break;
2880 } 2908 }
2881 2909
2882 return; 2910 return;
… …
2900 } 2928 }
2901 break; 2929 break;
2902#endif 2930#endif
2903 2931
2904 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2905 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2906 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
2907 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
2908 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2909 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2910 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
2911 break; 2939 break;
2912 2940
2913 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2914 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3064 scr_insert_mode (1); 3092 scr_insert_mode (1);
3065 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3066 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3067 break; 3095 break;
3068 3096
3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3069 /* 3102 /*
3070 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3071 */ 3104 */
3072 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3073 if (nargs == 1) 3106 if (nargs == 1)
… …
3101 } 3134 }
3102} 3135}
3103/*}}} */ 3136/*}}} */
3104 3137
3105#if !ENABLE_MINIMAL 3138#if !ENABLE_MINIMAL
3106/* ARGSUSED */
3107void 3139void
3108rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109{ 3141{
3110 int x, y; 3142 int x, y;
3111 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
… …
3120 { 3152 {
3121 /* 3153 /*
3122 * commands 3154 * commands
3123 */ 3155 */
3124 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3125 XMapWindow (dpy, parent[0]); 3157 XMapWindow (dpy, parent);
3126 break; 3158 break;
3127 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3128 XIconifyWindow (dpy, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3129 break; 3161 break;
3130 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3131 XMoveWindow (dpy, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3132 break; 3164 break;
3133 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135 break; 3167 break;
3136 case 5: /* raise window */ 3168 case 5: /* raise window */
3137 XRaiseWindow (dpy, parent[0]); 3169 XRaiseWindow (dpy, parent);
3138 break; 3170 break;
3139 case 6: /* lower window */ 3171 case 6: /* lower window */
3140 XLowerWindow (dpy, parent[0]); 3172 XLowerWindow (dpy, parent);
3141 break; 3173 break;
3142 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3143 scr_touch (true); 3175 scr_touch (true);
3144 break; 3176 break;
3145 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3148 break; 3180 break;
3149 3181
3150 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3151 default: 3183 default:
3152 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3153 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3154 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3155 break; 3187 break;
3156 3188
3157 /* 3189 /*
3158 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3159 */ 3191 */
3160 case 11: /* report window state */ 3192 case 11: /* report window state */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163 break; 3195 break;
3164 case 13: /* report window position */ 3196 case 13: /* report window position */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3166 XTranslateCoordinates (dpy, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3167 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3168 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3169 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3170 break; 3202 break;
3171 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174 break; 3206 break;
3175 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3176 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177 break; 3209 break;
… …
3179 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180 break; 3212 break;
3181 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3182 { 3214 {
3183 char *s; 3215 char *s;
3184 XGetIconName (dpy, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3186 XFree (s); 3218 XFree (s);
3187 } 3219 }
3188 break; 3220 break;
3189 case 21: /* report window title */ 3221 case 21: /* report window title */
3190 { 3222 {
3191 char *s; 3223 char *s;
3192 XFetchName (dpy, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3194 XFree (s); 3226 XFree (s);
3195 } 3227 }
3196 break; 3228 break;
3197 } 3229 }
… …
3207rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3208{ 3240{
3209 unicode_t ch; 3241 unicode_t ch;
3210 bool seen_esc = false; 3242 bool seen_esc = false;
3211 unsigned int n = 0; 3243 unsigned int n = 0;
3212 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3213 3245
3214 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3215 { 3247 {
3216 if (seen_esc) 3248 if (seen_esc)
3217 { 3249 {
… …
3232 else if (ch < 0x20) 3264 else if (ch < 0x20)
3233 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3234 3266
3235 seen_esc = false; 3267 seen_esc = false;
3236 3268
3237 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3238 // stop at some sane length 3270 // stop at some sane length
3239 return NULL; 3271 return NULL;
3240 3272
3241 string[n++] = ch; 3273 string[n++] = ch;
3242 } 3274 }
… …
3351 unsigned long bytes_after; 3383 unsigned long bytes_after;
3352 unsigned char *value = 0; 3384 unsigned char *value = 0;
3353 const char *str = ""; 3385 const char *str = "";
3354 3386
3355 if (prop 3387 if (prop
3356 && XGetWindowProperty (dpy, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3357 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3358 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3359 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3360 && actual_type != None 3392 && actual_type != None
3361 && actual_format == 8) 3393 && actual_format == 8)
3362 str = (const char *)(value); 3394 str = (const char *)(value);
3363 3395
3364 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3365 3397
3366 XFree (value); 3398 XFree (value);
3367 } 3399 }
3368 else 3400 else
3369 { 3401 {
… …
3373 { 3405 {
3374 *eq = 0; 3406 *eq = 0;
3375 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3376 } 3408 }
3377 else 3409 else
3378 XDeleteProperty (dpy, parent[0], 3410 XDeleteProperty (dpy, parent,
3379 display->atom (str)); 3411 display->atom (str));
3380 } 3412 }
3381 break; 3413 break;
3382 3414
3383 case XTerm_Color: 3415 case XTerm_Color:
… …
3437 break; 3469 break;
3438#endif 3470#endif
3439 case URxvt_Color_border: 3471 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp); 3472 process_color_seq (op, Color_border, str, resp);
3441 break; 3473 break;
3442#if ENABLE_TRANSPARENCY 3474
3475#if BG_IMAGE_FROM_ROOT
3443 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3444 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3445 { 3478 {
3446 bool changed = false; 3479 bool changed = false;
3447 3480
3448 if (ISSET_PIXCOLOR (Color_tint)) 3481 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3450 3483
3451 if (changed) 3484 if (changed)
3452 update_background (); 3485 update_background ();
3453 } 3486 }
3454 3487
… …
3458#if BG_IMAGE_FROM_FILE 3491#if BG_IMAGE_FROM_FILE
3459 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3460 if (!strcmp (str, "?")) 3493 if (!strcmp (str, "?"))
3461 { 3494 {
3462 char str[256]; 3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3463 3500
3464 sprintf (str, "[%dx%d+%d+%d]", 3501 sprintf (str, "[%dx%d+%d+%d]",
3465 min (h_scale, 32767), min (v_scale, 32767), 3502 h_scale, v_scale,
3466 min (h_align, 32767), min (v_align, 32767)); 3503 h_align, v_align);
3467 process_xterm_seq (XTerm_title, str, CHAR_ST); 3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3468 } 3505 }
3469 else 3506 else
3470 { 3507 {
3471 int changed = 0; 3508 bool changed = false;
3472 3509
3473 if (*str != ';') 3510 if (*str != ';')
3474 { 3511 {
3475 if (bg_set_file (str)) /* change pixmap */ 3512 try
3476 { 3513 {
3514 fimage.set_file_geometry (this, str);
3477 changed++; 3515 changed = true;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else 3516 }
3482 bg_set_geometry (str+1); 3517 catch (const class rxvt_failure_exception &e)
3518 {
3483 } 3519 }
3484 } 3520 }
3485 else 3521 else
3486 { 3522 {
3487 str++; 3523 str++;
3488 if (bg_set_geometry (str, true)) 3524 if (fimage.set_geometry (str, true))
3489 changed++; 3525 changed = true;
3490 } 3526 }
3491 3527
3492 if (changed) 3528 if (changed)
3493 { 3529 {
3494 if (bg_window_position_sensitive ()) 3530 if (bg_window_position_sensitive ())
3495 { 3531 {
3496 int x, y; 3532 int x, y;
3497 get_window_origin (x, y); 3533 get_window_origin (x, y);
3498 bg_set_position (x, y); 3534 parent_x = x;
3535 parent_y = y;
3499 } 3536 }
3500 update_background (); 3537 update_background ();
3501 } 3538 }
3502 } 3539 }
3503 break; 3540 break;
… …
3593 * 's' = save 3630 * 's' = save
3594 * 'r' = restore 3631 * 'r' = restore
3595 * 't' = toggle 3632 * 't' = toggle
3596 * so no need for fancy checking 3633 * so no need for fancy checking
3597 */ 3634 */
3598int 3635int ecb_cold
3599rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
3600{ 3637{
3601 int state; 3638 int state;
3602 3639
3603 if (mode == 's') 3640 if (mode == 's')
3604 { 3641 {
3605 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
3606 return -1; 3646 return -1;
3607 } 3647 }
3608 else 3648 else
3609 { 3649 {
3610 if (mode == 'r') 3650 if (mode == 'r')
3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3612 else 3652 else
3613 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614 3654
3615 set_privmode (bit, state); 3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
3616 } 3659 }
3617 3660
3618 return state; 3661 return state;
3619} 3662}
3620 3663
3621/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
3622void 3665void
3623rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3624{ 3667{
3625 unsigned int i, j; 3668 unsigned int i, j;
3626 int state; 3669 int state;
3627 3670
3628 static const struct 3671 static const struct
3629 { 3672 {
3630 const int argval; 3673 const int argval;
3631 const unsigned long bit; 3674 const unsigned long bit;
3632 } argtopriv[] = { 3675 } argtopriv[] = {
3633 { 1, PrivMode_aplCUR }, // DECCKM 3676 { 1, PrivMode_aplCUR }, // DECCKM
3634 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
3635 { 3, PrivMode_132 }, // DECCOLM 3678 { 3, PrivMode_132 }, // DECCOLM
3636 { 4, PrivMode_smoothScroll }, // DECSCLM 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
3637 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3638 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3639 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3640 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3641 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3642 // 18 end FF to printer after print screen 3685 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region 3686 // 19 Print screen prints full screen/scroll region
3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
3646 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
3647#endif 3690#endif
3648 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK 3692 // 38, tektronix mode // DECTEK
3650 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
3651 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
3652 // 45 margin bell NYI 3695 // 45 margin bell NYI
3653 // 46 start logging 3696 // 46 start logging
3654 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3698 { 66, PrivMode_aplKP }, // DECNKM
3656#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
3657 { 67, PrivMode_BackSpace }, // DECBKM 3700 { 67, PrivMode_BackSpace }, // DECBKM
3658#endif 3701#endif
3659 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
3660 { 1002, PrivMode_MouseBtnEvent }, 3703 { 1002, PrivMode_MouseBtnEvent },
… …
3689 for (i = 0; i < nargs; i++) 3732 for (i = 0; i < nargs; i++)
3690 { 3733 {
3691 state = -1; 3734 state = -1;
3692 3735
3693 /* basic handling */ 3736 /* basic handling */
3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3737 for (j = 0; j < ecb_array_length (argtopriv); j++)
3695 if (argtopriv[j].argval == arg[i]) 3738 if (argtopriv[j].argval == arg[i])
3696 { 3739 {
3697 state = privcases (mode, argtopriv[j].bit); 3740 state = privcases (mode, argtopriv[j].bit);
3698 break; 3741 break;
3699 } 3742 }
… …
3725 case 2: /* VT52 mode */ 3768 case 2: /* VT52 mode */
3726 /* oddball mode. should be set regardless of set/reset 3769 /* oddball mode. should be set regardless of set/reset
3727 * parameter. Return from VT52 mode with an ESC < from 3770 * parameter. Return from VT52 mode with an ESC < from
3728 * within VT52 mode 3771 * within VT52 mode
3729 */ 3772 */
3730 set_privmode (PrivMode_vt52, 1); 3773 priv_modes |= PrivMode_vt52;
3731 break; 3774 break;
3732 case 3: /* 80/132 */ 3775 case 3: /* 80/132 */
3733 if (priv_modes & PrivMode_132OK) 3776 if (priv_modes & PrivMode_132OK)
3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3777 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3735 break; 3778 break;
… …
3750 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3794 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3752 break; 3795 break;
3753#ifdef scrollBar_esc 3796#ifdef scrollBar_esc
3754 case scrollBar_esc: 3797 case scrollBar_esc:
3755 if (scrollBar.map (state)) 3798 scrollBar.map (state);
3756 {
3757 resize_all_windows (0, 0, 0); 3799 resize_all_windows (0, 0, 0);
3758 scr_touch (true); 3800 scr_touch (true);
3759 }
3760 break; 3801 break;
3761#endif 3802#endif
3762 case 25: /* visible/invisible cursor */ 3803 case 25: /* visible/invisible cursor */
3763 scr_cursor_visible (state); 3804 scr_cursor_visible (state);
3764 break; 3805 break;
… …
3819 } 3860 }
3820} 3861}
3821/*}}} */ 3862/*}}} */
3822 3863
3823/*{{{ process sgr sequences */ 3864/*{{{ process sgr sequences */
3824void 3865void ecb_hot
3825rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3866rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3826{ 3867{
3827 unsigned int i; 3868 unsigned int i;
3828 short rendset; 3869 short rendset;
3829 int rendstyle; 3870 int rendstyle;
… …
3970 break; 4011 break;
3971#endif 4012#endif
3972 } 4013 }
3973 } 4014 }
3974} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 6))
4021 return;
4022
4023 if (style == 0)
4024 style = 1;
4025
4026 cursor_type = (style - 1) / 2;
4027 set_option (Opt_cursorUnderline, cursor_type == 1);
4028
4029#ifdef CURSOR_BLINK
4030 set_option (Opt_cursorBlink, style & 1);
4031 cursor_blink_reset ();
4032#endif
4033
4034 want_refresh = 1;
4035}
3975/*}}} */ 4036/*}}} */
3976 4037
3977/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3978void
3979rxvt_term::process_graphics ()
3980{
3981 unicode_t ch, cmd = cmd_getc ();
3982
3983 if (cmd == 'Q')
3984 {
3985 /* query graphics */
3986 tt_printf ("\033G0\012"); /* no graphics */
3987 return;
3988 }
3989 /* swallow other graphics sequences until terminating ':' */
3990 do
3991 ch = cmd_getc ();
3992 while (ch != ':');
3993}
3994/*}}} */
3995
3996/* ------------------------------------------------------------------------- */ 4038/* ---------------------------------------------------------------------- */
4039/* Write data to the pty as typed by the user, pasted with the mouse,
4040 * or generated by us in response to a query ESC sequence.
4041 */
3997 4042
3998/* 4043/*
3999 * Send printf () formatted output to the command. 4044 * Send printf () formatted output to the command.
4000 * Only use for small amounts of data. 4045 * Only use for small amounts of data.
4001 */ 4046 */
… …
4009 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4054 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4010 va_end (arg_ptr); 4055 va_end (arg_ptr);
4011 tt_write (buf, strlen (buf)); 4056 tt_write (buf, strlen (buf));
4012} 4057}
4013 4058
4014/* ---------------------------------------------------------------------- */
4015/* Write data to the pty as typed by the user, pasted with the mouse, 4059/* Write data to the pty as typed by the user. */
4016 * or generated by us in response to a query ESC sequence. 4060void
4017 */ 4061rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4062{
4063 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4064 return;
4065
4066 if (option (Opt_scrollTtyKeypress))
4067 if (view_start)
4068 {
4069 view_start = 0;
4070 want_refresh = 1;
4071 }
4072
4073 tt_write_ (data, len);
4074}
4019 4075
4020void 4076void
4021rxvt_term::tt_write (const char *data, unsigned int len) 4077rxvt_term::tt_write (const char *data, unsigned int len)
4022{ 4078{
4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4079 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4024 return; 4080 return;
4025 4081
4082 tt_write_ (data, len);
4083}
4084
4085static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4086
4087void
4088rxvt_term::tt_write_ (const char *data, unsigned int len)
4089{
4026 if (pty->pty < 0) 4090 if (pty->pty < 0)
4027 return; 4091 return;
4028 4092
4029 if (v_buflen == 0) 4093 if (v_buflen == 0)
4030 { 4094 {
4031 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4095 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4032 4096
4097 max_it (written, 0);
4098
4033 if ((unsigned int)written == len) 4099 if (written == len)
4034 return; 4100 return;
4035 4101
4036 data += written; 4102 data += written;
4037 len -= written; 4103 len -= written;
4038 } 4104 }

Diff Legend

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