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.327 by ayin, Mon Jun 11 13:33:34 2007 UTC vs.
Revision 1.477 by root, Mon Feb 21 07:41:00 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-2007 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 615# endif
520 return; 616 return;
521 } 617 }
522 else 618 else
523 { 619 {
524# if ENABLE_OVERLAY 620# if ISO_14755
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 635# endif
539 } 636 }
540#endif 637#endif
541 638
542#ifdef PRINTPIPE 639#ifdef PRINTPIPE
543 if (keysym == XK_Print) 640 if (keysym == XK_Print)
544 { 641 {
545 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
546 return; 643 return;
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
552 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
553 newlen = 1; 689 newlen = 0;
554 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 777 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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; 778 newlen = 0;
840 break;
841 } 779 }
842 780 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
846 785
847 /* 786 /*
848 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
849 */ 788 */
850#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
934#if ENABLE_FRILLS || ISO_14755 873#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 874 // ISO 14755 support
936 if (iso14755buf) 875 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 876 if (iso14755buf & ISO_14755_52)
938 { 877 {
939# if ENABLE_OVERLAY 878# if ISO_14755
940 scr_overlay_off (); 879 scr_overlay_off ();
941# endif 880# endif
942# if ISO_14755 881# if ISO_14755
943 // iso14755 part 5.2 handling: release time 882 // iso14755 part 5.2 handling: release time
944 // first: controls 883 // first: controls
… …
950 commit_iso14755 (); 889 commit_iso14755 ();
951 890
952 return; 891 return;
953 } 892 }
954 893
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 895 if (i[0] == keysym)
957 { 896 {
958 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 898 commit_iso14755 ();
960 899
… …
967 906
968 return; 907 return;
969 } 908 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 910 {
972# if ENABLE_OVERLAY 911# if ISO_14755
973 scr_overlay_off (); 912 scr_overlay_off ();
974# endif 913# endif
975 if (iso14755buf & ISO_14755_51) 914 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 915 commit_iso14755 ();
977#if ISO_14755 916#if ISO_14755
… …
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
1040#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 980 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 981 {
1043 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 983 scr_touch (false);
1046 } 984 }
1047#endif 985#endif
1048 986
1049 if (want_refresh) 987 if (want_refresh)
… …
1085 } 1023 }
1086 while (row < end_row); 1024 while (row < end_row);
1087 } 1025 }
1088 1026
1089 scr_refresh (); 1027 scr_refresh ();
1090 scrollbar_show (1); 1028 scrollBar.show (1);
1091#ifdef USE_XIM 1029#ifdef USE_XIM
1092 IMSendSpot (); 1030 IMSendSpot ();
1093#endif 1031#endif
1094 } 1032 }
1095 1033
1096 display->flush (); 1034 display->flush ();
1097} 1035}
1098 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1099void 1038void
1100rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1049{
1102 make_current (); 1050 make_current ();
1103 1051
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1052 refresh_count = 0;
1117 flush (); 1053 flush ();
1118} 1054}
1119 1055
1120#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1121void 1057void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1059{
1124 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1061 want_refresh = 1;
1126 1062 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1063}
1129#endif 1064#endif
1130 1065
1131#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1132void 1067void
1133rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1069{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1071 {
1137 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1138 want_refresh = 1; 1073 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1140 } 1075 }
1076 else
1077 w.stop ();
1141} 1078}
1142#endif 1079#endif
1143 1080
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1082void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1084{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1087 {
1151 want_refresh = 1; 1088 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1153 } 1090 }
1091 else
1092 w.stop ();
1154} 1093}
1155#endif 1094#endif
1156 1095
1157#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1158void 1097void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1099{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1101 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1103 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1166 } 1105 }
1106 else
1107 w.stop ();
1167} 1108}
1168#endif 1109#endif
1169 1110
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1112void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1114{
1174 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1116 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1117 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1183 } 1125 }
1184} 1126}
1185#endif 1127#endif
1186 1128
1187#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1188static struct event_handler 1130static struct event_handler
1189{ 1131{
1190 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1191 1133
1192 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1193 { 1135 {
1194 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1198 1143
1199 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1201 1146
1202 w.stop (); 1147 w.stop ();
1203 } 1148 }
1204 1149
… …
1243 pty_ev.stop (); 1188 pty_ev.stop ();
1244 1189
1245 if (!option (Opt_hold)) 1190 if (!option (Opt_hold))
1246 destroy (); 1191 destroy ();
1247 } 1192 }
1248 1193
1249 return false; 1194 return false;
1250} 1195}
1251 1196
1252void 1197void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1199{
1255 make_current (); 1200 make_current ();
1256 1201
1257 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1205 cmd_parse ();
1261 break;
1262 1206
1263 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1264 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1265} 1211}
1266 1212
1267void 1213void
1268rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1269{ 1215{
… …
1272 1218
1273#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1220 hidden_pointer = 0;
1275 1221
1276 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1278#endif 1224#endif
1279} 1225}
1280 1226
1281#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1282void 1228void
… …
1290 1236
1291 hidden_pointer = 1; 1237 hidden_pointer = 1;
1292} 1238}
1293 1239
1294void 1240void
1295rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1242{
1297 make_current (); 1243 make_current ();
1298 1244
1299 pointer_blank (); 1245 pointer_blank ();
1300} 1246}
… …
1303void 1249void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1251{
1306 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1307 int x, y; 1253 int x, y;
1254 int code = 32;
1308 1255
1309 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1311 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1312 1268
1313 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1314 button_number = 3; 1270 button_number = 3;
1315 else 1271 else
1316 { 1272 {
1317 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1275 if (button_number >= 3)
1320 button_number += (64 - 3); 1276 button_number += 64 - 3;
1321 } 1277 }
1322 1278
1323 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1324 { 1280 {
1325 /* 1281 /*
… …
1357 fputc ('A', stderr); 1313 fputc ('A', stderr);
1358 if (key_state & 32) 1314 if (key_state & 32)
1359 fputc ('2', stderr); 1315 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1317 button_number,
1362 x + 1, 1318 x,
1363 y + 1); 1319 y);
1364#endif 1320#endif
1365 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1366 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1336 code + button_number + key_state,
1368 (32 + x + 1), 1337 32 + x,
1369 (32 + y + 1)); 1338 32 + y);
1370} 1339}
1371 1340
1372/*{{{ process an X event */ 1341/*{{{ process an X event */
1373void 1342void
1374rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1404 focus_out ();
1436 } 1405 }
1437#endif 1406#endif
1438 } 1407 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1408 break;
1444 1409
1445 /* 1410 /*
1446 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1485 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1486 { 1451 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1453 ;
1489 1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1473
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1475 {
1492 seen_resize = 1; 1476 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1478 }
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize) 1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1496 { 1483 {
1484 if (mapped)
1485 update_background ();
1497 resize_pixmap (); 1486 else
1498 scr_touch (true); 1487 bg_invalidate ();
1499 } 1488 }
1500#endif 1489#endif
1501 } 1490 }
1502 1491
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1493 }
1510 break; 1494 break;
1511 1495
1512 case PropertyNotify: 1496 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1498 break;
1519 1499
1520 case SelectionClear: 1500 case SelectionClear:
1521 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1502 break;
1528 1503
1529 case SelectionRequest: 1504 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1531 break; 1506 break;
1532 1507
1533 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1534 mapped = 1; 1525 mapped = 1;
1535#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1537#endif 1528#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1530 break;
1540 1531
1541 case UnmapNotify: 1532 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1545#endif 1536#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1538 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1539
1555 case GraphicsExpose: 1540 case GraphicsExpose:
1556 case Expose: 1541 case Expose:
1557 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1558 { 1543 {
1559 do 1544 do
1545 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1550
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1552
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1569 1558
1570 want_refresh = 1; 1559 want_refresh = 1;
1571 } 1560 }
1572 else 1561 else
1573 { 1562 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1566 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1568 ;
1580 1569
1581 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1571 {
1583 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1573 scrollBar.show (0);
1585 } 1574 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1575 }
1592 break; 1576 break;
1593 1577
1594 case MotionNotify: 1578 case MotionNotify:
1595#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1580 if (hidden_pointer)
1597 pointer_unblank (); 1581 pointer_unblank ();
1598#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1587 break;
1601 1588
1602 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1603 { 1590 {
… …
1637 int dist; 1624 int dist;
1638 1625
1639 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1641 */ 1628 */
1642 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1631
1645 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1647 */ 1634 */
1648 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1670 else 1657 else
1671 { 1658 {
1672 /* we are within the text window, so we 1659 /* we are within the text window, so we
1673 * shouldn't be scrolling 1660 * shouldn't be scrolling
1674 */ 1661 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1677 } 1663 }
1678#endif 1664#endif
1679#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1680 } 1666 }
1681#endif 1667#endif
1682 } 1668 }
1683 } 1669 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1671 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1688 ; 1674 ;
1689 1675
… …
1691 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1680 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1682 scrollBar.size ());
1697 want_refresh = 1; 1683 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1684 scrollBar.show (1);
1700 } 1685 }
1701 break; 1686 break;
1702 } 1687 }
1703 1688
1704#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1708 { 1693 {
1709 hidden_cursor = 0; 1694 hidden_cursor = 0;
1710 want_refresh = 1; 1695 want_refresh = 1;
1711 } 1696 }
1712 1697
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1714 } 1699 }
1715#endif 1700#endif
1716 1701
1717#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1710
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1712 pointer_blank ();
1728 } 1713 }
1729#endif 1714#endif
1715
1716 refresh_check ();
1730} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1731 1734
1732void 1735void
1733rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1734{ 1737{
1735 if (!focus) 1738 if (!focus)
1736 { 1739 {
1737 focus = 1; 1740 focus = 1;
1738 want_refresh = 1; 1741 want_refresh = 1;
1739 1742
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1743#if USE_XIM
1743 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1744 { 1745 {
1745 IMSetPosition (); 1746 IMSetPosition ();
1746 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1747 } 1748 }
1748#endif 1749#endif
1749#if CURSOR_BLINK 1750#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1752#endif 1753#endif
1753#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1755 { 1756 {
1756 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1758 scr_recolour ();
1758 } 1759 }
1759#endif 1760#endif
1760#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1762 { 1763 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1773 } 1767 }
1774} 1768}
1775 1769
1776void 1770void
1777rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1779 if (focus) 1773 if (focus)
1780 { 1774 {
1781 focus = 0; 1775 focus = 0;
1782 want_refresh = 1; 1776 want_refresh = 1;
1783 1777
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1785 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1786#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1783 if (iso14755buf)
1788 { 1784 {
1789 iso14755buf = 0; 1785 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1786# if ISO_14755
1791 scr_overlay_off (); 1787 scr_overlay_off ();
1792# endif 1788# endif
1793 } 1789 }
1794#endif 1790#endif
1795#if USE_XIM 1791#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1798#endif 1794#endif
1799#if CURSOR_BLINK 1795#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1802 hidden_cursor = 0; 1799 hidden_cursor = 0;
1803#endif 1800#endif
1804#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1806 { 1803 {
1807 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1805 scr_recolour ();
1809 } 1806 }
1810#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1811 } 1810 }
1812} 1811}
1813 1812
1814void 1813void
1815rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1822 }
1824#endif 1823#endif
1825} 1824}
1826 1825
1827#if TRANSPARENT || ENABLE_PERL 1826#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1827void
1829rxvt_term::rootwin_cb (XEvent &ev) 1828rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1829{
1831 make_current (); 1830 make_current ();
1832 1831
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1834 return;
1836 1835
1837# if TRANSPARENT 1836# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1837 switch (ev.type)
1839 { 1838 {
1840 case PropertyNotify: 1839 case PropertyNotify:
1841 /* 1840 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1841 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1844 */ 1843 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1846 {
1847 bg_set_root_pixmap ();
1848 update_background ();
1849 }
1848 1850
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1851 break;
1854 } 1852 }
1855# endif 1853# endif
1854
1855 refresh_check ();
1856} 1856}
1857#endif 1857#endif
1858 1858
1859void 1859void
1860rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1891 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1895 { 1895 {
1896 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1897 MEvent.clicks++; 1897 MEvent.clicks++;
1898 1898
1899 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1900 { 1900 {
1901 /* only report double clicks */ 1901 /* only report double clicks */
… …
1915 mouse_report (ev); 1915 mouse_report (ev);
1916 } 1916 }
1917#else 1917#else
1918 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1919 mouse_report (ev); 1919 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1921
1922 } 1922 }
1923 else 1923 else
1924 { 1924 {
1925 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1973 } 1973 }
1974 1974
1975 /* 1975 /*
1976 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1977 */ 1977 */
1978 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1979 {
1980 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1981 /* 1988 /*
1982 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1990 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1985 * 1992 *
… …
1994 /* 2001 /*
1995 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1998 */ 2005 */
1999 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
2009 else 2010 else
2010 switch (ev.button) 2011 switch (ev.button)
2011 { 2012 {
2012 case Button2: 2013 case Button2:
… …
2019 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
2020 break; 2021 break;
2021 } 2022 }
2022 } 2023 }
2023 else 2024 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2026 {
2031 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2028 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2032#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2049 { 2034 {
2050 if (upordown < 0) 2035 if (direction == UP)
2051 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2052 else 2037 else
2053 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2054 } 2039 }
2055 } 2040 }
2056 else 2041 else
2057 switch (ev.button) 2042 switch (ev.button)
2058 { 2043 {
2059 case Button2: 2044 case Button2:
2060 switch (scrollbar_align) 2045 switch (scrollBar.align)
2061 { 2046 {
2062 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2048 csrO = 0;
2064 break; 2049 break;
2065 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2071 } 2056 }
2072 2057
2073 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2077 2062
2078 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2079 break; 2064 break;
2080 2065
2081 case Button1: 2066 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2085 2070
2086 case Button3: 2071 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2097 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2098# else 2083# else
2099 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2100# endif 2085# endif
2101 else 2086 else
2102 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2103 } 2088 }
2104 else 2089 else
2105 { 2090 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2092 (nrow
2108 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2109 / scrollbar_size ())); 2094 / scrollBar.size ()));
2110 } 2095 }
2111 2096
2112 break; 2097 break;
2113 } 2098 }
2114 } 2099 }
… …
2124 2109
2125 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2111 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2113
2129 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2115 {
2131 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2117 scrollBar.show (0);
2133 } 2118 }
2134 2119
2135#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2138#endif 2122#endif
2139 2123
2140 if (ev.window == vt) 2124 if (ev.window == vt)
2141 { 2125 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2150 mouse_report (ev);
2167 } 2151 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2170 mouse_report (ev); 2154 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2156 return;
2173 } 2157 }
2174 2158
2175 /* 2159 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2188 selection_make (ev.time); 2172 selection_make (ev.time);
2189 break; 2173 break;
2190 2174
2191 case Button2: 2175 case Button2:
2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2178 break;
2195 2179
2196#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2197 case Button4: 2181 case Button4:
2198 case Button5: 2182 case Button5:
… …
2214 { 2198 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2202
2219 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2205 }
2224 else 2206 else
2207# endif
2225 { 2208 {
2226# endif
2227 scr_page (v, i); 2209 scr_page (v, i);
2228 scrollbar_show (1); 2210 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2211 }
2231# endif
2232 } 2212 }
2233 break; 2213 break;
2234#endif 2214#endif
2235 } 2215 }
2236 } 2216 }
2237} 2217}
2238 2218
2239#ifdef TRANSPARENT
2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = term->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2487 unsigned long nitems, bytes_after;
2488 Atom atype;
2489 unsigned char *prop = NULL;
2490 Window root, oldp, *list;
2491 Pixmap rootpixmap = None;
2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2495
2496 pchanged = 0;
2497
2498 if (!option (Opt_transparent))
2499 return /*pchanged*/; /* Don't try any more */
2500
2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2502 rootdepth = wrootattr.depth;
2503
2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2505
2506 if (rootdepth != wattr.depth)
2507 {
2508 if (am_transparent)
2509 {
2510 pchanged = 1;
2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = am_pixmap_trans = 0;
2513 }
2514
2515 return /*pchanged*/; /* Don't try any more */
2516 }
2517
2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2519 XSync (dpy, False);
2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2528 /*
2529 * Make the frame window set by the window manager have
2530 * the root background. Some window managers put multiple nested frame
2531 * windows for each client, so we have to take care about that.
2532 */
2533 i = (xa[XA_XROOTPMAP_ID]
2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2536 &nitems, &bytes_after, &prop) == Success);
2537
2538 if (!i || prop == NULL)
2539 i = (xa[XA_ESETROOT_PMAP_ID]
2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2542 &nitems, &bytes_after, &prop) == Success);
2543
2544 if (!i || prop == NULL
2545#if TINTING
2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2551#endif
2552 )
2553 have_pixmap = 0;
2554 else
2555 {
2556 have_pixmap = 1;
2557 rootpixmap = *(Pixmap *)prop;
2558 XFree (prop);
2559 }
2560
2561 if (have_pixmap)
2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2685 /*
2686 * Copy display->root pixmap transparency
2687 */
2688 int nx, ny;
2689 unsigned int nw, nh;
2690 XImage *image;
2691
2692 nw = (unsigned int)szHint.width;
2693 nh = (unsigned int)szHint.height;
2694 nx = ny = 0;
2695
2696 if (sx < 0)
2697 {
2698 nw += sx;
2699 nx = -sx;
2700 sx = 0;
2701 }
2702
2703 if (sy < 0)
2704 {
2705 nh += sy;
2706 ny = -sy;
2707 sy = 0;
2708 }
2709
2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2712
2713 XSync (dpy, False);
2714 allowedxerror = -1;
2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2716
2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2718 /* XXX: may need a delay here? */
2719 allowedxerror = 0;
2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2749 {
2750 if (am_transparent && am_pixmap_trans)
2751 {
2752 pchanged = 1;
2753 if (pixmap != None)
2754 {
2755 XFreePixmap (dpy, pixmap);
2756 pixmap = None;
2757 }
2758 }
2759
2760 am_pixmap_trans = 0;
2761 }
2762 else
2763 {
2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2765 XClearWindow (dpy, parent[0]);
2766
2767 if (!am_transparent || !am_pixmap_trans)
2768 pchanged = 1;
2769
2770 am_transparent = am_pixmap_trans = 1;
2771 }
2772 }
2773
2774 if (am_pixmap_trans)
2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2776 else
2777 {
2778 unsigned int n;
2779 /*
2780 * InheritPixmap transparency
2781 */
2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2783 {
2784 oldp = parent[i];
2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2786 XFree (list);
2787
2788 if (parent[i] == display->root)
2789 {
2790 if (oldp != None)
2791 pchanged = 1;
2792
2793 break;
2794 }
2795
2796 if (oldp != parent[i])
2797 pchanged = 1;
2798 }
2799
2800 n = 0;
2801
2802 if (pchanged)
2803 for (; n < (unsigned int)i; n++)
2804 {
2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2808 {
2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2810 break;
2811 }
2812 }
2813
2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2815 {
2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2818 am_transparent = 0;
2819 /* XXX: also turn off Opt_transparent? */
2820 }
2821 else
2822 {
2823 for (n = 0; n < (unsigned int)i; n++)
2824 {
2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2826 XClearWindow (dpy, parent[n]);
2827 }
2828
2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2830 am_transparent = 1;
2831 }
2832
2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2834 parent[i] = None;
2835 }
2836
2837 if (scrollBar.win)
2838 {
2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2840 scrollBar.setIdle ();
2841 scrollbar_show (0);
2842 }
2843
2844 if (am_transparent)
2845 {
2846 want_refresh = want_full_refresh = 1;
2847 if (am_pixmap_trans)
2848 flush ();
2849 }
2850
2851// return pchanged;
2852}
2853#endif
2854
2855/*}}} */ 2219/*}}} */
2856 2220
2857bool 2221void
2858rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2859{ 2223{
2860 bool flag = false;
2861 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2862 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2863 2226
2864 for (;;) 2227 for (;;)
2865 { 2228 {
2866 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2867 { 2230 {
2868 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2869 ch = next_char (); 2232 ch = next_char ();
2870 2233
2871 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2872 break; 2235 break;
2873 } 2236 }
2874 2237
2875 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2876 { 2239 {
2877 if (!seen_input) 2240 if (expect_false (!seen_input))
2878 { 2241 {
2879 seen_input = 1; 2242 seen_input = 1;
2880 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2881 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2882 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2895 wchar_t *str = buf; 2258 wchar_t *str = buf;
2896 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2897 2260
2898 for (;;) 2261 for (;;)
2899 { 2262 {
2900 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2901 break; 2264 break;
2902 2265
2903 *str++ = ch; 2266 *str++ = ch;
2904 2267
2905 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2906 { 2269 {
2907 if (ch == C0_LF) 2270 if (ch == C0_LF)
2908 nlines++; 2271 nlines++;
2909 2272
2910 refresh_count++; 2273 refresh_count++;
2911 2274
2912 if (!option (Opt_jumpScroll) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2914 { 2276 {
2915 refreshnow = true;
2916 refresh_count = 0; 2277 refresh_count = 0;
2278
2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2280 {
2281 refreshnow = true;
2917 ch = NOCHAR; 2282 ch = NOCHAR;
2918 break; 2283 break;
2284 }
2919 } 2285 }
2920 2286
2921 // scr_add_lines only works for nlines <= nrow - 1. 2287 // scr_add_lines only works for nlines <= nrow - 1.
2922 if (nlines >= nrow - 1) 2288 if (nlines >= nrow - 1)
2923 { 2289 {
… …
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2317 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2952 scr_add_lines (buf, str - buf, nlines); 2318 scr_add_lines (buf, str - buf, nlines);
2953 2319
2954 /* 2320 /*
2955 * If there have been a lot of new lines, then update the screen 2321 * If there have been a lot of new lines, then update the screen
2956 * What the heck I'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2957 * the number of pages between refreshes is refresh_limit, which 2323 * if skipScroll is enabled.
2958 * is incremented here because we must be doing flat-out scrolling.
2959 */ 2324 */
2960 if (refreshnow) 2325 if (refreshnow)
2961 { 2326 {
2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2963 refresh_limit++;
2964 else
2965 {
2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2968 scr_refresh (); 2327 scr_refresh ();
2969 want_refresh = 1; 2328 want_refresh = 1;
2970 }
2971 } 2329 }
2972
2973 } 2330 }
2974 else 2331 else
2975 { 2332 {
2976 try 2333 try
2977 { 2334 {
… …
2985 } 2342 }
2986 2343
2987 ch = NOCHAR; 2344 ch = NOCHAR;
2988 } 2345 }
2989 } 2346 }
2990
2991 return flag;
2992} 2347}
2993 2348
2994// read the next character 2349// read the next character
2995wchar_t 2350wchar_t
2996rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2997{ 2352{
2998 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2999 { 2354 {
3000 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
3002 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
3003 2358
3004 wchar_t wc; 2359 wchar_t wc;
3005 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
3006 2361
… …
3010 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
3011 break; 2366 break;
3012 } 2367 }
3013 2368
3014 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
3015 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
3016 2374
3017 // assume wchar == unicode 2375 // assume wchar == unicode
3018 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
3019 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
3020 } 2378 }
… …
3064/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
3065#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
3066FILE * 2424FILE *
3067rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
3068{ 2426{
3069 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
3070 2428
3071 if (stream == NULL) 2429 if (stream == NULL)
3072 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
3073 2431
3074 return stream; 2432 return stream;
… …
3085 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
3086 */ 2444 */
3087void 2445void
3088rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
3089{ 2447{
3090 int done; 2448 FILE *fd = popen_printer ();
3091 FILE *fd;
3092 2449
3093 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
3094 return; 2451 return;
3095 2452
3096 /* 2453 /*
3097 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
3098 * is received. 2455 * is received.
3099 */ 2456 */
3100 for (done = 0; !done;) 2457 for (int done = 0; !done; )
3101 { 2458 {
3102 unsigned char buf[8]; 2459 unsigned char buf[8];
3103 unicode_t ch; 2460 unicode_t ch;
3104 unsigned int i, len; 2461 unsigned int i, len;
3105 2462
… …
3124 { 2481 {
3125 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
3126 break; /* done = 1 */ 2483 break; /* done = 1 */
3127 } 2484 }
3128 } 2485 }
3129 2486
3130 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
3131 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
3132 { 2489 {
3133 done = 1; 2490 done = 1;
3134 break; 2491 break;
… …
3136 } 2493 }
3137 } 2494 }
3138 2495
3139 pclose_printer (fd); 2496 pclose_printer (fd);
3140} 2497}
3141#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
3142/*}}} */ 2499/*}}} */
3143 2500
3144/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
3145enum { 2502enum {
3146 C1_40 = 0x40, 2503 C1_40 = 0x40,
… …
3196 process_dcs_seq (); 2553 process_dcs_seq ();
3197 break; 2554 break;
3198 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
3199 process_csi_seq (); 2556 process_csi_seq ();
3200 break; 2557 break;
3201 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
3202 process_osc_seq (); 2559 process_osc_seq ();
3203 break; 2560 break;
3204#endif 2561#endif
3205 } 2562 }
3206} 2563}
… …
3250 break; 2607 break;
3251 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
3252 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3253 break; 2610 break;
3254 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
3255 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
3256 break; 2613 break;
3257 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
3258 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
3259 /* unimplemented */ 2616 /* unimplemented */
3260 break; 2617 break;
… …
3314 scr_forwardindex (); 2671 scr_forwardindex ();
3315 break; 2672 break;
3316#endif 2673#endif
3317 case '=': 2674 case '=':
3318 case '>': 2675 case '>':
3319 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
3320 break; 2677 break;
3321 2678
3322 case C1_40: 2679 case C1_40:
3323 cmd_getc (); 2680 cmd_getc ();
3324 break; 2681 break;
… …
3328 2685
3329 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
3330 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
3331 { 2688 {
3332 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
3333 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3334 } 2691 }
3335 break; 2692 break;
3336 2693
3337 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
3338 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
3363 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3364 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
3365 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3366 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
3367 2724
3368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3369 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
3370 process_csi_seq (); 2727 process_csi_seq ();
3371 break; 2728 break;
3372 2729
3373 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2730 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3374 case C1_OSC: /* ESC ] */ 2731 case C1_OSC: /* ESC ] */
3375 process_osc_seq (); 2732 process_osc_seq ();
3376 break; 2733 break;
3377 2734
3378 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3379 case 'c': 2736 case 'c':
3380 mbstate.reset (); 2737 mbstate.reset ();
3381 scr_poweron (); 2738 scr_poweron ();
3382 scrollbar_show (1); 2739 scrollBar.show (1);
3383 break; 2740 break;
3384 2741
3385 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3386 case 'n': 2743 case 'n':
3387 scr_charset_choose (2); 2744 scr_charset_choose (2);
… …
3407 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3408 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3409 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3410}; 2767};
3411 2768
3412#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3413 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3414 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3415#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
3416 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3417 2774
3418const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
3419 { 2776 {
3420 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3421 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3422 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3423 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3432rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3433{ 2790{
3434 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3435 unsigned int nargs, p; 2792 unsigned int nargs, p;
3436 int n, ndef; 2793 int n, ndef;
3437 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3438 2795
3439 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3440 arg[--nargs] = 0;
3441 2797
3442 priv = 0; 2798 priv = 0;
3443 ch = cmd_getc (); 2799 ch = cmd_getc ();
3444 if (ch >= '<' && ch <= '?') 2800 if ((ch >= '<' && ch <= '?') || ch == '!')
2801 {
3445 { /* '<' '=' '>' '?' */ 2802 /* '<' '=' '>' '?' '!' */
3446 priv = ch; 2803 priv = ch;
3447 ch = cmd_getc (); 2804 ch = cmd_getc ();
3448 } 2805 }
3449 2806
3450 /* read any numerical arguments */ 2807 /* read any numerical arguments */
… …
3489 switch (priv) 2846 switch (priv)
3490 { 2847 {
3491 case '>': 2848 case '>':
3492 if (ch == CSI_DA) /* secondary device attributes */ 2849 if (ch == CSI_DA) /* secondary device attributes */
3493 { 2850 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2851 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2852 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 // 2853 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2854 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2855 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3499 // that we do not support xterm mouse reporting (should be 95 when we do). 2856 // versions.
3500 // 2857 //
3501 tt_printf ("\033[>%d;94;0c", 'U'); 2858 tt_printf ("\033[>%d;95;0c", 'U');
3502 } 2859 }
3503 break; 2860 break;
2861
3504 case '?': 2862 case '?':
3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3506 process_terminal_mode (ch, priv, nargs, arg); 2864 process_terminal_mode (ch, priv, nargs, arg);
3507 break; 2865 break;
2866
2867 case '!':
2868 if (ch == CSI_70)
2869 {
2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2871 scr_soft_reset ();
2872
2873 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3508 } 2878 }
2879 break;
2880 }
2881
3509 return; 2882 return;
3510 } 2883 }
3511 2884
3512 switch (ch) 2885 switch (ch)
3513 { 2886 {
… …
3880 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3881 */ 3254 */
3882void 3255void
3883rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3884{ 3257{
3885 char *s;
3886 unicode_t eh;
3887
3888 /* 3258 /*
3889 * Not handled yet 3259 * Not handled yet
3890 */ 3260 */
3261
3262 unicode_t eh;
3891 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3892 if (s) 3264 if (s)
3893 free (s); 3265 free (s);
3894 3266
3895 return; 3267 return;
3896} 3268}
… …
3900 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3901 */ 3273 */
3902void 3274void
3903rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3904{ 3276{
3905 unicode_t ch, eh;
3906 int arg; 3277 int arg;
3907 3278
3908 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3909 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3910 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3911 3282
3912 if (ch == ';') 3283 if (ch == ';')
3913 { 3284 {
3285 unicode_t eh;
3914 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3915 3287
3916 if (s) 3288 if (s)
3917 { 3289 {
3918 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3942 3314
3943/* 3315/*
3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3945 */ 3317 */
3946void 3318void
3947rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3948{ 3320{
3949 int color; 3321 int color;
3950 char *buf, *name; 3322 char *buf, *name;
3951 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3952 int saveop = op; 3324 int saveop = op;
3953 3325
3954 dLocal (Display *, dpy); 3326 dLocal (Display *, dpy);
3955 3327
3956 assert (str != NULL); 3328 assert (str != NULL);
3957 3329
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3330 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return; 3331 return;
3960 3332
3961 switch (op) 3333 switch (op)
3962 { 3334 {
… …
3993 3365
3994 XFree (value); 3366 XFree (value);
3995 } 3367 }
3996 else 3368 else
3997 { 3369 {
3998 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3999 3371
4000 if (eq) 3372 if (eq)
4001 { 3373 {
4002 *eq = 0; 3374 *eq = 0;
4003 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
… …
4024 *buf++ = '\0'; 3396 *buf++ = '\0';
4025 3397
4026 process_color_seq (op, color, name, resp); 3398 process_color_seq (op, color, name, resp);
4027 } 3399 }
4028 break; 3400 break;
3401 case Rxvt_restoreFG:
4029 case XTerm_Color00: 3402 case XTerm_Color00:
4030 process_color_seq (op, Color_fg, str, resp); 3403 process_color_seq (op, Color_fg, str, resp);
4031 break; 3404 break;
3405 case Rxvt_restoreBG:
4032 case XTerm_Color01: 3406 case XTerm_Color01:
4033 process_color_seq (op, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
4034 break; 3408 break;
4035#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
4036 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
… …
4041 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
4042 break; 3416 break;
4043 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
4044 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
4045 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
4046#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
4047 case XTerm_Color_RV:
4048 process_color_seq (op, Color_RV, str, resp);
4049 break;
4050 case Rxvt_Color_BD:
4051 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
4052 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
4053 break; 3431 break;
4054 case Rxvt_Color_UL:
4055 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
4056 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
4057 break; 3434 break;
4058 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
4059 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
4060 break; 3437 break;
4061#endif 3438#endif
4062#if TRANSPARENT && TINTING 3439 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp);
3441 break;
3442#if ENABLE_TRANSPARENCY
4063 case URxvt_Color_tint: 3443 case URxvt_Color_tint:
4064 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3445 {
3446 bool changed = false;
4065 3447
4066 check_our_parents (); 3448 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
4067 3450
4068 if (am_transparent) 3451 if (changed)
4069 want_full_refresh = want_refresh = 1; 3452 update_background ();
3453 }
4070 3454
4071 break; 3455 break;
4072#endif 3456#endif
4073 3457
3458#if BG_IMAGE_FROM_FILE
4074 case Rxvt_Pixmap: 3459 case Rxvt_Pixmap:
4075 { 3460 if (!strcmp (str, "?"))
4076 if (*str != ';')
4077 { 3461 {
4078#if XPM_BACKGROUND 3462 char str[256];
4079 scale_pixmap (""); /* reset to default scaling */ 3463
4080 set_bgPixmap (str); /* change pixmap */ 3464 sprintf (str, "[%dx%d+%d+%d]",
4081 scr_touch (true); 3465 min (h_scale, 32767), min (v_scale, 32767),
4082#endif 3466 min (h_align, 32767), min (v_align, 32767));
3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
4083 } 3468 }
4084 3469 else
3470 {
4085 int changed = 0; 3471 int changed = 0;
4086 3472
4087 while ((str = strchr (str, ';')) != NULL) 3473 if (*str != ';')
4088 { 3474 {
3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3477 changed++;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3484 }
3485 else
3486 {
4089 str++; 3487 str++;
4090#if XPM_BACKGROUND 3488 if (bg_set_geometry (str, true))
4091 changed += scale_pixmap (str); 3489 changed++;
4092#endif
4093 } 3490 }
4094 3491
4095 if (changed) 3492 if (changed)
4096 { 3493 {
4097#ifdef XPM_BACKGROUND 3494 if (bg_window_position_sensitive ())
4098 resize_pixmap (); 3495 {
4099 scr_touch (true); 3496 int x, y;
4100#endif 3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3500 update_background ();
4101 } 3501 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 } 3502 }
4108 break; 3503 break;
4109 3504#endif
4110 case Rxvt_restoreFG:
4111 set_window_color (Color_fg, str);
4112 break;
4113 case Rxvt_restoreBG:
4114 set_window_color (Color_bg, str);
4115 break;
4116 3505
4117 case XTerm_logfile: 3506 case XTerm_logfile:
4118 // TODO, when secure mode? 3507 // TODO, when secure mode?
4119 break; 3508 break;
4120 3509
… …
4187 break; 3576 break;
4188#endif 3577#endif
4189 3578
4190#if ENABLE_PERL 3579#if ENABLE_PERL
4191 case URxvt_perl: 3580 case URxvt_perl:
4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3581 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4193 ; // no responses yet
4194 break; 3582 break;
4195#endif 3583#endif
4196 } 3584 }
4197} 3585}
4198/*----------------------------------------------------------------------*/ 3586/*----------------------------------------------------------------------*/
… …
4221 { 3609 {
4222 if (mode == 'r') 3610 if (mode == 'r')
4223 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4224 else 3612 else
4225 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4226 PrivMode (state, bit); 3614
3615 set_privmode (bit, state);
4227 } 3616 }
4228 3617
4229 return state; 3618 return state;
4230} 3619}
4231 3620
… …
4235{ 3624{
4236 unsigned int i, j; 3625 unsigned int i, j;
4237 int state; 3626 int state;
4238 3627
4239 static const struct 3628 static const struct
4240 { 3629 {
4241 const int argval; 3630 const int argval;
4242 const unsigned long bit; 3631 const unsigned long bit;
4243 }
4244
4245 argtopriv[] = { 3632 } argtopriv[] = {
4246 { 1, PrivMode_aplCUR }, 3633 { 1, PrivMode_aplCUR }, // DECCKM
4247 { 2, PrivMode_vt52 }, 3634 { 2, PrivMode_vt52 },
4248 { 3, PrivMode_132 }, 3635 { 3, PrivMode_132 }, // DECCOLM
4249 { 4, PrivMode_smoothScroll }, 3636 { 4, PrivMode_smoothScroll }, // DECSCLM
4250 { 5, PrivMode_rVideo }, 3637 { 5, PrivMode_rVideo }, // DECSCNM
4251 { 6, PrivMode_relOrigin }, 3638 { 6, PrivMode_relOrigin }, // DECOM
4252 { 7, PrivMode_Autowrap }, 3639 { 7, PrivMode_Autowrap }, // DECAWM
4253 // 8, bi-directional support mode 3640 // 8, auto-repeat keys // DECARM
4254 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
4255 // 18, 19 printing-related 3642 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region
4256 { 25, PrivMode_VisibleCursor }, 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4257#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
4258 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
4259#endif 3647#endif
4260 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK
4261 { 40, PrivMode_132OK }, 3650 { 40, PrivMode_132OK },
4262 // 41 xterm more fixes NYI 3651 // 41 xterm more fixes NYI
4263 // 45 margin bell NYI 3652 // 45 margin bell NYI
4264 // 46 start logging 3653 // 46 start logging
4265 { 47, PrivMode_Screen }, 3654 { 47, PrivMode_Screen },
4266 { 66, PrivMode_aplKP }, 3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4267#ifndef NO_BACKSPACE_KEY 3656#ifndef NO_BACKSPACE_KEY
4268 { 67, PrivMode_BackSpace }, 3657 { 67, PrivMode_BackSpace }, // DECBKM
4269#endif 3658#endif
4270 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
4271 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3660 { 1002, PrivMode_MouseBtnEvent },
4272 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3661 { 1003, PrivMode_MouseAnyEvent },
4273 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
4274 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4275 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
4276 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
4277 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
4278 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
4279 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
4280 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
4281 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4282 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3677 { 2004, PrivMode_BracketPaste },
4283 }; 3678 };
4284 3679
4285 if (nargs == 0) 3680 if (nargs == 0)
4286 return; 3681 return;
4287 3682
… …
4294 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
4295 { 3690 {
4296 state = -1; 3691 state = -1;
4297 3692
4298 /* basic handling */ 3693 /* basic handling */
4299 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4300 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
4301 { 3696 {
4302 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
4303 break; 3698 break;
4304 } 3699 }
… …
4312 3707
4313 scr_touch (true); 3708 scr_touch (true);
4314 break; 3709 break;
4315#endif 3710#endif
4316 case 1048: /* alternative cursor save */ 3711 case 1048: /* alternative cursor save */
4317 case 1049:
4318 if (option (Opt_secondaryScreen)) 3712 if (option (Opt_secondaryScreen))
4319 if (mode == 0) 3713 if (mode == 0)
4320 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
4321 else if (mode == 1) 3715 else if (mode == 1)
4322 scr_cursor (SAVE); 3716 scr_cursor (SAVE);
… …
4331 case 2: /* VT52 mode */ 3725 case 2: /* VT52 mode */
4332 /* oddball mode. should be set regardless of set/reset 3726 /* oddball mode. should be set regardless of set/reset
4333 * parameter. Return from VT52 mode with an ESC < from 3727 * parameter. Return from VT52 mode with an ESC < from
4334 * within VT52 mode 3728 * within VT52 mode
4335 */ 3729 */
4336 PrivMode (1, PrivMode_vt52); 3730 set_privmode (PrivMode_vt52, 1);
4337 break; 3731 break;
4338 case 3: /* 80/132 */ 3732 case 3: /* 80/132 */
4339 if (priv_modes & PrivMode_132OK) 3733 if (priv_modes & PrivMode_132OK)
4340 set_widthheight (((state ? 132 : 80) * fwidth), height); 3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4341 break; 3735 break;
4342 case 4: /* smooth scrolling */ 3736 case 4: /* smooth scrolling */
4343 set_option (Opt_jumpScroll, !state); 3737 set_option (Opt_jumpScroll, !state);
4344 break; 3738 break;
4345 case 5: /* reverse video */ 3739 case 5: /* reverse video */
… …
4352 scr_autowrap (state); 3746 scr_autowrap (state);
4353 break; 3747 break;
4354 /* case 8: - auto repeat, can't do on a per window basis */ 3748 /* case 8: - auto repeat, can't do on a per window basis */
4355 case 9: /* X10 mouse reporting */ 3749 case 9: /* X10 mouse reporting */
4356 if (state) /* orthogonal */ 3750 if (state) /* orthogonal */
4357 priv_modes &= ~PrivMode_MouseX11; 3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4358 break; 3752 break;
4359#ifdef scrollBar_esc 3753#ifdef scrollBar_esc
4360 case scrollBar_esc: 3754 case scrollBar_esc:
4361 if (scrollbar_mapping (state)) 3755 if (scrollBar.map (state))
4362 { 3756 {
4363 resize_all_windows (0, 0, 0); 3757 resize_all_windows (0, 0, 0);
4364 scr_touch (true); 3758 scr_touch (true);
4365 } 3759 }
4366 break; 3760 break;
… …
4375 break; 3769 break;
4376 /* case 66: - application key pad */ 3770 /* case 66: - application key pad */
4377 /* case 67: - backspace key */ 3771 /* case 67: - backspace key */
4378 case 1000: /* X11 mouse reporting */ 3772 case 1000: /* X11 mouse reporting */
4379 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
4380 priv_modes &= ~PrivMode_MouseX10; 3774 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4381 break; 3775 break;
4382#if 0
4383 case 1001: 3776 case 1002:
4384 break; /* X11 mouse highlighting */ 3777 case 1003:
4385#endif 3778 if (state)
3779 {
3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3783 vt_emask_mouse = PointerMotionMask;
3784 }
3785 else
3786 vt_emask_mouse = NoEventMask;
3787
3788 vt_select_input ();
3789 break;
4386 case 1010: /* scroll to bottom on TTY output inhibit */ 3790 case 1010: /* scroll to bottom on TTY output inhibit */
4387 set_option (Opt_scrollTtyOutput, !state); 3791 set_option (Opt_scrollTtyOutput, !state);
4388 break; 3792 break;
4389 case 1011: /* scroll to bottom on key press */ 3793 case 1011: /* scroll to bottom on key press */
4390 set_option (Opt_scrollTtyKeypress, state); 3794 set_option (Opt_scrollTtyKeypress, state);
4391 break; 3795 break;
4392 case 1047: /* secondary screen w/ clearing last */ 3796 case 1047: /* secondary screen w/ clearing last */
4393 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
4394 if (current_screen != PRIMARY) 3798 if (!state)
4395 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800
4396 scr_change_screen (state); 3801 scr_change_screen (state);
4397 break; 3802 break;
4398 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3805 if (state)
3806 scr_cursor (SAVE);
3807
4399 scr_change_screen (state); 3808 scr_change_screen (state);
3809
4400 if (option (Opt_secondaryScreen)) 3810 if (option (Opt_secondaryScreen))
4401 if (current_screen != PRIMARY) 3811 if (state)
4402 scr_erase_screen (2); 3812 scr_erase_screen (2);
3813 else
3814 scr_cursor (RESTORE);
4403 break; 3815 break;
4404 default: 3816 default:
4405 break; 3817 break;
4406 } 3818 }
4407 } 3819 }
… …
4567rxvt_term::process_graphics () 3979rxvt_term::process_graphics ()
4568{ 3980{
4569 unicode_t ch, cmd = cmd_getc (); 3981 unicode_t ch, cmd = cmd_getc ();
4570 3982
4571 if (cmd == 'Q') 3983 if (cmd == 'Q')
3984 {
4572 { /* query graphics */ 3985 /* query graphics */
4573 tt_printf ("\033G0\012"); /* no graphics */ 3986 tt_printf ("\033G0\012"); /* no graphics */
4574 return; 3987 return;
4575 } 3988 }
4576 /* swallow other graphics sequences until terminating ':' */ 3989 /* swallow other graphics sequences until terminating ':' */
4577 do 3990 do
… …
4600 4013
4601/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
4602/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
4603 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
4604 */ 4017 */
4605const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4606 4019
4607void 4020void
4608rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
4609{ 4022{
4610 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4622 4035
4623 data += written; 4036 data += written;
4624 len -= written; 4037 len -= written;
4625 } 4038 }
4626 4039
4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4628 4041
4629 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4630 v_buflen += len; 4043 v_buflen += len;
4631 4044
4632 pty_ev.set (EVENT_READ | EVENT_WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);
4633} 4046}
4634 4047
4635void rxvt_term::pty_write () 4048void rxvt_term::pty_write ()
4636{ 4049{
4637 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4050 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4642 4055
4643 if (v_buflen == 0) 4056 if (v_buflen == 0)
4644 { 4057 {
4645 free (v_buffer); 4058 free (v_buffer);
4646 v_buffer = 0; 4059 v_buffer = 0;
4647 v_buflen = 0;
4648 4060
4649 pty_ev.set (EVENT_READ); 4061 pty_ev.set (ev::READ);
4650 return; 4062 return;
4651 } 4063 }
4652 4064
4653 memmove (v_buffer, v_buffer + written, v_buflen); 4065 memmove (v_buffer, v_buffer + written, v_buflen);
4654 } 4066 }
4655 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4067 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4656 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4657} 4069}
4658 4070
4659/*----------------------- end-of-file (C source) -----------------------*/ 4071/*----------------------- end-of-file (C source) -----------------------*/
4660 4072

Diff Legend

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