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.359 by ayin, Mon Oct 15 14:56:06 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_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot 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::check_cb (check_watcher &w) 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 (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1010}
1108 1011
1109void 1012void
1110rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1014{
1112 make_current (); 1015 make_current ();
1113 1016
1114 refresh_count = 0; 1017 refresh_count = 0;
1115 flush (); 1018 flush ();
1116} 1019}
1117 1020
1118#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
1119void 1022void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 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;
1124 1027 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1028}
1127#endif 1029#endif
1128 1030
1129#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1130void 1032void
1131rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1034{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1036 {
1135 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1136 want_refresh = 1; 1038 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
1138 } 1040 }
1041 else
1042 w.stop ();
1139} 1043}
1140#endif 1044#endif
1141 1045
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1047void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1049{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1052 {
1149 want_refresh = 1; 1053 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1151 } 1055 }
1056 else
1057 w.stop ();
1152} 1058}
1153#endif 1059#endif
1154 1060
1155#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1156void 1062void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1064{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1066 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1068 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1164 } 1070 }
1071 else
1072 w.stop ();
1165} 1073}
1166#endif 1074#endif
1167 1075
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1077void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1079{
1172 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1081 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1082 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1087 {
1088 mouse_slip_wheel_speed = 0;
1089 w.stop ();
1181 } 1090 }
1182} 1091}
1183#endif 1092#endif
1184 1093
1185#if LINUX_YIELD_HACK 1094#if LINUX_YIELD_HACK
1186static struct event_handler 1095static struct event_handler
1187{ 1096{
1188 check_watcher yield_ev; 1097 ev::prepare yield_ev;
1189 1098
1190 void yield_cb (check_watcher &w) 1099 void yield_cb (ev::prepare &w, int revents)
1191 { 1100 {
1192 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1108
1197 struct timespec ts = { 0, 0 }; 1109 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1199 1111
1200 w.stop (); 1112 w.stop ();
1201 } 1113 }
1202 1114
… …
1205 { 1117 {
1206 } 1118 }
1207} event_handler; 1119} event_handler;
1208#endif 1120#endif
1209 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
1210bool 1155bool
1211rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1212{ 1157{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1214 1159
1215 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1161
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1218 n = 0;
1219 } 1163 {
1220 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1224 1169
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1171
1227 if (r > 0) 1172 if (r > 0)
1228 { 1173 {
1229 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1230 return true; 1175 return true;
… …
1246 1191
1247 return false; 1192 return false;
1248} 1193}
1249 1194
1250void 1195void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1197{
1253 make_current (); 1198 make_current ();
1254 1199
1255 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1203 cmd_parse ();
1259 break;
1260 1204
1261 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1262 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1263} 1209}
1264 1210
1265void 1211void
1266rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1267{ 1213{
… …
1270 1216
1271#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1218 hidden_pointer = 0;
1273 1219
1274 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1276#endif 1222#endif
1277} 1223}
1278 1224
1279#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1280void 1226void
… …
1288 1234
1289 hidden_pointer = 1; 1235 hidden_pointer = 1;
1290} 1236}
1291 1237
1292void 1238void
1293rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1240{
1295 make_current (); 1241 make_current ();
1296 1242
1297 pointer_blank (); 1243 pointer_blank ();
1298} 1244}
… …
1301void 1247void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1249{
1304 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1305 int x, y; 1251 int x, y;
1252 int code = 32;
1306 1253
1307 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1308 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1257 if (ev.type == MotionNotify)
1258 {
1259 if (x == mouse_row && y == mouse_col)
1260 return;
1261
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1309 1266
1310 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1311 button_number = 3; 1268 button_number = 3;
1312 else 1269 else
1313 { 1270 {
1314 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1315 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1316 if (button_number >= 3) 1273 if (button_number >= 3)
1317 button_number += (64 - 3); 1274 button_number += 64 - 3;
1318 } 1275 }
1319 1276
1320 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1321 { 1278 {
1322 /* 1279 /*
… …
1354 fputc ('A', stderr); 1311 fputc ('A', stderr);
1355 if (key_state & 32) 1312 if (key_state & 32)
1356 fputc ('2', stderr); 1313 fputc ('2', stderr);
1357 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1358 button_number, 1315 button_number,
1359 x + 1, 1316 x,
1360 y + 1); 1317 y);
1361#endif 1318#endif
1362 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
1363 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1364 (32 + button_number + key_state), 1334 code + button_number + key_state,
1365 (32 + x + 1), 1335 32 + x,
1366 (32 + y + 1)); 1336 32 + y);
1367} 1337}
1368 1338
1369/*{{{ process an X event */ 1339/*{{{ process an X event */
1370void 1340void
1371rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1473 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1474 focus_out (); 1444 focus_out ();
1475 break; 1445 break;
1476 1446
1477 case ConfigureNotify: 1447 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1482 { 1449 {
1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 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
1485 1471
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1473 {
1488 seen_resize = 1; 1474 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1476 }
1491 else 1477 else
1492 { 1478 {
1493#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1481 {
1482 if (mapped)
1495 update_background (); 1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1496#endif 1487#endif
1497 } 1488 }
1489
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 } 1491 }
1500 break; 1492 break;
1501 1493
1502 case PropertyNotify: 1494 case PropertyNotify:
1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1504 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1505 && ev.xproperty.state == PropertyNewValue)
1506 selection_property (ev.xproperty.window, ev.xproperty.atom);
1507
1508 break; 1496 break;
1509 1497
1510 case SelectionClear: 1498 case SelectionClear:
1511 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1512 break;
1513
1514 case SelectionNotify:
1515 if (selection_wait == Sel_normal)
1516 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1517 break; 1500 break;
1518 1501
1519 case SelectionRequest: 1502 case SelectionRequest:
1520 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1521 break; 1504 break;
1522 1505
1523 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
1524 mapped = 1; 1523 mapped = 1;
1525#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1525 text_blink_ev.start ();
1527#endif 1526#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break; 1528 break;
1530 1529
1531 case UnmapNotify: 1530 case UnmapNotify:
… …
1541 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1542 { 1541 {
1543 do 1542 do
1544 { 1543 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1546 }
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1548
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1550
1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 { 1552 {
1554 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1555 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1556 } 1555 }
1556
1557 want_refresh = 1; 1557 want_refresh = 1;
1558 } 1558 }
1559 else 1559 else
1560 { 1560 {
1561 XEvent unused_event; 1561 XEvent unused_event;
… …
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564 ; 1564 ;
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1566 ;
1567 1567
1568 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1569 {
1570 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1571 scrollbar_show (0); 1571 scrollBar.show (0);
1572 } 1572 }
1573 } 1573 }
1574 break; 1574 break;
1575 1575
1576 case MotionNotify: 1576 case MotionNotify:
1577#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1578 if (hidden_pointer)
1579 pointer_unblank (); 1579 pointer_unblank ();
1580#endif 1580#endif
1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1582 || priv_modes & PrivMode_MouseAnyEvent)
1583 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1585 break;
1583 1586
1584 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1585 { 1588 {
… …
1619 int dist; 1622 int dist;
1620 1623
1621 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1623 */ 1626 */
1624 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626 1629
1627 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1628 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1629 */ 1632 */
1630 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
… …
1652 else 1655 else
1653 { 1656 {
1654 /* we are within the text window, so we 1657 /* we are within the text window, so we
1655 * shouldn't be scrolling 1658 * shouldn't be scrolling
1656 */ 1659 */
1657 if (sel_scroll_ev.active)
1658 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1659 } 1661 }
1660#endif 1662#endif
1661#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1662 } 1664 }
1663#endif 1665#endif
1664 } 1666 }
1665 } 1667 }
1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1667 { 1669 {
1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1670 ; 1672 ;
1671 1673
… …
1673 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1674 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1675 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1676 &unused_mask); 1678 &unused_mask);
1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1678 scrollbar_size ()); 1680 scrollBar.size ());
1679 want_refresh = 1; 1681 want_refresh = 1;
1680 scrollbar_show (1); 1682 scrollBar.show (1);
1681 } 1683 }
1682 break; 1684 break;
1683 } 1685 }
1684 1686
1685#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
… …
1689 { 1691 {
1690 hidden_cursor = 0; 1692 hidden_cursor = 0;
1691 want_refresh = 1; 1693 want_refresh = 1;
1692 } 1694 }
1693 1695
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1696 cursor_blink_ev.again ();
1695 } 1697 }
1696#endif 1698#endif
1697 1699
1698#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1706 1708
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1710 pointer_blank ();
1709 } 1711 }
1710#endif 1712#endif
1713
1714 refresh_check ();
1711} 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
1712 1732
1713void 1733void
1714rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1715{ 1735{
1716 if (!focus) 1736 if (!focus)
1717 { 1737 {
1718 focus = 1; 1738 focus = 1;
1719 want_refresh = 1; 1739 want_refresh = 1;
1720 1740
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1741#if USE_XIM
1724 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1725 { 1743 {
1726 IMSetPosition (); 1744 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1728 } 1746 }
1729#endif 1747#endif
1730#if CURSOR_BLINK 1748#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1733#endif 1751#endif
1734#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1736 { 1754 {
1737 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1756 scr_recolour ();
1739 } 1757 }
1740#endif 1758#endif
1741#if ENABLE_FRILLS 1759#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell)) 1760 if (option (Opt_urgentOnBell))
1743 { 1761 set_urgency (0);
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif 1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1751 } 1765 }
1752} 1766}
1753 1767
1754void 1768void
1755rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1757 if (focus) 1771 if (focus)
1758 { 1772 {
1759 focus = 0; 1773 focus = 0;
1760 want_refresh = 1; 1774 want_refresh = 1;
1761 1775
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1763 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1764#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1765 if (iso14755buf) 1781 if (iso14755buf)
1766 { 1782 {
1767 iso14755buf = 0; 1783 iso14755buf = 0;
1768# if ISO_14755 1784# if ISO_14755
… …
1775 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1776#endif 1792#endif
1777#if CURSOR_BLINK 1793#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1780 hidden_cursor = 0; 1797 hidden_cursor = 0;
1781#endif 1798#endif
1782#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1784 { 1801 {
1785 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1786 scr_recolour (); 1803 scr_recolour ();
1787 } 1804 }
1788#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 } 1808 }
1790} 1809}
1791 1810
1792void 1811void
1793rxvt_term::update_fade_color (unsigned int idx) 1812rxvt_term::update_fade_color (unsigned int idx)
… …
1821 * 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.
1822 */ 1841 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1844 {
1826 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1827 update_background (); 1846 update_background ();
1828 } 1847 }
1848
1829 break; 1849 break;
1830 } 1850 }
1831# endif 1851# endif
1852
1853 refresh_check ();
1832} 1854}
1833#endif 1855#endif
1834 1856
1835void 1857void
1836rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1871 { 1893 {
1872 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1873 MEvent.clicks++; 1895 MEvent.clicks++;
1874 1896
1875 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1876 { 1898 {
1877 /* only report double clicks */ 1899 /* only report double clicks */
… …
1891 mouse_report (ev); 1913 mouse_report (ev);
1892 } 1914 }
1893#else 1915#else
1894 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1895 mouse_report (ev); 1917 mouse_report (ev);
1896#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1897 1919
1898 } 1920 }
1899 else 1921 else
1900 { 1922 {
1901 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1949 } 1971 }
1950 1972
1951 /* 1973 /*
1952 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1953 */ 1975 */
1954 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1955 { 1977 {
1956 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;
1957 /* 1986 /*
1958 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 1988 * move up if mouse is above slider
1960 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1961 * 1990 *
… …
1970 /* 1999 /*
1971 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1972 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1973 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1974 */ 2003 */
1975 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1976 && scrollbarnext_upButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_upButton (ev.y)))
1979 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1980 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1981 && scrollbarnext_dnButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_dnButton (ev.y)))
1984 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1985 else 2008 else
1986 switch (ev.button) 2009 switch (ev.button)
1987 { 2010 {
1988 case Button2: 2011 case Button2:
… …
1995 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1996 break; 2019 break;
1997 } 2020 }
1998 } 2021 }
1999 else 2022 else
2000#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
2001
2002 {
2003 char upordown = 0;
2004
2005 if (scrollBar.style == R_SB_NEXT)
2006 { 2024 {
2007 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
2008 upordown = -1; /* up */
2009 else if (scrollbarnext_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 else if (scrollBar.style == R_SB_RXVT)
2013 {
2014 if (scrollbarrxvt_upButton (ev.y))
2015 upordown = -1; /* up */
2016 else if (scrollbarrxvt_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 if (upordown)
2020 { 2026 {
2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
2022 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023#endif 2030#endif
2024 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
2025 { 2032 {
2026 if (upordown < 0) 2033 if (direction == UP)
2027 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
2028 else 2035 else
2029 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2030 } 2037 }
2031 } 2038 }
2032 else 2039 else
2033 switch (ev.button) 2040 switch (ev.button)
2034 { 2041 {
2035 case Button2: 2042 case Button2:
2036 switch (scrollbar_align) 2043 switch (scrollBar.align)
2037 { 2044 {
2038 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2039 csrO = 0; 2046 csrO = 0;
2040 break; 2047 break;
2041 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2047 } 2054 }
2048 2055
2049 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2050 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2051 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2052 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2053 2060
2054 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2055 break; 2062 break;
2056 2063
2057 case Button1: 2064 case Button1:
2058 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2059 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2060 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2061 2068
2062 case Button3: 2069 case Button3:
2063 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2073 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2074# else 2081# else
2075 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2076# endif 2083# endif
2077 else 2084 else
2078 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2079 } 2086 }
2080 else 2087 else
2081 { 2088 {
2082 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2083 (nrow 2090 (nrow
2084 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2085 / scrollbar_size ())); 2092 / scrollBar.size ()));
2086 } 2093 }
2087 2094
2088 break; 2095 break;
2089 } 2096 }
2090 } 2097 }
… …
2100 2107
2101 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2102 if (!bypass_keystate) 2109 if (!bypass_keystate)
2103 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2104 2111
2105 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2106 { 2113 {
2107 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2108 scrollbar_show (0); 2115 scrollBar.show (0);
2109 } 2116 }
2110 2117
2111#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2112 if (sel_scroll_ev.active)
2113 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2114#endif 2120#endif
2115 2121
2116 if (ev.window == vt) 2122 if (ev.window == vt)
2117 { 2123 {
2118 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)))
… …
2142 mouse_report (ev); 2148 mouse_report (ev);
2143 } 2149 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2146 mouse_report (ev); 2152 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2154 return;
2149 } 2155 }
2150 2156
2151 /* 2157 /*
2152 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2164 selection_make (ev.time); 2170 selection_make (ev.time);
2165 break; 2171 break;
2166 2172
2167 case Button2: 2173 case Button2:
2168 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?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2176 break;
2171 2177
2172#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2173 case Button4: 2179 case Button4:
2174 case Button5: 2180 case Button5:
… …
2190 { 2196 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2200
2195 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198 slip_wheel_ev.start ();
2199 } 2203 }
2200 else 2204 else
2205# endif
2201 { 2206 {
2202# endif
2203 scr_page (v, i); 2207 scr_page (v, i);
2204 scrollbar_show (1); 2208 scrollBar.show (1);
2205# ifdef MOUSE_SLIP_WHEELING
2206 } 2209 }
2207# endif
2208 } 2210 }
2209 break; 2211 break;
2210#endif 2212#endif
2211 } 2213 }
2212 } 2214 }
2213} 2215}
2214 2216
2215/*}}} */ 2217/*}}} */
2216 2218
2217bool 2219void
2218rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2219{ 2221{
2220 bool flag = false;
2221 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2223 2224
2224 for (;;) 2225 for (;;)
2225 { 2226 {
2226 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2227 { 2228 {
2228 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2230 ch = next_char ();
2230 2231
2231 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2232 break; 2233 break;
2233 } 2234 }
2234 2235
2235 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))
2236 { 2237 {
2237 if (!seen_input) 2238 if (expect_false (!seen_input))
2238 { 2239 {
2239 seen_input = 1; 2240 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2256 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2258
2258 for (;;) 2259 for (;;)
2259 { 2260 {
2260 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)))
2261 break; 2262 break;
2262 2263
2263 *str++ = ch; 2264 *str++ = ch;
2264 2265
2265 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2266 { 2267 {
2267 if (ch == C0_LF) 2268 if (ch == C0_LF)
2268 nlines++; 2269 nlines++;
2269 2270
2270 refresh_count++; 2271 refresh_count++;
2271 2272
2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273 { 2274 {
2274 refresh_count = 0; 2275 refresh_count = 0;
2275 2276
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 { 2278 {
2278 refreshnow = true; 2279 refreshnow = true;
2279 ch = NOCHAR; 2280 ch = NOCHAR;
2280 break; 2281 break;
2281 } 2282 }
… …
2319 * 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.
2320 * if skipScroll is enabled. 2321 * if skipScroll is enabled.
2321 */ 2322 */
2322 if (refreshnow) 2323 if (refreshnow)
2323 { 2324 {
2324 flag = true;
2325 scr_refresh (); 2325 scr_refresh ();
2326 want_refresh = 1; 2326 want_refresh = 1;
2327 } 2327 }
2328
2329 } 2328 }
2330 else 2329 else
2331 { 2330 {
2332 try 2331 try
2333 { 2332 {
… …
2341 } 2340 }
2342 2341
2343 ch = NOCHAR; 2342 ch = NOCHAR;
2344 } 2343 }
2345 } 2344 }
2346
2347 return flag;
2348} 2345}
2349 2346
2350// read the next character 2347// read the next character
2351wchar_t 2348wchar_t
2352rxvt_term::next_char () NOTHROW 2349rxvt_term::next_char () NOTHROW
2353{ 2350{
2354 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2355 { 2352 {
2356 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2357 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2358 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2359 2356
2360 wchar_t wc; 2357 wchar_t wc;
2361 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);
2362 2359
… …
2366 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2367 break; 2364 break;
2368 } 2365 }
2369 2366
2370 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2371 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 }
2372 2372
2373 // assume wchar == unicode 2373 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2375 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2376 } 2376 }
… …
2387 : NOCHAR; 2387 : NOCHAR;
2388} 2388}
2389 2389
2390static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2391 2391
2392/* rxvt_cmd_getc () - Return next input character */
2393/*
2394 * Return the next input character after first passing any keyboard input
2395 * to the command.
2396 */
2397wchar_t 2392wchar_t
2398rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2399{ 2394{
2400 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2401 2396
… …
2420/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2421#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2422FILE * 2417FILE *
2423rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2424{ 2419{
2425 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2426 2421
2427 if (stream == NULL) 2422 if (stream == NULL)
2428 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2429 2424
2430 return stream; 2425 return stream;
… …
2441 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2442 */ 2437 */
2443void 2438void
2444rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2445{ 2440{
2446 int done; 2441 FILE *fd = popen_printer ();
2447 FILE *fd;
2448 2442
2449 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2450 return; 2444 return;
2451 2445
2452 /* 2446 /*
2453 * 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
2454 * is received. 2448 * is received.
2455 */ 2449 */
2456 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2457 { 2451 {
2458 unsigned char buf[8]; 2452 unsigned char buf[8];
2459 unicode_t ch; 2453 unicode_t ch;
2460 unsigned int i, len; 2454 unsigned int i, len;
2461 2455
… …
2492 } 2486 }
2493 } 2487 }
2494 2488
2495 pclose_printer (fd); 2489 pclose_printer (fd);
2496} 2490}
2497#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2498/*}}} */ 2492/*}}} */
2499 2493
2500/* *INDENT-OFF* */ 2494/* *INDENT-OFF* */
2501enum { 2495enum {
2502 C1_40 = 0x40, 2496 C1_40 = 0x40,
… …
2606 break; 2600 break;
2607 case 'Z': /* identify the terminal type */ 2601 case 'Z': /* identify the terminal type */
2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2609 break; 2603 break;
2610 case '<': /* turn off VT52 mode */ 2604 case '<': /* turn off VT52 mode */
2611 PrivMode (0, PrivMode_vt52); 2605 set_privmode (PrivMode_vt52, 0);
2612 break; 2606 break;
2613 case 'F': /* use special graphics character set */ 2607 case 'F': /* use special graphics character set */
2614 case 'G': /* use regular character set */ 2608 case 'G': /* use regular character set */
2615 /* unimplemented */ 2609 /* unimplemented */
2616 break; 2610 break;
… …
2670 scr_forwardindex (); 2664 scr_forwardindex ();
2671 break; 2665 break;
2672#endif 2666#endif
2673 case '=': 2667 case '=':
2674 case '>': 2668 case '>':
2675 PrivMode ((ch == '='), PrivMode_aplKP); 2669 set_privmode (PrivMode_aplKP, ch == '=');
2676 break; 2670 break;
2677 2671
2678 case C1_40: 2672 case C1_40:
2679 cmd_getc (); 2673 cmd_getc ();
2680 break; 2674 break;
… …
2684 2678
2685 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
2686 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
2687 { 2681 {
2688 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
2689 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2690 } 2684 }
2691 break; 2685 break;
2692 2686
2693 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2694 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2695 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 */
2696 break; 2692 break;
2697 2693
2698 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2699 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2700 scr_set_tab (1); 2696 scr_set_tab (1);
… …
2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2720 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2722 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
2723 2719
2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2725 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
2726 process_csi_seq (); 2722 process_csi_seq ();
2727 break; 2723 break;
2728 2724
2729 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2730 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
2731 process_osc_seq (); 2727 process_osc_seq ();
2732 break; 2728 break;
2733 2729
2734 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2735 case 'c': 2731 case 'c':
2736 mbstate.reset (); 2732 mbstate.reset ();
2737 scr_poweron (); 2733 scr_poweron ();
2738 scrollbar_show (1); 2734 scrollBar.show (1);
2739 break; 2735 break;
2740 2736
2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2742 case 'n': 2738 case 'n':
2743 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
2763 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,
2764 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 ,
2765 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
2766}; 2762};
2767 2763
2768#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2771#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2772 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2773 2769
2774const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2775 { 2771 {
2776 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, */
2777 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, */
2778 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, */
2779 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, [, \, ], ^, _, */
… …
2794 2790
2795 nargs = 0; 2791 nargs = 0;
2796 2792
2797 priv = 0; 2793 priv = 0;
2798 ch = cmd_getc (); 2794 ch = cmd_getc ();
2799 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
2800 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
2801 priv = ch; 2798 priv = ch;
2802 ch = cmd_getc (); 2799 ch = cmd_getc ();
2803 } 2800 }
2804 2801
2805 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
2848 { 2845 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2846 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2847 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 // 2848 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2849 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2850 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854 // that we do not support xterm mouse reporting (should be 95 when we do). 2851 // versions.
2855 // 2852 //
2856 tt_printf ("\033[>%d;94;0c", 'U'); 2853 tt_printf ("\033[>%d;95;0c", 'U');
2857 } 2854 }
2858 break; 2855 break;
2856
2859 case '?': 2857 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
2862 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);
2863 } 2873 }
2874 break;
2875 }
2876
2864 return; 2877 return;
2865 } 2878 }
2866 2879
2867 switch (ch) 2880 switch (ch)
2868 { 2881 {
… …
3102 { 3115 {
3103 /* 3116 /*
3104 * commands 3117 * commands
3105 */ 3118 */
3106 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3107 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3108 break; 3121 break;
3109 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3110 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3111 break; 3124 break;
3112 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3113 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3114 break; 3127 break;
3115 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3117 break; 3130 break;
3118 case 5: /* raise window */ 3131 case 5: /* raise window */
3119 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3120 break; 3133 break;
3121 case 6: /* lower window */ 3134 case 6: /* lower window */
3122 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3123 break; 3136 break;
3124 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3125 scr_touch (true); 3138 scr_touch (true);
3126 break; 3139 break;
3127 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3138 3151
3139 /* 3152 /*
3140 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3141 */ 3154 */
3142 case 11: /* report window state */ 3155 case 11: /* report window state */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3158 break;
3146 case 13: /* report window position */ 3159 case 13: /* report window position */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3148 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3165 break;
3153 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3169 break;
3157 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3172 break;
… …
3161 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3175 break;
3163 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3164 { 3177 {
3165 char *s; 3178 char *s;
3166 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3167 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 */
3168 XFree (s); 3181 XFree (s);
3169 } 3182 }
3170 break; 3183 break;
3171 case 21: /* report window title */ 3184 case 21: /* report window title */
3172 { 3185 {
3173 char *s; 3186 char *s;
3174 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3175 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 */
3176 XFree (s); 3189 XFree (s);
3177 } 3190 }
3178 break; 3191 break;
3179 } 3192 }
… …
3235 * 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)'
3236 */ 3249 */
3237void 3250void
3238rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3239{ 3252{
3240 char *s;
3241 unicode_t eh;
3242
3243 /* 3253 /*
3244 * Not handled yet 3254 * Not handled yet
3245 */ 3255 */
3256
3257 unicode_t eh;
3246 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3247 if (s) 3259 if (s)
3248 free (s); 3260 free (s);
3249 3261
3250 return; 3262 return;
3251} 3263}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3268 */
3257void 3269void
3258rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3259{ 3271{
3260 unicode_t ch, eh;
3261 int arg; 3272 int arg;
3262 3273
3263 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3266 3277
3267 if (ch == ';') 3278 if (ch == ';')
3268 { 3279 {
3280 unicode_t eh;
3269 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3270 3282
3271 if (s) 3283 if (s)
3272 { 3284 {
3273 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3297 3309
3298/* 3310/*
3299 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3300 */ 3312 */
3301void 3313void
3302rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3303{ 3315{
3304 int color; 3316 int color;
3305 char *buf, *name; 3317 char *buf, *name;
3306 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3307 int saveop = op; 3319 int saveop = op;
… …
3334 unsigned long bytes_after; 3346 unsigned long bytes_after;
3335 unsigned char *value = 0; 3347 unsigned char *value = 0;
3336 const char *str = ""; 3348 const char *str = "";
3337 3349
3338 if (prop 3350 if (prop
3339 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3340 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3341 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3342 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3343 && actual_type != None 3355 && actual_type != None
3344 && actual_format == 8) 3356 && actual_format == 8)
… …
3348 3360
3349 XFree (value); 3361 XFree (value);
3350 } 3362 }
3351 else 3363 else
3352 { 3364 {
3353 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3354 3366
3355 if (eq) 3367 if (eq)
3356 { 3368 {
3357 *eq = 0; 3369 *eq = 0;
3358 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3359 } 3371 }
3360 else 3372 else
3361 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3362 display->atom (str)); 3374 display->atom (str));
3363 } 3375 }
3364 break; 3376 break;
3365 3377
3366 case XTerm_Color: 3378 case XTerm_Color:
… …
3379 *buf++ = '\0'; 3391 *buf++ = '\0';
3380 3392
3381 process_color_seq (op, color, name, resp); 3393 process_color_seq (op, color, name, resp);
3382 } 3394 }
3383 break; 3395 break;
3396 case Rxvt_restoreFG:
3384 case XTerm_Color00: 3397 case XTerm_Color00:
3385 process_color_seq (op, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
3386 break; 3399 break;
3400 case Rxvt_restoreBG:
3387 case XTerm_Color01: 3401 case XTerm_Color01:
3388 process_color_seq (op, Color_bg, str, resp); 3402 process_color_seq (op, Color_bg, str, resp);
3389 break; 3403 break;
3390#ifndef NO_CURSORCOLOR 3404#ifndef NO_CURSORCOLOR
3391 case XTerm_Color_cursor: 3405 case XTerm_Color_cursor:
… …
3396 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3397 break; 3411 break;
3398 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3399 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3400 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
3401#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3402 case XTerm_Color_RV:
3403 process_color_seq (op, Color_RV, str, resp);
3404 break;
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3408 break; 3426 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3412 break; 3429 break;
3413 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
3415 break; 3432 break;
3416#endif 3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3417#if ENABLE_TRANSPARENCY 3437#if ENABLE_TRANSPARENCY
3418 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3419 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3420 { 3440 {
3421 bool changed = false; 3441 bool changed = false;
3442
3422 if (ISSET_PIXCOLOR (Color_tint)) 3443 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3424 else 3445
3425 changed = bgPixmap.unset_tint ();
3426 if (changed) 3446 if (changed)
3427 update_background (); 3447 update_background ();
3428 } 3448 }
3429 3449
3430 break; 3450 break;
… …
3434 case Rxvt_Pixmap: 3454 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3455 if (!strcmp (str, "?"))
3436 { 3456 {
3437 char str[256]; 3457 char str[256];
3438 3458
3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3459 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3460 min (h_scale, 32767), min (v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3461 min (h_align, 32767), min (v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3463 }
3444 else 3464 else
3445 { 3465 {
3446 int changed = 0; 3466 int changed = 0;
3447 3467
3448 if (*str != ';') 3468 if (*str != ';')
3449 { 3469 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3453 changed++; 3472 changed++;
3454 str = strchr (str, ';'); 3473 str = strchr (str, ';');
3455 if (str == NULL) 3474 if (str == NULL)
3456 bgPixmap.set_defaultGeometry (); 3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3457 } 3479 }
3458 while (str) 3480 else
3459 { 3481 {
3460 str++; 3482 str++;
3461 if (bgPixmap.set_geometry (str)) 3483 if (bg_set_geometry (str, true))
3462 changed++; 3484 changed++;
3463 str = strchr (str, ';');
3464 } 3485 }
3486
3465 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 }
3466 update_background (); 3495 update_background ();
3496 }
3467 } 3497 }
3468 break; 3498 break;
3469#endif 3499#endif
3470
3471 case Rxvt_restoreFG:
3472 set_window_color (Color_fg, str);
3473 break;
3474 case Rxvt_restoreBG:
3475 set_window_color (Color_bg, str);
3476 break;
3477 3500
3478 case XTerm_logfile: 3501 case XTerm_logfile:
3479 // TODO, when secure mode? 3502 // TODO, when secure mode?
3480 break; 3503 break;
3481 3504
… …
3548 break; 3571 break;
3549#endif 3572#endif
3550 3573
3551#if ENABLE_PERL 3574#if ENABLE_PERL
3552 case URxvt_perl: 3575 case URxvt_perl:
3553 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));
3554 ; // no responses yet
3555 break; 3577 break;
3556#endif 3578#endif
3557 } 3579 }
3558} 3580}
3559/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
3582 { 3604 {
3583 if (mode == 'r') 3605 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3607 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 PrivMode (state, bit); 3609
3610 set_privmode (bit, state);
3588 } 3611 }
3589 3612
3590 return state; 3613 return state;
3591} 3614}
3592 3615
… …
3600 static const struct 3623 static const struct
3601 { 3624 {
3602 const int argval; 3625 const int argval;
3603 const unsigned long bit; 3626 const unsigned long bit;
3604 } argtopriv[] = { 3627 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, 3628 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3629 { 2, PrivMode_vt52 },
3607 { 3, PrivMode_132 }, 3630 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, 3631 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, 3632 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, 3633 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, 3634 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, bi-directional support mode 3635 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
3614 // 18, 19 printing-related 3637 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region
3615 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3616#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3617 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3618#endif 3642#endif
3619 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3647 // 45 margin bell NYI
3623 // 46 start logging 3648 // 46 start logging
3624 { 47, PrivMode_Screen }, 3649 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, 3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3626#ifndef NO_BACKSPACE_KEY 3651#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, 3652 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3653#endif
3629 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
3630 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3655 { 1002, PrivMode_MouseBtnEvent },
3631 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3656 { 1003, PrivMode_MouseAnyEvent },
3632 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 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
3635 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
3638 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
3639 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
3640 { 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 */
3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3672 { 2004, PrivMode_BracketPaste },
3642 }; 3673 };
3643 3674
3644 if (nargs == 0) 3675 if (nargs == 0)
3645 return; 3676 return;
3646 3677
… …
3653 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
3654 { 3685 {
3655 state = -1; 3686 state = -1;
3656 3687
3657 /* basic handling */ 3688 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
3660 { 3691 {
3661 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
3662 break; 3693 break;
3663 } 3694 }
… …
3671 3702
3672 scr_touch (true); 3703 scr_touch (true);
3673 break; 3704 break;
3674#endif 3705#endif
3675 case 1048: /* alternative cursor save */ 3706 case 1048: /* alternative cursor save */
3676 case 1049:
3677 if (option (Opt_secondaryScreen)) 3707 if (option (Opt_secondaryScreen))
3678 if (mode == 0) 3708 if (mode == 0)
3679 scr_cursor (RESTORE); 3709 scr_cursor (RESTORE);
3680 else if (mode == 1) 3710 else if (mode == 1)
3681 scr_cursor (SAVE); 3711 scr_cursor (SAVE);
… …
3690 case 2: /* VT52 mode */ 3720 case 2: /* VT52 mode */
3691 /* oddball mode. should be set regardless of set/reset 3721 /* oddball mode. should be set regardless of set/reset
3692 * parameter. Return from VT52 mode with an ESC < from 3722 * parameter. Return from VT52 mode with an ESC < from
3693 * within VT52 mode 3723 * within VT52 mode
3694 */ 3724 */
3695 PrivMode (1, PrivMode_vt52); 3725 set_privmode (PrivMode_vt52, 1);
3696 break; 3726 break;
3697 case 3: /* 80/132 */ 3727 case 3: /* 80/132 */
3698 if (priv_modes & PrivMode_132OK) 3728 if (priv_modes & PrivMode_132OK)
3699 set_widthheight (((state ? 132 : 80) * fwidth), height); 3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3700 break; 3730 break;
3701 case 4: /* smooth scrolling */ 3731 case 4: /* smooth scrolling */
3702 set_option (Opt_jumpScroll, !state); 3732 set_option (Opt_jumpScroll, !state);
3703 break; 3733 break;
3704 case 5: /* reverse video */ 3734 case 5: /* reverse video */
… …
3711 scr_autowrap (state); 3741 scr_autowrap (state);
3712 break; 3742 break;
3713 /* case 8: - auto repeat, can't do on a per window basis */ 3743 /* case 8: - auto repeat, can't do on a per window basis */
3714 case 9: /* X10 mouse reporting */ 3744 case 9: /* X10 mouse reporting */
3715 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3716 priv_modes &= ~PrivMode_MouseX11; 3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717 break; 3747 break;
3718#ifdef scrollBar_esc 3748#ifdef scrollBar_esc
3719 case scrollBar_esc: 3749 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3750 if (scrollBar.map (state))
3721 { 3751 {
3722 resize_all_windows (0, 0, 0); 3752 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3753 scr_touch (true);
3724 } 3754 }
3725 break; 3755 break;
… …
3734 break; 3764 break;
3735 /* case 66: - application key pad */ 3765 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3766 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3767 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3768 if (state) /* orthogonal */
3739 priv_modes &= ~PrivMode_MouseX10; 3769 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3770 break;
3741#if 0
3742 case 1001: 3771 case 1002:
3743 break; /* X11 mouse highlighting */ 3772 case 1003:
3744#endif 3773 if (state)
3774 {
3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3778 vt_emask_mouse = PointerMotionMask;
3779 }
3780 else
3781 vt_emask_mouse = NoEventMask;
3782
3783 vt_select_input ();
3784 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3785 case 1010: /* scroll to bottom on TTY output inhibit */
3746 set_option (Opt_scrollTtyOutput, !state); 3786 set_option (Opt_scrollTtyOutput, !state);
3747 break; 3787 break;
3748 case 1011: /* scroll to bottom on key press */ 3788 case 1011: /* scroll to bottom on key press */
3749 set_option (Opt_scrollTtyKeypress, state); 3789 set_option (Opt_scrollTtyKeypress, state);
3750 break; 3790 break;
3751 case 1047: /* secondary screen w/ clearing last */ 3791 case 1047: /* secondary screen w/ clearing last */
3752 if (option (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3793 if (!state)
3754 scr_erase_screen (2); 3794 scr_erase_screen (2);
3795
3755 scr_change_screen (state); 3796 scr_change_screen (state);
3756 break; 3797 break;
3757 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
3758 scr_change_screen (state); 3803 scr_change_screen (state);
3804
3759 if (option (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3806 if (state)
3761 scr_erase_screen (2); 3807 scr_erase_screen (2);
3808 else
3809 scr_cursor (RESTORE);
3762 break; 3810 break;
3763 default: 3811 default:
3764 break; 3812 break;
3765 } 3813 }
3766 } 3814 }
… …
3919 } 3967 }
3920 } 3968 }
3921} 3969}
3922/*}}} */ 3970/*}}} */
3923 3971
3924/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3925void
3926rxvt_term::process_graphics ()
3927{
3928 unicode_t ch, cmd = cmd_getc ();
3929
3930 if (cmd == 'Q')
3931 { /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return;
3934 }
3935 /* swallow other graphics sequences until terminating ':' */
3936 do
3937 ch = cmd_getc ();
3938 while (ch != ':');
3939}
3940/*}}} */
3941
3942/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
3943 3973
3944/* 3974/*
3945 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
3946 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
3959 3989
3960/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
3961/* 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,
3962 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
3963 */ 3993 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965 3995
3966void 3996void
3967rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 3998{
3969 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)))
… …
3974 4004
3975 if (v_buflen == 0) 4005 if (v_buflen == 0)
3976 { 4006 {
3977 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));
3978 4008
4009 max_it (written, 0);
4010
3979 if ((unsigned int)written == len) 4011 if (written == len)
3980 return; 4012 return;
3981 4013
3982 data += written; 4014 data += written;
3983 len -= written; 4015 len -= written;
3984 } 4016 }
3985 4017
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4019
3988 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4021 v_buflen += len;
3990 4022
3991 pty_ev.set (EVENT_READ | EVENT_WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);
3992} 4024}
3993 4025
3994void rxvt_term::pty_write () 4026void rxvt_term::pty_write ()
3995{ 4027{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4028 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4002 if (v_buflen == 0) 4034 if (v_buflen == 0)
4003 { 4035 {
4004 free (v_buffer); 4036 free (v_buffer);
4005 v_buffer = 0; 4037 v_buffer = 0;
4006 4038
4007 pty_ev.set (EVENT_READ); 4039 pty_ev.set (ev::READ);
4008 return; 4040 return;
4009 } 4041 }
4010 4042
4011 memmove (v_buffer, v_buffer + written, v_buflen); 4043 memmove (v_buffer, v_buffer + written, v_buflen);
4012 } 4044 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4045 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ); 4046 pty_ev.set (ev::READ);
4015} 4047}
4016 4048
4017/*----------------------- end-of-file (C source) -----------------------*/ 4049/*----------------------- end-of-file (C source) -----------------------*/
4018 4050

Diff Legend

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