ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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