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.363 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

… …
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
472 selection_request (ev.time); 569 selection_request (ev.time);
473 return; 570 return;
474#if TODO 571#if TODO
475 /* rxvt extras */ 572 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 574 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 576 return;
482#endif 577#endif
483 } 578 }
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
551 { 656 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
553 newlen = 1; 687 newlen = 0;
554 switch (keysym) 688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
555 { 771 {
556#ifndef NO_BACKSPACE_KEY 772 int param = map_function_key (keysym);
557 case XK_BackSpace: 773 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 774 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 775 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Down: /* \033Or or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 776 newlen = 0;
840 break;
841 } 777 }
842 778 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
846 783
847 /* 784 /*
848 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
849 */ 786 */
850#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
950 commit_iso14755 (); 887 commit_iso14755 ();
951 888
952 return; 889 return;
953 } 890 }
954 891
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 893 if (i[0] == keysym)
957 { 894 {
958 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 896 commit_iso14755 ();
960 897
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
999#endif 936#endif
1000} 937}
1001 938
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 939void
1036rxvt_term::flush () 940rxvt_term::flush ()
1037{ 941{
1038 flush_ev.stop (); 942 flush_ev.stop ();
1039 943
1040#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 946 {
1043// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 948 scr_touch (false);
1045 } 949 }
1046#endif 950#endif
1047 951
1048 if (want_refresh) 952 if (want_refresh)
… …
1084 } 988 }
1085 while (row < end_row); 989 while (row < end_row);
1086 } 990 }
1087 991
1088 scr_refresh (); 992 scr_refresh ();
1089 scrollbar_show (1); 993 scrollBar.show (1);
1090#ifdef USE_XIM 994#ifdef USE_XIM
1091 IMSendSpot (); 995 IMSendSpot ();
1092#endif 996#endif
1093 } 997 }
1094 998
1095 display->flush (); 999 display->flush ();
1096} 1000}
1097 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
1098void 1003void
1099rxvt_term::prepare_cb (ev::prepare &w, int revents) 1004rxvt_term::refresh_check ()
1100{ 1005{
1101 make_current (); 1006 if (want_refresh && !flush_ev.is_active ())
1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1008
1103 display->flush (); 1009 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1010}
1108 1011
1109void 1012void
1110rxvt_term::flush_cb (ev::timer &w, int revents) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1014{
… …
1119void 1022void
1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1024{
1122 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1026 want_refresh = 1;
1027 refresh_check ();
1124} 1028}
1125#endif 1029#endif
1126 1030
1127#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1128void 1032void
… …
1130{ 1034{
1131 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1132 { 1036 {
1133 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1134 want_refresh = 1; 1038 want_refresh = 1;
1039 refresh_check ();
1135 } 1040 }
1136}
1137#endif
1138
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1145 want_refresh = 1;
1146 else 1041 else
1147 w.stop (); 1042 w.stop ();
1148} 1043}
1149#endif 1044#endif
1150 1045
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1052 {
1053 want_refresh = 1;
1054 refresh_check ();
1055 }
1056 else
1057 w.stop ();
1058}
1059#endif
1060
1151#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1152void 1062void
1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1154{ 1064{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1156 { 1066 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1; 1068 want_refresh = 1;
1069 refresh_check ();
1159 } 1070 }
1160 else 1071 else
1161 w.stop (); 1072 w.stop ();
1162} 1073}
1163#endif 1074#endif
1164 1075
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void 1077void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{ 1079{
1169 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 { 1081 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1; 1082 want_refresh = 1;
1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1177 } 1087 {
1178 else 1088 mouse_slip_wheel_speed = 0;
1179 w.stop (); 1089 w.stop ();
1090 }
1180} 1091}
1181#endif 1092#endif
1182 1093
1183#if LINUX_YIELD_HACK 1094#if LINUX_YIELD_HACK
1184static struct event_handler 1095static struct event_handler
… …
1189 { 1100 {
1190 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is 1103 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1194 1108
1195 struct timespec ts = { 0, 0 }; 1109 struct timespec ts = { 0, 1000 };
1196 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1197 1111
1198 w.stop (); 1112 w.stop ();
1199 } 1113 }
1200 1114
… …
1203 { 1117 {
1204 } 1118 }
1205} event_handler; 1119} event_handler;
1206#endif 1120#endif
1207 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1208bool 1155bool
1209rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1210{ 1157{
1211 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1212 1159
1213 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1214 { 1161
1215 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1216 n = 0;
1217 } 1163 {
1218 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1219 memmove (cmdbuf_base, cmdbuf_ptr, n);
1220 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1221 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1222 1169
1223 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1224 1171
1225 if (r > 0) 1172 if (r > 0)
1226 { 1173 {
1227 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1228 return true; 1175 return true;
… …
1250{ 1197{
1251 make_current (); 1198 make_current ();
1252 1199
1253 if (revents & ev::READ) 1200 if (revents & ev::READ)
1254 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1255 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1256 if (cmd_parse ()) 1203 cmd_parse ();
1257 break;
1258 1204
1259 if (revents & ev::WRITE) 1205 if (revents & ev::WRITE)
1260 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1261} 1209}
1262 1210
1263void 1211void
1264rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1265{ 1213{
… …
1301{ 1249{
1302 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1303 int x, y; 1251 int x, y;
1304 int code = 32; 1252 int code = 32;
1305 1253
1306 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1307 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1308 if (ev.type == MotionNotify) { 1257 if (ev.type == MotionNotify)
1258 {
1309 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1310 return; 1260 return;
1261
1311 mouse_row = x; 1262 mouse_row = x;
1312 mouse_col = y; 1263 mouse_col = y;
1313 code += 32; 1264 code += 32;
1314 } 1265 }
1315 1266
1316 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1317 button_number = 3; 1268 button_number = 3;
1318 else 1269 else
1319 { 1270 {
1320 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1321 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1322 if (button_number >= 3) 1273 if (button_number >= 3)
1323 button_number += (64 - 3); 1274 button_number += 64 - 3;
1324 } 1275 }
1325 1276
1326 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1327 { 1278 {
1328 /* 1279 /*
… …
1360 fputc ('A', stderr); 1311 fputc ('A', stderr);
1361 if (key_state & 32) 1312 if (key_state & 32)
1362 fputc ('2', stderr); 1313 fputc ('2', stderr);
1363 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1364 button_number, 1315 button_number,
1365 x + 1, 1316 x,
1366 y + 1); 1317 y);
1367#endif 1318#endif
1368 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1369 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1370 (code + button_number + key_state), 1334 code + button_number + key_state,
1371 (32 + x + 1), 1335 32 + x,
1372 (32 + y + 1)); 1336 32 + y);
1373} 1337}
1374 1338
1375/*{{{ process an X event */ 1339/*{{{ process an X event */
1376void 1340void
1377rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1479 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1444 focus_out ();
1481 break; 1445 break;
1482 1446
1483 case ConfigureNotify: 1447 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1487 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1488 { 1449 {
1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1491 1471
1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1493 { 1473 {
1494 seen_resize = 1; 1474 seen_resize = 1;
1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1496 } 1476 }
1497 else 1477 else
1498 { 1478 {
1499#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1481 {
1482 if (mapped)
1501 update_background (); 1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1502#endif 1487#endif
1503 } 1488 }
1489
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 } 1491 }
1506 break; 1492 break;
1507 1493
1508 case PropertyNotify: 1494 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513
1514 break; 1496 break;
1515 1497
1516 case SelectionClear: 1498 case SelectionClear:
1517 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1518 break;
1519
1520 case SelectionNotify:
1521 if (selection_wait == Sel_normal)
1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1523 break; 1500 break;
1524 1501
1525 case SelectionRequest: 1502 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1527 break; 1504 break;
1528 1505
1529 case MapNotify: 1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1530 mapped = 1; 1523 mapped = 1;
1531#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1525 text_blink_ev.start ();
1533#endif 1526#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1528 break;
1536 1529
1537 case UnmapNotify: 1530 case UnmapNotify:
… …
1547 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1548 { 1541 {
1549 do 1542 do
1550 { 1543 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1553 } 1546 }
1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555 1548
1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557 1550
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 { 1552 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1562 } 1555 }
1556
1563 want_refresh = 1; 1557 want_refresh = 1;
1564 } 1558 }
1565 else 1559 else
1566 { 1560 {
1567 XEvent unused_event; 1561 XEvent unused_event;
… …
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1564 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1566 ;
1573 1567
1574 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1569 {
1576 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1571 scrollBar.show (0);
1578 } 1572 }
1579 } 1573 }
1580 break; 1574 break;
1581 1575
1582 case MotionNotify: 1576 case MotionNotify:
… …
1628 int dist; 1622 int dist;
1629 1623
1630 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1632 */ 1626 */
1633 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1629
1636 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1638 */ 1632 */
… …
1661 else 1655 else
1662 { 1656 {
1663 /* we are within the text window, so we 1657 /* we are within the text window, so we
1664 * shouldn't be scrolling 1658 * shouldn't be scrolling
1665 */ 1659 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1668 } 1661 }
1669#endif 1662#endif
1670#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1671 } 1664 }
1672#endif 1665#endif
1673 } 1666 }
1674 } 1667 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1669 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1679 ; 1672 ;
1680 1673
… …
1682 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1678 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1680 scrollBar.size ());
1688 want_refresh = 1; 1681 want_refresh = 1;
1689 scrollbar_show (1); 1682 scrollBar.show (1);
1690 } 1683 }
1691 break; 1684 break;
1692 } 1685 }
1693 1686
1694#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
… …
1715 1708
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1710 pointer_blank ();
1718 } 1711 }
1719#endif 1712#endif
1713
1714 refresh_check ();
1720} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1721 1732
1722void 1733void
1723rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1724{ 1735{
1725 if (!focus) 1736 if (!focus)
1726 { 1737 {
1727 focus = 1; 1738 focus = 1;
1728 want_refresh = 1; 1739 want_refresh = 1;
1729 1740
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM 1741#if USE_XIM
1733 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1734 { 1743 {
1735 IMSetPosition (); 1744 IMSetPosition ();
1736 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1737 } 1746 }
1738#endif 1747#endif
1739#if CURSOR_BLINK 1748#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1742#endif 1751#endif
1743#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1745 { 1754 {
1746 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1747 scr_recolour (); 1756 scr_recolour ();
1748 } 1757 }
1749#endif 1758#endif
1750#if ENABLE_FRILLS 1759#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1760 if (option (Opt_urgentOnBell))
1752 { 1761 set_urgency (0);
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif 1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 } 1765 }
1761} 1766}
1762 1767
1763void 1768void
1764rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1766 if (focus) 1771 if (focus)
1767 { 1772 {
1768 focus = 0; 1773 focus = 0;
1769 want_refresh = 1; 1774 want_refresh = 1;
1770 1775
1771 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1772 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1773#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1774 if (iso14755buf) 1781 if (iso14755buf)
1775 { 1782 {
1776 iso14755buf = 0; 1783 iso14755buf = 0;
1777# if ISO_14755 1784# if ISO_14755
… …
1794 { 1801 {
1795 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1796 scr_recolour (); 1803 scr_recolour ();
1797 } 1804 }
1798#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1799 } 1808 }
1800} 1809}
1801 1810
1802void 1811void
1803rxvt_term::update_fade_color (unsigned int idx) 1812rxvt_term::update_fade_color (unsigned int idx)
… …
1831 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1832 */ 1841 */
1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 { 1844 {
1836 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1837 update_background (); 1846 update_background ();
1838 } 1847 }
1848
1839 break; 1849 break;
1840 } 1850 }
1841# endif 1851# endif
1852
1853 refresh_check ();
1842} 1854}
1843#endif 1855#endif
1844 1856
1845void 1857void
1846rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1877 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1878 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1879#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1880 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1881 { 1893 {
1882 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1883 MEvent.clicks++; 1895 MEvent.clicks++;
1884 1896
1885 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1886 { 1898 {
1887 /* only report double clicks */ 1899 /* only report double clicks */
… …
1901 mouse_report (ev); 1913 mouse_report (ev);
1902 } 1914 }
1903#else 1915#else
1904 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1905 mouse_report (ev); 1917 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1919
1908 } 1920 }
1909 else 1921 else
1910 { 1922 {
1911 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1959 } 1971 }
1960 1972
1961 /* 1973 /*
1962 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1963 */ 1975 */
1964 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1965 { 1977 {
1966 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1967 /* 1986 /*
1968 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 1988 * move up if mouse is above slider
1970 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1971 * 1990 *
… …
1980 /* 1999 /*
1981 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1982 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1983 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1984 */ 2003 */
1985 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1986 && scrollbarnext_upButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_upButton (ev.y)))
1989 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1990 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1991 && scrollbarnext_dnButton (ev.y))
1992 || (scrollBar.style == R_SB_RXVT
1993 && scrollbarrxvt_dnButton (ev.y)))
1994 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1995 else 2008 else
1996 switch (ev.button) 2009 switch (ev.button)
1997 { 2010 {
1998 case Button2: 2011 case Button2:
… …
2005 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
2006 break; 2019 break;
2007 } 2020 }
2008 } 2021 }
2009 else 2022 else
2010#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
2011
2012 {
2013 char upordown = 0;
2014
2015 if (scrollBar.style == R_SB_NEXT)
2016 { 2024 {
2017 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
2018 upordown = -1; /* up */
2019 else if (scrollbarnext_dnButton (ev.y))
2020 upordown = 1; /* down */
2021 }
2022 else if (scrollBar.style == R_SB_RXVT)
2023 {
2024 if (scrollbarrxvt_upButton (ev.y))
2025 upordown = -1; /* up */
2026 else if (scrollbarrxvt_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 if (upordown)
2030 { 2026 {
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2033#endif 2030#endif
2034 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
2035 { 2032 {
2036 if (upordown < 0) 2033 if (direction == UP)
2037 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
2038 else 2035 else
2039 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2040 } 2037 }
2041 } 2038 }
2042 else 2039 else
2043 switch (ev.button) 2040 switch (ev.button)
2044 { 2041 {
2045 case Button2: 2042 case Button2:
2046 switch (scrollbar_align) 2043 switch (scrollBar.align)
2047 { 2044 {
2048 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2049 csrO = 0; 2046 csrO = 0;
2050 break; 2047 break;
2051 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2057 } 2054 }
2058 2055
2059 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2060 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2061 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2063 2060
2064 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2065 break; 2062 break;
2066 2063
2067 case Button1: 2064 case Button1:
2068 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2069 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2070 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2071 2068
2072 case Button3: 2069 case Button3:
2073 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2083 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2084# else 2081# else
2085 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2086# endif 2083# endif
2087 else 2084 else
2088 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2089 } 2086 }
2090 else 2087 else
2091 { 2088 {
2092 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2093 (nrow 2090 (nrow
2094 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2095 / scrollbar_size ())); 2092 / scrollBar.size ()));
2096 } 2093 }
2097 2094
2098 break; 2095 break;
2099 } 2096 }
2100 } 2097 }
… …
2110 2107
2111 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2109 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2111
2115 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2116 { 2113 {
2117 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2118 scrollbar_show (0); 2115 scrollBar.show (0);
2119 } 2116 }
2120 2117
2121#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2124#endif 2120#endif
2125 2121
2126 if (ev.window == vt) 2122 if (ev.window == vt)
2127 { 2123 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2124 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2152 mouse_report (ev); 2148 mouse_report (ev);
2153 } 2149 }
2154#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2155 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2156 mouse_report (ev); 2152 mouse_report (ev);
2157#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2158 return; 2154 return;
2159 } 2155 }
2160 2156
2161 /* 2157 /*
2162 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2174 selection_make (ev.time); 2170 selection_make (ev.time);
2175 break; 2171 break;
2176 2172
2177 case Button2: 2173 case Button2:
2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2180 break; 2176 break;
2181 2177
2182#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2183 case Button4: 2179 case Button4:
2184 case Button5: 2180 case Button5:
… …
2200 { 2196 {
2201 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204 2200
2201 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 } 2203 }
2207 else 2204 else
2205# endif
2208 { 2206 {
2209# endif
2210 scr_page (v, i); 2207 scr_page (v, i);
2211 scrollbar_show (1); 2208 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2209 }
2214# endif
2215 } 2210 }
2216 break; 2211 break;
2217#endif 2212#endif
2218 } 2213 }
2219 } 2214 }
2220} 2215}
2221 2216
2222/*}}} */ 2217/*}}} */
2223 2218
2224bool 2219void
2225rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2226{ 2221{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2230 2224
2231 for (;;) 2225 for (;;)
2232 { 2226 {
2233 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2234 { 2228 {
2235 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2230 ch = next_char ();
2237 2231
2238 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2239 break; 2233 break;
2240 } 2234 }
2241 2235
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2237 {
2244 if (!seen_input) 2238 if (expect_false (!seen_input))
2245 { 2239 {
2246 seen_input = 1; 2240 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2262 wchar_t *str = buf; 2256 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2258
2265 for (;;) 2259 for (;;)
2266 { 2260 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2262 break;
2269 2263
2270 *str++ = ch; 2264 *str++ = ch;
2271 2265
2272 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2273 { 2267 {
2274 if (ch == C0_LF) 2268 if (ch == C0_LF)
2275 nlines++; 2269 nlines++;
2276 2270
2277 refresh_count++; 2271 refresh_count++;
2278 2272
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2274 {
2281 refresh_count = 0; 2275 refresh_count = 0;
2282 2276
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2278 {
2285 refreshnow = true; 2279 refreshnow = true;
2286 ch = NOCHAR; 2280 ch = NOCHAR;
2287 break; 2281 break;
2288 } 2282 }
… …
2326 * What the heck we'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2321 * if skipScroll is enabled.
2328 */ 2322 */
2329 if (refreshnow) 2323 if (refreshnow)
2330 { 2324 {
2331 flag = true;
2332 scr_refresh (); 2325 scr_refresh ();
2333 want_refresh = 1; 2326 want_refresh = 1;
2334 } 2327 }
2335
2336 } 2328 }
2337 else 2329 else
2338 { 2330 {
2339 try 2331 try
2340 { 2332 {
… …
2348 } 2340 }
2349 2341
2350 ch = NOCHAR; 2342 ch = NOCHAR;
2351 } 2343 }
2352 } 2344 }
2353
2354 return flag;
2355} 2345}
2356 2346
2357// read the next character 2347// read the next character
2358wchar_t 2348wchar_t
2359rxvt_term::next_char () NOTHROW 2349rxvt_term::next_char () NOTHROW
2360{ 2350{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2352 {
2363 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2366 2356
2367 wchar_t wc; 2357 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2359
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2364 break;
2375 } 2365 }
2376 2366
2377 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2379 2372
2380 // assume wchar == unicode 2373 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2383 } 2376 }
… …
2394 : NOCHAR; 2387 : NOCHAR;
2395} 2388}
2396 2389
2397static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2398 2391
2399/* rxvt_cmd_getc () - Return next input character */
2400/*
2401 * Return the next input character after first passing any keyboard input
2402 * to the command.
2403 */
2404wchar_t 2392wchar_t
2405rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2406{ 2394{
2407 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2408 2396
… …
2427/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2429FILE * 2417FILE *
2430rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2431{ 2419{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2421
2434 if (stream == NULL) 2422 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2424
2437 return stream; 2425 return stream;
… …
2448 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2449 */ 2437 */
2450void 2438void
2451rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2452{ 2440{
2453 int done; 2441 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2442
2456 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2457 return; 2444 return;
2458 2445
2459 /* 2446 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2448 * is received.
2462 */ 2449 */
2463 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2464 { 2451 {
2465 unsigned char buf[8]; 2452 unsigned char buf[8];
2466 unicode_t ch; 2453 unicode_t ch;
2467 unsigned int i, len; 2454 unsigned int i, len;
2468 2455
… …
2499 } 2486 }
2500 } 2487 }
2501 2488
2502 pclose_printer (fd); 2489 pclose_printer (fd);
2503} 2490}
2504#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2505/*}}} */ 2492/*}}} */
2506 2493
2507/* *INDENT-OFF* */ 2494/* *INDENT-OFF* */
2508enum { 2495enum {
2509 C1_40 = 0x40, 2496 C1_40 = 0x40,
… …
2613 break; 2600 break;
2614 case 'Z': /* identify the terminal type */ 2601 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2603 break;
2617 case '<': /* turn off VT52 mode */ 2604 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2605 set_privmode (PrivMode_vt52, 0);
2619 break; 2606 break;
2620 case 'F': /* use special graphics character set */ 2607 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2608 case 'G': /* use regular character set */
2622 /* unimplemented */ 2609 /* unimplemented */
2623 break; 2610 break;
… …
2677 scr_forwardindex (); 2664 scr_forwardindex ();
2678 break; 2665 break;
2679#endif 2666#endif
2680 case '=': 2667 case '=':
2681 case '>': 2668 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2669 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2670 break;
2684 2671
2685 case C1_40: 2672 case C1_40:
2686 cmd_getc (); 2673 cmd_getc ();
2687 break; 2674 break;
… …
2691 2678
2692 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
2693 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
2694 { 2681 {
2695 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2697 } 2684 }
2698 break; 2685 break;
2699 2686
2700 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2701 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2702 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2703 break; 2692 break;
2704 2693
2705 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2706 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2707 scr_set_tab (1); 2696 scr_set_tab (1);
… …
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
2730 2719
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2722 process_csi_seq ();
2734 break; 2723 break;
2735 2724
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2727 process_osc_seq ();
2739 break; 2728 break;
2740 2729
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2731 case 'c':
2743 mbstate.reset (); 2732 mbstate.reset ();
2744 scr_poweron (); 2733 scr_poweron ();
2745 scrollbar_show (1); 2734 scrollBar.show (1);
2746 break; 2735 break;
2747 2736
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2738 case 'n':
2750 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2773}; 2762};
2774 2763
2775#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2778#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2779 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2780 2769
2781const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2782 { 2771 {
2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2801 2790
2802 nargs = 0; 2791 nargs = 0;
2803 2792
2804 priv = 0; 2793 priv = 0;
2805 ch = cmd_getc (); 2794 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
2807 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2798 priv = ch;
2809 ch = cmd_getc (); 2799 ch = cmd_getc ();
2810 } 2800 }
2811 2801
2812 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
2861 // versions. 2851 // versions.
2862 // 2852 //
2863 tt_printf ("\033[>%d;95;0c", 'U'); 2853 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2854 }
2865 break; 2855 break;
2856
2866 case '?': 2857 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2870 } 2873 }
2874 break;
2875 }
2876
2871 return; 2877 return;
2872 } 2878 }
2873 2879
2874 switch (ch) 2880 switch (ch)
2875 { 2881 {
… …
3109 { 3115 {
3110 /* 3116 /*
3111 * commands 3117 * commands
3112 */ 3118 */
3113 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3114 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3115 break; 3121 break;
3116 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3117 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3118 break; 3124 break;
3119 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3120 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3121 break; 3127 break;
3122 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3124 break; 3130 break;
3125 case 5: /* raise window */ 3131 case 5: /* raise window */
3126 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3127 break; 3133 break;
3128 case 6: /* lower window */ 3134 case 6: /* lower window */
3129 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3130 break; 3136 break;
3131 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3132 scr_touch (true); 3138 scr_touch (true);
3133 break; 3139 break;
3134 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3145 3151
3146 /* 3152 /*
3147 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3148 */ 3154 */
3149 case 11: /* report window state */ 3155 case 11: /* report window state */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3152 break; 3158 break;
3153 case 13: /* report window position */ 3159 case 13: /* report window position */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3155 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3156 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3157 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3158 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3159 break; 3165 break;
3160 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3163 break; 3169 break;
3164 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3165 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3166 break; 3172 break;
… …
3168 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3169 break; 3175 break;
3170 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3171 { 3177 {
3172 char *s; 3178 char *s;
3173 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3175 XFree (s); 3181 XFree (s);
3176 } 3182 }
3177 break; 3183 break;
3178 case 21: /* report window title */ 3184 case 21: /* report window title */
3179 { 3185 {
3180 char *s; 3186 char *s;
3181 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3183 XFree (s); 3189 XFree (s);
3184 } 3190 }
3185 break; 3191 break;
3186 } 3192 }
… …
3242 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3243 */ 3249 */
3244void 3250void
3245rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3246{ 3252{
3247 char *s;
3248 unicode_t eh;
3249
3250 /* 3253 /*
3251 * Not handled yet 3254 * Not handled yet
3252 */ 3255 */
3256
3257 unicode_t eh;
3253 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3254 if (s) 3259 if (s)
3255 free (s); 3260 free (s);
3256 3261
3257 return; 3262 return;
3258} 3263}
… …
3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3263 */ 3268 */
3264void 3269void
3265rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3266{ 3271{
3267 unicode_t ch, eh;
3268 int arg; 3272 int arg;
3269 3273
3270 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3271 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3272 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3273 3277
3274 if (ch == ';') 3278 if (ch == ';')
3275 { 3279 {
3280 unicode_t eh;
3276 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3277 3282
3278 if (s) 3283 if (s)
3279 { 3284 {
3280 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3304 3309
3305/* 3310/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3312 */
3308void 3313void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3315{
3311 int color; 3316 int color;
3312 char *buf, *name; 3317 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3319 int saveop = op;
… …
3341 unsigned long bytes_after; 3346 unsigned long bytes_after;
3342 unsigned char *value = 0; 3347 unsigned char *value = 0;
3343 const char *str = ""; 3348 const char *str = "";
3344 3349
3345 if (prop 3350 if (prop
3346 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3347 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3348 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3349 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3350 && actual_type != None 3355 && actual_type != None
3351 && actual_format == 8) 3356 && actual_format == 8)
… …
3355 3360
3356 XFree (value); 3361 XFree (value);
3357 } 3362 }
3358 else 3363 else
3359 { 3364 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3361 3366
3362 if (eq) 3367 if (eq)
3363 { 3368 {
3364 *eq = 0; 3369 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3366 } 3371 }
3367 else 3372 else
3368 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3369 display->atom (str)); 3374 display->atom (str));
3370 } 3375 }
3371 break; 3376 break;
3372 3377
3373 case XTerm_Color: 3378 case XTerm_Color:
… …
3386 *buf++ = '\0'; 3391 *buf++ = '\0';
3387 3392
3388 process_color_seq (op, color, name, resp); 3393 process_color_seq (op, color, name, resp);
3389 } 3394 }
3390 break; 3395 break;
3396 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3397 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
3393 break; 3399 break;
3400 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3401 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3402 process_color_seq (op, Color_bg, str, resp);
3396 break; 3403 break;
3397#ifndef NO_CURSORCOLOR 3404#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3405 case XTerm_Color_cursor:
… …
3403 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3404 break; 3411 break;
3405 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3406 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3407 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3408#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3409 case XTerm_Color_RV:
3410 process_color_seq (op, Color_RV, str, resp);
3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3415 break; 3426 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3419 break; 3429 break;
3420 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
3422 break; 3432 break;
3423#endif 3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3424#if ENABLE_TRANSPARENCY 3437#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3427 { 3440 {
3428 bool changed = false; 3441 bool changed = false;
3442
3429 if (ISSET_PIXCOLOR (Color_tint)) 3443 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3431 else 3445
3432 changed = bgPixmap.unset_tint ();
3433 if (changed) 3446 if (changed)
3434 update_background (); 3447 update_background ();
3435 } 3448 }
3436 3449
3437 break; 3450 break;
… …
3441 case Rxvt_Pixmap: 3454 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3455 if (!strcmp (str, "?"))
3443 { 3456 {
3444 char str[256]; 3457 char str[256];
3445 3458
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3459 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3460 min (h_scale, 32767), min (v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3461 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3463 }
3451 else 3464 else
3452 { 3465 {
3453 int changed = 0; 3466 int changed = 0;
3454 3467
3455 if (*str != ';') 3468 if (*str != ';')
3456 { 3469 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3460 changed++; 3472 changed++;
3461 str = strchr (str, ';'); 3473 str = strchr (str, ';');
3462 if (str == NULL) 3474 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3464 } 3479 }
3465 while (str) 3480 else
3466 { 3481 {
3467 str++; 3482 str++;
3468 if (bgPixmap.set_geometry (str)) 3483 if (bg_set_geometry (str, true))
3469 changed++; 3484 changed++;
3470 str = strchr (str, ';');
3471 } 3485 }
3486
3472 if (changed) 3487 if (changed)
3488 {
3489 if (bg_window_position_sensitive ())
3490 {
3491 int x, y;
3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3473 update_background (); 3495 update_background ();
3496 }
3474 } 3497 }
3475 break; 3498 break;
3476#endif 3499#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3500
3485 case XTerm_logfile: 3501 case XTerm_logfile:
3486 // TODO, when secure mode? 3502 // TODO, when secure mode?
3487 break; 3503 break;
3488 3504
… …
3555 break; 3571 break;
3556#endif 3572#endif
3557 3573
3558#if ENABLE_PERL 3574#if ENABLE_PERL
3559 case URxvt_perl: 3575 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3576 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3577 break;
3563#endif 3578#endif
3564 } 3579 }
3565} 3580}
3566/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
3589 { 3604 {
3590 if (mode == 'r') 3605 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3607 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3609
3610 set_privmode (bit, state);
3595 } 3611 }
3596 3612
3597 return state; 3613 return state;
3598} 3614}
3599 3615
… …
3607 static const struct 3623 static const struct
3608 { 3624 {
3609 const int argval; 3625 const int argval;
3610 const unsigned long bit; 3626 const unsigned long bit;
3611 } argtopriv[] = { 3627 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3628 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3629 { 2, PrivMode_vt52 },
3614 { 3, PrivMode_132 }, 3630 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3631 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3632 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3633 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3634 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3635 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3637 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region
3622 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3642#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3647 // 45 margin bell NYI
3630 // 46 start logging 3648 // 46 start logging
3631 { 47, PrivMode_Screen }, 3649 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3633#ifndef NO_BACKSPACE_KEY 3651#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3652 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3653#endif
3636 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 { 1002, PrivMode_MouseBtnEvent }, 3655 { 1002, PrivMode_MouseBtnEvent },
3639 { 1003, PrivMode_MouseAnyEvent }, 3656 { 1003, PrivMode_MouseAnyEvent },
3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
3642 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3672 { 2004, PrivMode_BracketPaste },
3649 }; 3673 };
3650 3674
3651 if (nargs == 0) 3675 if (nargs == 0)
3652 return; 3676 return;
3653 3677
… …
3660 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
3661 { 3685 {
3662 state = -1; 3686 state = -1;
3663 3687
3664 /* basic handling */ 3688 /* basic handling */
3665 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3666 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
3667 { 3691 {
3668 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
3669 break; 3693 break;
3670 } 3694 }
… …
3678 3702
3679 scr_touch (true); 3703 scr_touch (true);
3680 break; 3704 break;
3681#endif 3705#endif
3682 case 1048: /* alternative cursor save */ 3706 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3707 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3708 if (mode == 0)
3686 scr_cursor (RESTORE); 3709 scr_cursor (RESTORE);
3687 else if (mode == 1) 3710 else if (mode == 1)
3688 scr_cursor (SAVE); 3711 scr_cursor (SAVE);
… …
3697 case 2: /* VT52 mode */ 3720 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3721 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3722 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3723 * within VT52 mode
3701 */ 3724 */
3702 PrivMode (1, PrivMode_vt52); 3725 set_privmode (PrivMode_vt52, 1);
3703 break; 3726 break;
3704 case 3: /* 80/132 */ 3727 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3728 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3730 break;
3708 case 4: /* smooth scrolling */ 3731 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3732 set_option (Opt_jumpScroll, !state);
3710 break; 3733 break;
3711 case 5: /* reverse video */ 3734 case 5: /* reverse video */
… …
3722 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3747 break;
3725#ifdef scrollBar_esc 3748#ifdef scrollBar_esc
3726 case scrollBar_esc: 3749 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3750 if (scrollBar.map (state))
3728 { 3751 {
3729 resize_all_windows (0, 0, 0); 3752 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3753 scr_touch (true);
3731 } 3754 }
3732 break; 3755 break;
… …
3743 /* case 67: - backspace key */ 3766 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3767 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3768 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3769 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3770 break;
3748#if 0
3749 case 1001:
3750 break; /* X11 mouse highlighting */
3751#endif
3752 case 1002: 3771 case 1002:
3753 case 1003: 3772 case 1003:
3754 if (state) { 3773 if (state)
3774 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3757 vt_emask_mouse = PointerMotionMask; 3778 vt_emask_mouse = PointerMotionMask;
3779 }
3758 } else 3780 else
3759 vt_emask_mouse = NoEventMask; 3781 vt_emask_mouse = NoEventMask;
3782
3760 vt_select_input (); 3783 vt_select_input ();
3761 break; 3784 break;
3762 case 1010: /* scroll to bottom on TTY output inhibit */ 3785 case 1010: /* scroll to bottom on TTY output inhibit */
3763 set_option (Opt_scrollTtyOutput, !state); 3786 set_option (Opt_scrollTtyOutput, !state);
3764 break; 3787 break;
3765 case 1011: /* scroll to bottom on key press */ 3788 case 1011: /* scroll to bottom on key press */
3766 set_option (Opt_scrollTtyKeypress, state); 3789 set_option (Opt_scrollTtyKeypress, state);
3767 break; 3790 break;
3768 case 1047: /* secondary screen w/ clearing last */ 3791 case 1047: /* secondary screen w/ clearing last */
3769 if (option (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
3770 if (current_screen != PRIMARY) 3793 if (!state)
3771 scr_erase_screen (2); 3794 scr_erase_screen (2);
3795
3772 scr_change_screen (state); 3796 scr_change_screen (state);
3773 break; 3797 break;
3774 case 1049: /* secondary screen w/ clearing first */ 3798 case 1049: /* secondary screen w/ clearing first */
3799 if (option (Opt_secondaryScreen))
3800 if (state)
3801 scr_cursor (SAVE);
3802
3775 scr_change_screen (state); 3803 scr_change_screen (state);
3804
3776 if (option (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3806 if (state)
3778 scr_erase_screen (2); 3807 scr_erase_screen (2);
3808 else
3809 scr_cursor (RESTORE);
3779 break; 3810 break;
3780 default: 3811 default:
3781 break; 3812 break;
3782 } 3813 }
3783 } 3814 }
… …
3936 } 3967 }
3937 } 3968 }
3938} 3969}
3939/*}}} */ 3970/*}}} */
3940 3971
3941/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3942void
3943rxvt_term::process_graphics ()
3944{
3945 unicode_t ch, cmd = cmd_getc ();
3946
3947 if (cmd == 'Q')
3948 { /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return;
3951 }
3952 /* swallow other graphics sequences until terminating ':' */
3953 do
3954 ch = cmd_getc ();
3955 while (ch != ':');
3956}
3957/*}}} */
3958
3959/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
3960 3973
3961/* 3974/*
3962 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
3976 3989
3977/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* Write data to the pty as typed by the user, pasted with the mouse,
3979 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
3980 */ 3993 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 3995
3983void 3996void
3984rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 3998{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 4004
3992 if (v_buflen == 0) 4005 if (v_buflen == 0)
3993 { 4006 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4008
4009 max_it (written, 0);
4010
3996 if ((unsigned int)written == len) 4011 if (written == len)
3997 return; 4012 return;
3998 4013
3999 data += written; 4014 data += written;
4000 len -= written; 4015 len -= written;
4001 } 4016 }
4002 4017
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4019
4005 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4021 v_buflen += len;
4007 4022
4008 pty_ev.set (ev::READ | ev::WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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