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.354 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
250#endif 257#endif
251 258
252void 259void
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 305
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
302void 401void
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
553 newlen = 1; 684 newlen = 0;
554 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
555 { 768 {
556#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
557 case XK_BackSpace: 770 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 772 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 773 newlen = 0;
840 break;
841 } 774 }
842 775 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
846 780
847 /* 781 /*
848 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
849 */ 783 */
850#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
950 commit_iso14755 (); 884 commit_iso14755 ();
951 885
952 return; 886 return;
953 } 887 }
954 888
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 890 if (i[0] == keysym)
957 { 891 {
958 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 893 commit_iso14755 ();
960 894
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
999#endif 933#endif
1000} 934}
1001 935
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 936void
1036rxvt_term::flush () 937rxvt_term::flush ()
1037{ 938{
1038 flush_ev.stop (); 939 flush_ev.stop ();
940
941#ifdef HAVE_BG_PIXMAP
942 if (bg_flags & BG_NEEDS_REFRESH)
943 {
944 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false);
946 }
947#endif
1039 948
1040 if (want_refresh) 949 if (want_refresh)
1041 { 950 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 951 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 952 {
… …
1076 } 985 }
1077 while (row < end_row); 986 while (row < end_row);
1078 } 987 }
1079 988
1080 scr_refresh (); 989 scr_refresh ();
1081 scrollbar_show (1); 990 scrollBar.show (1);
1082#ifdef USE_XIM 991#ifdef USE_XIM
1083 IMSendSpot (); 992 im_send_spot ();
1084#endif 993#endif
1085 } 994 }
1086 995
1087 display->flush (); 996 display->flush ();
1088} 997}
1089 998
999/* checks whether a refresh is requested and starts the refresh timer */
1090void 1000void
1091rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1092{ 1002{
1093 make_current (); 1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1005
1095 display->flush (); 1006 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1007}
1100 1008
1101void 1009void
1102rxvt_term::flush_cb (time_watcher &w) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1011{
1104 make_current (); 1012 make_current ();
1105 1013
1106 refresh_count = 0; 1014 refresh_count = 0;
1107 flush (); 1015 flush ();
1108} 1016}
1109 1017
1110#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1111void 1019void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1021{
1114 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1023 want_refresh = 1;
1116 1024 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1025}
1119#endif 1026#endif
1120 1027
1121#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1122void 1029void
1123rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1031{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1033 {
1127 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1128 want_refresh = 1; 1035 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1130 } 1037 }
1038 else
1039 w.stop ();
1131} 1040}
1132#endif 1041#endif
1133 1042
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1044void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1046{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1140 { 1049 {
1141 want_refresh = 1; 1050 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1143 } 1052 }
1053 else
1054 w.stop ();
1144} 1055}
1145#endif 1056#endif
1146 1057
1147#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1148void 1059void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1061{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1063 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1065 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1156 } 1067 }
1068 else
1069 w.stop ();
1157} 1070}
1158#endif 1071#endif
1159 1072
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1074void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1076{
1164 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1078 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1079 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1173 } 1087 }
1174} 1088}
1175#endif 1089#endif
1176 1090
1177#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1178static struct event_handler 1092static struct event_handler
1179{ 1093{
1180 check_watcher yield_ev; 1094 ev::prepare yield_ev;
1181 1095
1182 void yield_cb (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1183 { 1097 {
1184 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1188 1105
1189 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1191 1108
1192 w.stop (); 1109 w.stop ();
1193 } 1110 }
1194 1111
… …
1197 { 1114 {
1198 } 1115 }
1199} event_handler; 1116} event_handler;
1200#endif 1117#endif
1201 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1202bool 1152bool
1203rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1204{ 1154{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1206 1156
1207 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1158
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1210 n = 0;
1211 } 1160 {
1212 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1216 1166
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1168
1219 if (r > 0) 1169 if (r > 0)
1220 { 1170 {
1221 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1222 return true; 1172 return true;
… …
1238 1188
1239 return false; 1189 return false;
1240} 1190}
1241 1191
1242void 1192void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1194{
1245 make_current (); 1195 make_current ();
1246 1196
1247 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1200 cmd_parse ();
1251 break;
1252 1201
1253 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1254 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1255} 1206}
1256 1207
1257void 1208void
1258rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1259{ 1210{
… …
1262 1213
1263#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1215 hidden_pointer = 0;
1265 1216
1266 if (option (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1268#endif 1219#endif
1269} 1220}
1270 1221
1271#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1272void 1223void
… …
1280 1231
1281 hidden_pointer = 1; 1232 hidden_pointer = 1;
1282} 1233}
1283 1234
1284void 1235void
1285rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1237{
1287 make_current (); 1238 make_current ();
1288 1239
1289 pointer_blank (); 1240 pointer_blank ();
1290} 1241}
… …
1293void 1244void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1246{
1296 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1297 int x, y; 1248 int x, y;
1249 int code = 32;
1298 1250
1299 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1302 1263
1303 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1304 button_number = 3; 1265 button_number = 3;
1305 else 1266 else
1306 { 1267 {
1307 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1270 if (button_number >= 3)
1310 button_number += (64 - 3); 1271 button_number += 64 - 3;
1311 } 1272 }
1312 1273
1313 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1314 { 1275 {
1315 /* 1276 /*
… …
1347 fputc ('A', stderr); 1308 fputc ('A', stderr);
1348 if (key_state & 32) 1309 if (key_state & 32)
1349 fputc ('2', stderr); 1310 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1312 button_number,
1352 x + 1, 1313 x,
1353 y + 1); 1314 y);
1354#endif 1315#endif
1355 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1356 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1331 code + button_number + key_state,
1358 (32 + x + 1), 1332 32 + x,
1359 (32 + y + 1)); 1333 32 + y);
1360} 1334}
1361 1335
1362/*{{{ process an X event */ 1336/*{{{ process an X event */
1363void 1337void
1364rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1466 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1441 focus_out ();
1468 break; 1442 break;
1469 1443
1470 case ConfigureNotify: 1444 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1475 { 1446 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1478 1468
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1470 {
1481 seen_resize = 1; 1471 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1473 }
1484 else 1474 else
1485 { 1475 {
1486#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1488 update_background (); 1478 update_background ();
1489#endif 1479#endif
1490 } 1480 }
1481
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1483 }
1493 break; 1484 break;
1494 1485
1495 case PropertyNotify: 1486 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1488 break;
1502 1489
1503 case SelectionClear: 1490 case SelectionClear:
1504 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1492 break;
1511 1493
1512 case SelectionRequest: 1494 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1514 break; 1496 break;
1515 1497
1516 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1517 mapped = 1; 1515 mapped = 1;
1518#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1520#endif 1518#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1520 break;
1523 1521
1524 case UnmapNotify: 1522 case UnmapNotify:
… …
1532 case GraphicsExpose: 1530 case GraphicsExpose:
1533 case Expose: 1531 case Expose:
1534 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1535 { 1533 {
1536 do 1534 do
1535 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1538 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1547 }
1546 1548
1547 want_refresh = 1; 1549 want_refresh = 1;
1548 } 1550 }
1549 else 1551 else
1550 { 1552 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1556 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1558 ;
1557 1559
1558 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1561 {
1560 scrollBar.setIdle (); 1562 scrollBar.state = SB_STATE_IDLE;
1561 scrollbar_show (0); 1563 scrollBar.show (0);
1562 } 1564 }
1563 } 1565 }
1564 break; 1566 break;
1565 1567
1566 case MotionNotify: 1568 case MotionNotify:
1567#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1570 if (hidden_pointer)
1569 pointer_unblank (); 1571 pointer_unblank ();
1570#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1577 break;
1573 1578
1574 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1575 { 1580 {
… …
1609 int dist; 1614 int dist;
1610 1615
1611 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1613 */ 1618 */
1614 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1621
1617 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1619 */ 1624 */
1620 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1642 else 1647 else
1643 { 1648 {
1644 /* we are within the text window, so we 1649 /* we are within the text window, so we
1645 * shouldn't be scrolling 1650 * shouldn't be scrolling
1646 */ 1651 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1649 } 1653 }
1650#endif 1654#endif
1651#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1652 } 1656 }
1653#endif 1657#endif
1654 } 1658 }
1655 } 1659 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1661 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1660 ; 1664 ;
1661 1665
1662 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1670 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1672 scrollBar.size ());
1669 want_refresh = 1; 1673 want_refresh = 1;
1670 scrollbar_show (1); 1674 scrollBar.show (1);
1671 } 1675 }
1672 break; 1676 break;
1673 } 1677 }
1674 1678
1675#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1679 { 1683 {
1680 hidden_cursor = 0; 1684 hidden_cursor = 0;
1681 want_refresh = 1; 1685 want_refresh = 1;
1682 } 1686 }
1683 1687
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1685 } 1689 }
1686#endif 1690#endif
1687 1691
1688#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1700
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1702 pointer_blank ();
1699 } 1703 }
1700#endif 1704#endif
1705
1706 refresh_check ();
1701} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 XFree (h);
1722 }
1723}
1724#endif
1702 1725
1703void 1726void
1704rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1705{ 1728{
1706 if (!focus) 1729 if (!focus)
1707 { 1730 {
1708 focus = 1; 1731 focus = 1;
1709 want_refresh = 1; 1732 want_refresh = 1;
1710 1733
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1734#if USE_XIM
1714 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1715 { 1736 {
1716 IMSetPosition (); 1737 im_set_position ();
1717 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1718 } 1739 }
1719#endif 1740#endif
1720#if CURSOR_BLINK 1741#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1743 cursor_blink_ev.again ();
1723#endif 1744#endif
1724#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1726 { 1747 {
1727 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1749 scr_recolour ();
1729 } 1750 }
1730#endif 1751#endif
1731#if ENABLE_FRILLS 1752#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1753 if (option (Opt_urgentOnBell))
1733 { 1754 set_urgency (0);
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif 1755#endif
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 } 1758 }
1745} 1759}
1746 1760
1747void 1761void
1748rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1750 if (focus) 1764 if (focus)
1751 { 1765 {
1752 focus = 0; 1766 focus = 0;
1753 want_refresh = 1; 1767 want_refresh = 1;
1754 1768
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1769#if ENABLE_FRILLS
1756 1770 if (option (Opt_urgentOnBell))
1771 set_urgency (0);
1772#endif
1757#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf) 1774 if (iso14755buf)
1759 { 1775 {
1760 iso14755buf = 0; 1776 iso14755buf = 0;
1761# if ISO_14755 1777# if ISO_14755
… …
1768 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1769#endif 1785#endif
1770#if CURSOR_BLINK 1786#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1773 hidden_cursor = 0; 1790 hidden_cursor = 0;
1774#endif 1791#endif
1775#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1777 { 1794 {
1778 pix_colors = pix_colors_unfocused; 1795 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1796 scr_recolour ();
1780 } 1797 }
1781#endif 1798#endif
1799
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1801 }
1783} 1802}
1784 1803
1785void 1804void
1786rxvt_term::update_fade_color (unsigned int idx) 1805rxvt_term::update_fade_color (unsigned int idx)
… …
1814 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1815 */ 1834 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1837 {
1819 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1820 update_background (); 1839 update_background ();
1821 } 1840 }
1841
1822 break; 1842 break;
1823 } 1843 }
1824# endif 1844# endif
1845
1846 refresh_check ();
1825} 1847}
1826#endif 1848#endif
1827 1849
1828void 1850void
1829rxvt_term::button_press (XButtonEvent &ev) 1851rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1882 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1883 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1884#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1885 if (ev.button == MEvent.button && clickintime)
1864 { 1886 {
1865 /* same button, within alloted time */ 1887 /* same button, within allowed time */
1866 MEvent.clicks++; 1888 MEvent.clicks++;
1867 1889
1868 if (MEvent.clicks > 1) 1890 if (MEvent.clicks > 1)
1869 { 1891 {
1870 /* only report double clicks */ 1892 /* only report double clicks */
… …
1884 mouse_report (ev); 1906 mouse_report (ev);
1885 } 1907 }
1886#else 1908#else
1887 MEvent.button = ev.button; 1909 MEvent.button = ev.button;
1888 mouse_report (ev); 1910 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1911#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1912
1891 } 1913 }
1892 else 1914 else
1893 { 1915 {
1894 if (ev.button != MEvent.button) 1916 if (ev.button != MEvent.button)
… …
1942 } 1964 }
1943 1965
1944 /* 1966 /*
1945 * Scrollbar window processing of button press 1967 * Scrollbar window processing of button press
1946 */ 1968 */
1947 if (isScrollbarWindow (ev.window)) 1969 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 1970 {
1949 scrollBar.setIdle (); 1971 page_dirn direction = NO_DIR;
1972
1973 if (scrollBar.upButton (ev.y))
1974 direction = UP; /* up */
1975 else if (scrollBar.dnButton (ev.y))
1976 direction = DN; /* down */
1977
1978 scrollBar.state = SB_STATE_IDLE;
1950 /* 1979 /*
1951 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 1981 * move up if mouse is above slider
1953 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
1954 * 1983 *
… …
1963 /* 1992 /*
1964 * Mouse report disabled scrollbar: 1993 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 1994 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 1995 * click on scrollbar - send pageup/down
1967 */ 1996 */
1968 if ((scrollBar.style == R_SB_NEXT 1997 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 1998 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 1999 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 2000 tt_printf ("\033[B");
1978 else 2001 else
1979 switch (ev.button) 2002 switch (ev.button)
1980 { 2003 {
1981 case Button2: 2004 case Button2:
… …
1988 tt_printf ("\033[5~"); 2011 tt_printf ("\033[5~");
1989 break; 2012 break;
1990 } 2013 }
1991 } 2014 }
1992 else 2015 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2016#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2017 {
2000 if (scrollbarnext_upButton (ev.y)) 2018 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2019 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2020#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2021 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2023#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2024 if (scr_page (direction, 1))
2018 { 2025 {
2019 if (upordown < 0) 2026 if (direction == UP)
2020 scrollBar.setUp (); 2027 scrollBar.state = SB_STATE_UP;
2021 else 2028 else
2022 scrollBar.setDn (); 2029 scrollBar.state = SB_STATE_DOWN;
2023 } 2030 }
2024 } 2031 }
2025 else 2032 else
2026 switch (ev.button) 2033 switch (ev.button)
2027 { 2034 {
2028 case Button2: 2035 case Button2:
2029 switch (scrollbar_align) 2036 switch (scrollBar.align)
2030 { 2037 {
2031 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2032 csrO = 0; 2039 csrO = 0;
2033 break; 2040 break;
2034 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2035 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2036 break; 2043 break;
2037 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2038 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2039 break; 2046 break;
2040 } 2047 }
2041 2048
2042 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2043 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2046 2053
2047 scrollBar.setMotion (); 2054 scrollBar.state = SB_STATE_MOTION;
2048 break; 2055 break;
2049 2056
2050 case Button1: 2057 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2054 2061
2055 case Button3: 2062 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2057 { 2064 {
2058 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2060 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2061# else 2068# else
2062 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2063# endif 2070# endif
2064 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2066 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2067# else 2074# else
2068 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2069# endif 2076# endif
2070 else 2077 else
2071 scrollBar.setMotion (); 2078 scrollBar.state = SB_STATE_MOTION;
2072 } 2079 }
2073 else 2080 else
2074 { 2081 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2083 (nrow
2077 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2078 / scrollbar_size ())); 2085 / scrollBar.size ()));
2079 } 2086 }
2080 2087
2081 break; 2088 break;
2082 } 2089 }
2083 } 2090 }
… …
2093 2100
2094 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2102 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2104
2098 if (scrollbar_isUpDn ()) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2099 { 2106 {
2100 scrollBar.setIdle (); 2107 scrollBar.state = SB_STATE_IDLE;
2101 scrollbar_show (0); 2108 scrollBar.show (0);
2102 } 2109 }
2103 2110
2104#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
2107#endif 2113#endif
2108 2114
2109 if (ev.window == vt) 2115 if (ev.window == vt)
2110 { 2116 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2117 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2135 mouse_report (ev); 2141 mouse_report (ev);
2136 } 2142 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2143#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2144 MEvent.button = AnyButton;
2139 mouse_report (ev); 2145 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2146#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2147 return;
2142 } 2148 }
2143 2149
2144 /* 2150 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2151 * dumb hack to compensate for the failure of click-and-drag
… …
2157 selection_make (ev.time); 2163 selection_make (ev.time);
2158 break; 2164 break;
2159 2165
2160 case Button2: 2166 case Button2:
2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2163 break; 2169 break;
2164 2170
2165#ifdef MOUSE_WHEEL 2171#ifdef MOUSE_WHEEL
2166 case Button4: 2172 case Button4:
2167 case Button5: 2173 case Button5:
… …
2183 { 2189 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2190 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2191 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2192 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2193
2188 if (slip_wheel_ev.at < NOW) 2194 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2195 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2196 }
2193 else 2197 else
2198# endif
2194 { 2199 {
2195# endif
2196 scr_page (v, i); 2200 scr_page (v, i);
2197 scrollbar_show (1); 2201 scrollBar.show (1);
2198# ifdef MOUSE_SLIP_WHEELING
2199 } 2202 }
2200# endif
2201 } 2203 }
2202 break; 2204 break;
2203#endif 2205#endif
2204 } 2206 }
2205 } 2207 }
2206} 2208}
2207 2209
2208/*}}} */ 2210/*}}} */
2209 2211
2210bool 2212void
2211rxvt_term::cmd_parse () 2213rxvt_term::cmd_parse ()
2212{ 2214{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2216 2217
2217 for (;;) 2218 for (;;)
2218 { 2219 {
2219 if (ch == NOCHAR) 2220 if (ecb_unlikely (ch == NOCHAR))
2220 { 2221 {
2221 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2223 ch = next_char ();
2223 2224
2224 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2225 break; 2226 break;
2226 } 2227 }
2227 2228
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2229 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2230 {
2230 if (!seen_input) 2231 if (ecb_unlikely (!seen_input))
2231 { 2232 {
2232 seen_input = 1; 2233 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2249 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2251
2251 for (;;) 2252 for (;;)
2252 { 2253 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2254 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2255 break;
2255 2256
2256 *str++ = ch; 2257 *str++ = ch;
2257 2258
2258 if (ch == C0_LF || str >= eol) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2259 { 2260 {
2260 if (ch == C0_LF) 2261 if (ch == C0_LF)
2261 nlines++; 2262 nlines++;
2262 2263
2263 refresh_count++; 2264 refresh_count++;
2264 2265
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2266 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2267 {
2267 refresh_count = 0; 2268 refresh_count = 0;
2268 2269
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2270 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2271 {
2271 refreshnow = true; 2272 refreshnow = true;
2272 ch = NOCHAR; 2273 ch = NOCHAR;
2273 break; 2274 break;
2274 } 2275 }
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2313 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2314 * if skipScroll is enabled.
2314 */ 2315 */
2315 if (refreshnow) 2316 if (refreshnow)
2316 { 2317 {
2317 flag = true;
2318 scr_refresh (); 2318 scr_refresh ();
2319 want_refresh = 1; 2319 want_refresh = 1;
2320 } 2320 }
2321
2322 } 2321 }
2323 else 2322 else
2324 { 2323 {
2325 try 2324 try
2326 { 2325 {
… …
2334 } 2333 }
2335 2334
2336 ch = NOCHAR; 2335 ch = NOCHAR;
2337 } 2336 }
2338 } 2337 }
2339
2340 return flag;
2341} 2338}
2342 2339
2343// read the next character 2340// read the next character
2344wchar_t 2341wchar_t
2345rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2346{ 2343{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2345 {
2349 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2352 2349
2353 wchar_t wc; 2350 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2352
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2356 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2357 break;
2361 } 2358 }
2362 2359
2363 if (len == (size_t)-1) 2360 if (len == (size_t)-1)
2361 {
2362 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2363 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364 }
2365 2365
2366 // assume wchar == unicode 2366 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2369 } 2369 }
… …
2380 : NOCHAR; 2380 : NOCHAR;
2381} 2381}
2382 2382
2383static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2384 2384
2385/* rxvt_cmd_getc () - Return next input character */
2386/*
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t 2385wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2387{
2393 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2394 2389
… …
2413/*----------------------------------------------------------------------*/ 2408/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2409#ifdef PRINTPIPE
2415FILE * 2410FILE *
2416rxvt_term::popen_printer () 2411rxvt_term::popen_printer ()
2417{ 2412{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2414
2420 if (stream == NULL) 2415 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2416 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2417
2423 return stream; 2418 return stream;
… …
2434 * simulate attached vt100 printer 2429 * simulate attached vt100 printer
2435 */ 2430 */
2436void 2431void
2437rxvt_term::process_print_pipe () 2432rxvt_term::process_print_pipe ()
2438{ 2433{
2439 int done; 2434 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2435
2442 if ((fd = popen_printer ()) == NULL) 2436 if (!fd)
2443 return; 2437 return;
2444 2438
2445 /* 2439 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2440 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2441 * is received.
2448 */ 2442 */
2449 for (done = 0; !done;) 2443 for (int done = 0; !done; )
2450 { 2444 {
2451 unsigned char buf[8]; 2445 unsigned char buf[8];
2452 unicode_t ch; 2446 unicode_t ch;
2453 unsigned int i, len; 2447 unsigned int i, len;
2454 2448
… …
2485 } 2479 }
2486 } 2480 }
2487 2481
2488 pclose_printer (fd); 2482 pclose_printer (fd);
2489} 2483}
2490#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2491/*}}} */ 2485/*}}} */
2492 2486
2493/* *INDENT-OFF* */
2494enum { 2487enum {
2495 C1_40 = 0x40, 2488 C1_40 = 0x40,
2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2489 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2490 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2493};
2501/* *INDENT-ON* */
2502 2494
2503/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2504void 2496void
2505rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2498{
… …
2599 break; 2591 break;
2600 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2594 break;
2603 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2596 priv_modes &= ~PrivMode_vt52;
2605 break; 2597 break;
2606 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2608 /* unimplemented */ 2600 /* unimplemented */
2609 break; 2601 break;
… …
2628 return; 2620 return;
2629 } 2621 }
2630 2622
2631 switch (ch) 2623 switch (ch)
2632 { 2624 {
2633 /* case 1: do_tek_mode (); break; */
2634 case '#': 2625 case '#':
2635 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2636 scr_E (); 2627 scr_E ();
2637 break; 2628 break;
2638 case '(': 2629 case '(':
… …
2661#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2662 case '9': 2653 case '9':
2663 scr_forwardindex (); 2654 scr_forwardindex ();
2664 break; 2655 break;
2665#endif 2656#endif
2657 // DECPAM/DECPNM
2666 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2667 case '>': 2661 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2662 priv_modes &= ~PrivMode_aplKP;
2669 break; 2663 break;
2670 2664
2671 case C1_40: 2665 case C1_40:
2672 cmd_getc (); 2666 cmd_getc ();
2673 break; 2667 break;
… …
2677 2671
2678 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2680 { 2674 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2683 } 2677 }
2684 break; 2678 break;
2685 2679
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2688 process_graphics (); 2682 // used by original rxvt for rob nations own graphics mode
2683 if (cmd_getc () == 'Q')
2684 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2685 break;
2690 2686
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2697 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2698 scr_index (DN); 2694 scr_index (DN);
2699 break; 2695 break;
2700 2696
2701 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2702 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2703 2699
2704 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2705 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2706 2702
2707 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2708 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2709 process_dcs_seq (); 2705 process_dcs_seq ();
2710 break; 2706 break;
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2708 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2709 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2710 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2711 break; /* steal obsolete ESC [ c */
2716 2712
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2713 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2714 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2715 process_csi_seq ();
2720 break; 2716 break;
2721 2717
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2718 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2719 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2720 process_osc_seq ();
2725 break; 2721 break;
2726 2722
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2723 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2724 case 'c':
2729 mbstate.reset (); 2725 mbstate.reset ();
2730 scr_poweron (); 2726 scr_poweron ();
2731 scrollbar_show (1); 2727 scrollBar.show (1);
2732 break; 2728 break;
2733 2729
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2730 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2731 case 'n':
2736 scr_charset_choose (2); 2732 scr_charset_choose (2);
… …
2743 } 2739 }
2744} 2740}
2745/*}}} */ 2741/*}}} */
2746 2742
2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2748/* *INDENT-OFF* */
2749enum { 2744enum {
2750 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2746 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2747 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2748 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2751 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2752 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2753 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2754};
2760 2755
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2756#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2757 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2758 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2759#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2760 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2761
2767const unsigned char csi_defaults[] = 2762static const unsigned char csi_defaults[] =
2768 { 2763 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2764 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2765 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2766 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2767 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2768 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2772 };
2778/* *INDENT-ON* */
2779 2773
2780void 2774void
2781rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2782{ 2776{
2783 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2787 2781
2788 nargs = 0; 2782 nargs = 0;
2789 2783
2790 priv = 0; 2784 priv = 0;
2791 ch = cmd_getc (); 2785 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2786 if ((ch >= '<' && ch <= '?') || ch == '!')
2787 {
2793 { /* '<' '=' '>' '?' */ 2788 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2789 priv = ch;
2795 ch = cmd_getc (); 2790 ch = cmd_getc ();
2796 } 2791 }
2797 2792
2798 /* read any numerical arguments */ 2793 /* read any numerical arguments */
… …
2841 { 2836 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2837 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2838 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2839 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2840 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2841 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2842 // versions.
2848 // 2843 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2844 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2845 }
2851 break; 2846 break;
2847
2852 case '?': 2848 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2849 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2850 process_terminal_mode (ch, priv, nargs, arg);
2855 break; 2851 break;
2852
2853 case '!':
2854 if (ch == CSI_70)
2855 {
2856 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2857 scr_soft_reset ();
2858
2859 static const int pm_h[] = { 7, 25 };
2860 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2861
2862 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2863 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2864 }
2865 break;
2866 }
2867
2857 return; 2868 return;
2858 } 2869 }
2859 2870
2860 switch (ch) 2871 switch (ch)
2861 { 2872 {
… …
2875 } 2886 }
2876 break; 2887 break;
2877#endif 2888#endif
2878 2889
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2890 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2891 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2892 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2893 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2894 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2895 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2896 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2897 break;
2887 2898
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2899 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2900 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3076 } 3087 }
3077} 3088}
3078/*}}} */ 3089/*}}} */
3079 3090
3080#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3092void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3094{
3085 int x, y; 3095 int x, y;
3086 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3095 { 3105 {
3096 /* 3106 /*
3097 * commands 3107 * commands
3098 */ 3108 */
3099 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3101 break; 3111 break;
3102 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3114 break;
3105 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3117 break;
3108 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3120 break;
3111 case 5: /* raise window */ 3121 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3113 break; 3123 break;
3114 case 6: /* lower window */ 3124 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3116 break; 3126 break;
3117 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3118 scr_touch (true); 3128 scr_touch (true);
3119 break; 3129 break;
3120 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3131 3141
3132 /* 3142 /*
3133 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3134 */ 3144 */
3135 case 11: /* report window state */ 3145 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3148 break;
3139 case 13: /* report window position */ 3149 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3155 break;
3146 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3159 break;
3150 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3162 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3165 break;
3156 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3157 { 3167 {
3158 char *s; 3168 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3171 XFree (s);
3162 } 3172 }
3163 break; 3173 break;
3164 case 21: /* report window title */ 3174 case 21: /* report window title */
3165 { 3175 {
3166 char *s; 3176 char *s;
3167 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3179 XFree (s);
3170 } 3180 }
3171 break; 3181 break;
3172 } 3182 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3238 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3239 */
3230void 3240void
3231rxvt_term::process_dcs_seq () 3241rxvt_term::process_dcs_seq ()
3232{ 3242{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3243 /*
3237 * Not handled yet 3244 * Not handled yet
3238 */ 3245 */
3246
3247 unicode_t eh;
3239 s = get_to_st (eh); 3248 char *s = get_to_st (eh);
3240 if (s) 3249 if (s)
3241 free (s); 3250 free (s);
3242 3251
3243 return; 3252 return;
3244} 3253}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3257 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3258 */
3250void 3259void
3251rxvt_term::process_osc_seq () 3260rxvt_term::process_osc_seq ()
3252{ 3261{
3253 unicode_t ch, eh;
3254 int arg; 3262 int arg;
3255 3263
3256 ch = cmd_getc (); 3264 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
3259 3267
3260 if (ch == ';') 3268 if (ch == ';')
3261 { 3269 {
3270 unicode_t eh;
3262 char *s = get_to_st (eh); 3271 char *s = get_to_st (eh);
3263 3272
3264 if (s) 3273 if (s)
3265 { 3274 {
3266 process_xterm_seq (arg, s, eh); 3275 process_xterm_seq (arg, s, eh);
… …
3290 3299
3291/* 3300/*
3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3301 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3293 */ 3302 */
3294void 3303void
3295rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3304rxvt_term::process_xterm_seq (int op, char *str, char resp)
3296{ 3305{
3297 int color; 3306 int color;
3298 char *buf, *name; 3307 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1]; 3308 bool query = str[0] == '?' && !str[1];
3300 int saveop = op; 3309 int saveop = op;
… …
3327 unsigned long bytes_after; 3336 unsigned long bytes_after;
3328 unsigned char *value = 0; 3337 unsigned char *value = 0;
3329 const char *str = ""; 3338 const char *str = "";
3330 3339
3331 if (prop 3340 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3345 && actual_type != None
3337 && actual_format == 8) 3346 && actual_format == 8)
… …
3341 3350
3342 XFree (value); 3351 XFree (value);
3343 } 3352 }
3344 else 3353 else
3345 { 3354 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3355 char *eq = strchr (str, '=');
3347 3356
3348 if (eq) 3357 if (eq)
3349 { 3358 {
3350 *eq = 0; 3359 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3352 } 3361 }
3353 else 3362 else
3354 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3364 display->atom (str));
3356 } 3365 }
3357 break; 3366 break;
3358 3367
3359 case XTerm_Color: 3368 case XTerm_Color:
… …
3372 *buf++ = '\0'; 3381 *buf++ = '\0';
3373 3382
3374 process_color_seq (op, color, name, resp); 3383 process_color_seq (op, color, name, resp);
3375 } 3384 }
3376 break; 3385 break;
3386 case Rxvt_restoreFG:
3377 case XTerm_Color00: 3387 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp); 3388 process_color_seq (op, Color_fg, str, resp);
3379 break; 3389 break;
3390 case Rxvt_restoreBG:
3380 case XTerm_Color01: 3391 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp); 3392 process_color_seq (op, Color_bg, str, resp);
3382 break; 3393 break;
3383#ifndef NO_CURSORCOLOR 3394#ifndef NO_CURSORCOLOR
3384 case XTerm_Color_cursor: 3395 case XTerm_Color_cursor:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3400 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3401 break;
3391 case XTerm_Color_pointer_bg: 3402 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3403 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3404 break;
3405#ifdef OPTION_HC
3406 case XTerm_Color_HC:
3407 process_color_seq (op, Color_HC, str, resp);
3408 break;
3409 case XTerm_Color_HTC:
3410 process_color_seq (op, Color_HTC, str, resp);
3411 break;
3412#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3413#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3401 break; 3416 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3405 break; 3419 break;
3406 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3408 break; 3422 break;
3409#endif 3423#endif
3424 case URxvt_Color_border:
3425 process_color_seq (op, Color_border, str, resp);
3426 break;
3410#if ENABLE_TRANSPARENCY 3427#if ENABLE_TRANSPARENCY
3411 case URxvt_Color_tint: 3428 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3413 { 3430 {
3414 bool changed = false; 3431 bool changed = false;
3432
3415 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3417 else 3435
3418 changed = bgPixmap.unset_tint ();
3419 if (changed) 3436 if (changed)
3420 update_background (); 3437 update_background ();
3421 } 3438 }
3422 3439
3423 break; 3440 break;
… …
3427 case Rxvt_Pixmap: 3444 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3429 { 3446 {
3430 char str[256]; 3447 char str[256];
3431 3448
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3449 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3453 }
3437 else 3454 else
3438 { 3455 {
3439 int changed = 0; 3456 bool changed = false;
3440 3457
3441 if (*str != ';') 3458 if (*str != ';')
3442 { 3459 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3446 changed++; 3461 changed = true;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 } 3462 }
3451 while (str) 3463 else
3452 { 3464 {
3453 str++; 3465 str++;
3454 if (bgPixmap.set_geometry (str)) 3466 if (bg_set_geometry (str, true))
3455 changed++; 3467 changed = true;
3456 str = strchr (str, ';');
3457 } 3468 }
3469
3458 if (changed) 3470 if (changed)
3471 {
3472 if (bg_window_position_sensitive ())
3473 {
3474 int x, y;
3475 get_window_origin (x, y);
3476 bg_set_position (x, y);
3477 }
3459 update_background (); 3478 update_background ();
3479 }
3460 } 3480 }
3461 break; 3481 break;
3462#endif 3482#endif
3463
3464 case Rxvt_restoreFG:
3465 set_window_color (Color_fg, str);
3466 break;
3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470 3483
3471 case XTerm_logfile: 3484 case XTerm_logfile:
3472 // TODO, when secure mode? 3485 // TODO, when secure mode?
3473 break; 3486 break;
3474 3487
… …
3541 break; 3554 break;
3542#endif 3555#endif
3543 3556
3544#if ENABLE_PERL 3557#if ENABLE_PERL
3545 case URxvt_perl: 3558 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3559 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3560 break;
3549#endif 3561#endif
3550 } 3562 }
3551} 3563}
3552/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
… …
3575 { 3587 {
3576 if (mode == 'r') 3588 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3590 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3592
3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3581 } 3597 }
3582 3598
3583 return state; 3599 return state;
3584} 3600}
3585 3601
3586/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3587void 3603void
3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3589{ 3605{
3590 unsigned int i, j; 3606 unsigned int i, j;
3591 int state; 3607 int state;
3592 3608
3593 static const struct 3609 static const struct
3594 { 3610 {
3595 const int argval; 3611 const int argval;
3596 const unsigned long bit; 3612 const unsigned long bit;
3597 } argtopriv[] = { 3613 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3600 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3621 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3623 // 18 end FF to printer after print screen
3624 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3628#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3630 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3633 // 45 margin bell NYI
3616 // 46 start logging 3634 // 46 start logging
3617 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3636 { 66, PrivMode_aplKP }, // DECNKM
3619#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3639#endif
3622 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643#if ENABLE_FRILLS
3644 { 1005, PrivMode_ExtModeMouse },
3645#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3646 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3647 { 1011, PrivMode_Keypress }, // rxvt extension
3648#if ENABLE_FRILLS
3649 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3650#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3651 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3652 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3653 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3654 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3655 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3658 { 2004, PrivMode_BracketPaste },
3635 }; 3659 };
3636 3660
3637 if (nargs == 0) 3661 if (nargs == 0)
3638 return; 3662 return;
3639 3663
… …
3646 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3647 { 3671 {
3648 state = -1; 3672 state = -1;
3649 3673
3650 /* basic handling */ 3674 /* basic handling */
3651 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3652 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3653 { 3677 {
3654 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3655 break; 3679 break;
3656 } 3680 }
… …
3664 3688
3665 scr_touch (true); 3689 scr_touch (true);
3666 break; 3690 break;
3667#endif 3691#endif
3668 case 1048: /* alternative cursor save */ 3692 case 1048: /* alternative cursor save */
3669 case 1049:
3670 if (option (Opt_secondaryScreen)) 3693 if (option (Opt_secondaryScreen))
3671 if (mode == 0) 3694 if (mode == 0)
3672 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
3673 else if (mode == 1) 3696 else if (mode == 1)
3674 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
… …
3683 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3684 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3685 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3686 * within VT52 mode 3709 * within VT52 mode
3687 */ 3710 */
3688 PrivMode (1, PrivMode_vt52); 3711 priv_modes |= PrivMode_vt52;
3689 break; 3712 break;
3690 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3691 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3692 set_widthheight (((state ? 132 : 80) * fwidth), height); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693 break; 3716 break;
3694 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
3695 set_option (Opt_jumpScroll, !state); 3718 set_option (Opt_jumpScroll, !state);
3696 break; 3719 break;
3697 case 5: /* reverse video */ 3720 case 5: /* reverse video */
… …
3704 scr_autowrap (state); 3727 scr_autowrap (state);
3705 break; 3728 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3729 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3730 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3733 break;
3711#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3712 case scrollBar_esc: 3735 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3736 scrollBar.map (state);
3714 {
3715 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3716 scr_touch (true); 3738 scr_touch (true);
3717 }
3718 break; 3739 break;
3719#endif 3740#endif
3720 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3721 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3722 break; 3743 break;
… …
3727 break; 3748 break;
3728 /* case 66: - application key pad */ 3749 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3750 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3751 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3752 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3753 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3754 break;
3734#if 0
3735 case 1001: 3755 case 1002:
3736 break; /* X11 mouse highlighting */ 3756 case 1003:
3737#endif 3757 if (state)
3758 {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 mouse_row = mouse_col = 0;
3762 vt_emask_mouse = PointerMotionMask;
3763 }
3764 else
3765 vt_emask_mouse = NoEventMask;
3766
3767 vt_select_input ();
3768 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3770 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3771 break;
3741 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3773 set_option (Opt_scrollTtyKeypress, state);
3743 break; 3774 break;
3744 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
3745 if (option (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3777 if (!state)
3747 scr_erase_screen (2); 3778 scr_erase_screen (2);
3779
3748 scr_change_screen (state); 3780 scr_change_screen (state);
3749 break; 3781 break;
3750 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
3783 if (option (Opt_secondaryScreen))
3784 if (state)
3785 scr_cursor (SAVE);
3786
3751 scr_change_screen (state); 3787 scr_change_screen (state);
3788
3752 if (option (Opt_secondaryScreen)) 3789 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3790 if (state)
3754 scr_erase_screen (2); 3791 scr_erase_screen (2);
3792 else
3793 scr_cursor (RESTORE);
3755 break; 3794 break;
3756 default: 3795 default:
3757 break; 3796 break;
3758 } 3797 }
3759 } 3798 }
… …
3912 } 3951 }
3913 } 3952 }
3914} 3953}
3915/*}}} */ 3954/*}}} */
3916 3955
3917/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3918void
3919rxvt_term::process_graphics ()
3920{
3921 unicode_t ch, cmd = cmd_getc ();
3922
3923 if (cmd == 'Q')
3924 { /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
3936 3957
3937/* 3958/*
3938 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
3952 3973
3953/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 3975/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
3956 */ 3977 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 3979
3959void 3980void
3960rxvt_term::tt_write (const char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 3982{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3967 3988
3968 if (v_buflen == 0) 3989 if (v_buflen == 0)
3969 { 3990 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971 3992
3993 max_it (written, 0);
3994
3972 if ((unsigned int)written == len) 3995 if (written == len)
3973 return; 3996 return;
3974 3997
3975 data += written; 3998 data += written;
3976 len -= written; 3999 len -= written;
3977 } 4000 }
3978 4001
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4003
3981 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4005 v_buflen += len;
3983 4006
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4007 pty_ev.set (ev::READ | ev::WRITE);
3985} 4008}
3986 4009
3987void rxvt_term::pty_write () 4010void rxvt_term::pty_write ()
3988{ 4011{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 4017
3995 if (v_buflen == 0) 4018 if (v_buflen == 0)
3996 { 4019 {
3997 free (v_buffer); 4020 free (v_buffer);
3998 v_buffer = 0; 4021 v_buffer = 0;
3999 v_buflen = 0;
4000 4022
4001 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4002 return; 4024 return;
4003 } 4025 }
4004 4026
4005 memmove (v_buffer, v_buffer + written, v_buflen); 4027 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 4028 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 4030 pty_ev.set (ev::READ);
4009} 4031}
4010 4032
4011/*----------------------- end-of-file (C source) -----------------------*/ 4033/*----------------------- end-of-file (C source) -----------------------*/
4012 4034

Diff Legend

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