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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 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
553 newlen = 1; 655 case XK_BackSpace:
554#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 657 {
556 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
684 newlen = 0;
685 }
686 break;
571 687
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 768 {
574 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
576 } 774 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 775 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
794 780
795 /* 781 /*
796 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
797 */ 783 */
798#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
898 commit_iso14755 (); 884 commit_iso14755 ();
899 885
900 return; 886 return;
901 } 887 }
902 888
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 890 if (i[0] == keysym)
905 { 891 {
906 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 893 commit_iso14755 ();
908 894
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
947#endif 933#endif
948} 934}
949 935
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 936void
984rxvt_term::flush () 937rxvt_term::flush ()
985{ 938{
986 flush_ev.stop (); 939 flush_ev.stop ();
987 940
988#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
990 { 943 {
991// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 945 scr_touch (false);
993 } 946 }
994#endif 947#endif
995 948
996 if (want_refresh) 949 if (want_refresh)
… …
1032 } 985 }
1033 while (row < end_row); 986 while (row < end_row);
1034 } 987 }
1035 988
1036 scr_refresh (); 989 scr_refresh ();
1037 scrollbar_show (1); 990 scrollBar.show (1);
1038#ifdef USE_XIM 991#ifdef USE_XIM
1039 IMSendSpot (); 992 im_send_spot ();
1040#endif 993#endif
1041 } 994 }
1042 995
1043 display->flush (); 996 display->flush ();
1044} 997}
1045 998
999/* checks whether a refresh is requested and starts the refresh timer */
1046void 1000void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1001rxvt_term::refresh_check ()
1048{ 1002{
1049 make_current (); 1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1005
1051 display->flush (); 1006 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1007}
1056 1008
1057void 1009void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1011{
… …
1067void 1019void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1021{
1070 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1023 want_refresh = 1;
1024 refresh_check ();
1072} 1025}
1073#endif 1026#endif
1074 1027
1075#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1076void 1029void
… …
1078{ 1031{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1033 {
1081 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1082 want_refresh = 1; 1035 want_refresh = 1;
1036 refresh_check ();
1083 } 1037 }
1084 else 1038 else
1085 w.stop (); 1039 w.stop ();
1086} 1040}
1087#endif 1041#endif
1088 1042
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1044void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1046{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1049 {
1095 want_refresh = 1; 1050 want_refresh = 1;
1051 refresh_check ();
1052 }
1096 else 1053 else
1097 w.stop (); 1054 w.stop ();
1098} 1055}
1099#endif 1056#endif
1100 1057
… …
1104{ 1061{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1063 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1109 } 1067 }
1110 else 1068 else
1111 w.stop (); 1069 w.stop ();
1112} 1070}
1113#endif 1071#endif
1114 1072
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1074void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1076{
1119 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1078 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1079 want_refresh = 1;
1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1084 {
1128 else 1085 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1086 w.stop ();
1087 }
1130} 1088}
1131#endif 1089#endif
1132 1090
1133#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1134static struct event_handler 1092static struct event_handler
… …
1139 { 1097 {
1140 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1142 // 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
1143 // 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.
1144 1105
1145 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1147 1108
1148 w.stop (); 1109 w.stop ();
1149 } 1110 }
1150 1111
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 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
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1200{ 1194{
1201 make_current (); 1195 make_current ();
1202 1196
1203 if (revents & ev::READ) 1197 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1200 cmd_parse ();
1207 break;
1208 1201
1209 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1210 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1211} 1206}
1212 1207
1213void 1208void
1214rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1215{ 1210{
… …
1251{ 1246{
1252 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1253 int x, y; 1248 int x, y;
1254 int code = 32; 1249 int code = 32;
1255 1250
1256 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1258 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1259 { 1255 {
1260 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1261 return; 1257 return;
1258
1262 mouse_row = x; 1259 mouse_row = x;
1263 mouse_col = y; 1260 mouse_col = y;
1264 code += 32; 1261 code += 32;
1265 } 1262 }
1266 1263
… …
1269 else 1266 else
1270 { 1267 {
1271 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1270 if (button_number >= 3)
1274 button_number += (64 - 3); 1271 button_number += 64 - 3;
1275 } 1272 }
1276 1273
1277 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1278 { 1275 {
1279 /* 1276 /*
… …
1311 fputc ('A', stderr); 1308 fputc ('A', stderr);
1312 if (key_state & 32) 1309 if (key_state & 32)
1313 fputc ('2', stderr); 1310 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1312 button_number,
1316 x + 1, 1313 x,
1317 y + 1); 1314 y);
1318#endif 1315#endif
1319 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
1320 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1331 code + button_number + key_state,
1322 (32 + x + 1), 1332 32 + x,
1323 (32 + y + 1)); 1333 32 + y);
1324} 1334}
1325 1335
1326/*{{{ process an X event */ 1336/*{{{ process an X event */
1327void 1337void
1328rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1441 focus_out ();
1432 break; 1442 break;
1433 1443
1434 case ConfigureNotify: 1444 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1439 { 1446 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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
1442 1468
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1470 {
1445 seen_resize = 1; 1471 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1473 }
1448 else 1474 else
1449 { 1475 {
1450#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1478 {
1479 if (mapped)
1452 update_background (); 1480 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1453#endif 1484#endif
1454 } 1485 }
1486
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1488 }
1457 break; 1489 break;
1458 1490
1459 case PropertyNotify: 1491 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1493 break;
1466 1494
1467 case SelectionClear: 1495 case SelectionClear:
1468 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1497 break;
1475 1498
1476 case SelectionRequest: 1499 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1478 break; 1501 break;
1479 1502
1480 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
1481 mapped = 1; 1520 mapped = 1;
1482#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1522 text_blink_ev.start ();
1484#endif 1523#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1499 { 1538 {
1500 do 1539 do
1501 { 1540 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1543 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1545
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1547
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1549 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1552 }
1553
1514 want_refresh = 1; 1554 want_refresh = 1;
1515 } 1555 }
1516 else 1556 else
1517 { 1557 {
1518 XEvent unused_event; 1558 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1561 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1563 ;
1524 1564
1525 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1566 {
1527 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1528 scrollbar_show (0); 1568 scrollBar.show (0);
1529 } 1569 }
1530 } 1570 }
1531 break; 1571 break;
1532 1572
1533 case MotionNotify: 1573 case MotionNotify:
… …
1579 int dist; 1619 int dist;
1580 1620
1581 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1583 */ 1623 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1624 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1626
1587 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1589 */ 1629 */
… …
1612 else 1652 else
1613 { 1653 {
1614 /* we are within the text window, so we 1654 /* we are within the text window, so we
1615 * shouldn't be scrolling 1655 * shouldn't be scrolling
1616 */ 1656 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1619 } 1658 }
1620#endif 1659#endif
1621#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1622 } 1661 }
1623#endif 1662#endif
1624 } 1663 }
1625 } 1664 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1666 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1630 ; 1669 ;
1631 1670
… …
1633 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1675 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1677 scrollBar.size ());
1639 want_refresh = 1; 1678 want_refresh = 1;
1640 scrollbar_show (1); 1679 scrollBar.show (1);
1641 } 1680 }
1642 break; 1681 break;
1643 } 1682 }
1644 1683
1645#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
… …
1666 1705
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1707 pointer_blank ();
1669 } 1708 }
1670#endif 1709#endif
1710
1711 refresh_check ();
1671} 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
1672 1729
1673void 1730void
1674rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1675{ 1732{
1676 if (!focus) 1733 if (!focus)
1677 { 1734 {
1678 focus = 1; 1735 focus = 1;
1679 want_refresh = 1; 1736 want_refresh = 1;
1680 1737
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682
1683#if USE_XIM 1738#if USE_XIM
1684 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1685 { 1740 {
1686 IMSetPosition (); 1741 im_set_position ();
1687 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1688 } 1743 }
1689#endif 1744#endif
1690#if CURSOR_BLINK 1745#if CURSOR_BLINK
1691 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
1698 scr_recolour (); 1753 scr_recolour ();
1699 } 1754 }
1700#endif 1755#endif
1701#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1703 { 1758 set_urgency (0);
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 } 1762 }
1712} 1763}
1713 1764
1714void 1765void
1715rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1717 if (focus) 1768 if (focus)
1718 { 1769 {
1719 focus = 0; 1770 focus = 0;
1720 want_refresh = 1; 1771 want_refresh = 1;
1721 1772
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1723 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1724#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1778 if (iso14755buf)
1726 { 1779 {
1727 iso14755buf = 0; 1780 iso14755buf = 0;
1728# if ISO_14755 1781# if ISO_14755
… …
1745 { 1798 {
1746 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1800 scr_recolour ();
1748 } 1801 }
1749#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1750 } 1805 }
1751} 1806}
1752 1807
1753void 1808void
1754rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1782 * 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.
1783 */ 1838 */
1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1841 {
1787 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1788 update_background (); 1843 update_background ();
1789 } 1844 }
1845
1790 break; 1846 break;
1791 } 1847 }
1792# endif 1848# endif
1849
1850 refresh_check ();
1793} 1851}
1794#endif 1852#endif
1795 1853
1796void 1854void
1797rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1828 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1829 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1830#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1831 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1832 { 1890 {
1833 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1834 MEvent.clicks++; 1892 MEvent.clicks++;
1835 1893
1836 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1837 { 1895 {
1838 /* only report double clicks */ 1896 /* only report double clicks */
… …
1910 } 1968 }
1911 1969
1912 /* 1970 /*
1913 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1914 */ 1972 */
1915 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 1974 {
1917 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;
1918 /* 1983 /*
1919 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 1985 * move up if mouse is above slider
1921 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1922 * 1987 *
… …
1931 /* 1996 /*
1932 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1935 */ 2000 */
1936 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1946 else 2005 else
1947 switch (ev.button) 2006 switch (ev.button)
1948 { 2007 {
1949 case Button2: 2008 case Button2:
… …
1957 break; 2016 break;
1958 } 2017 }
1959 } 2018 }
1960 else 2019 else
1961#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 2021 {
1968 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 2023 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2027#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
1986 { 2029 {
1987 if (upordown < 0) 2030 if (direction == UP)
1988 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
1989 else 2032 else
1990 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
1991 } 2034 }
1992 } 2035 }
1993 else 2036 else
1994 switch (ev.button) 2037 switch (ev.button)
1995 { 2038 {
1996 case Button2: 2039 case Button2:
1997 switch (scrollbar_align) 2040 switch (scrollBar.align)
1998 { 2041 {
1999 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
2000 csrO = 0; 2043 csrO = 0;
2001 break; 2044 break;
2002 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2008 } 2051 }
2009 2052
2010 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2011 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2014 2057
2015 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2016 break; 2059 break;
2017 2060
2018 case Button1: 2061 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2022 2065
2023 case Button3: 2066 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2034 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2035# else 2078# else
2036 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2037# endif 2080# endif
2038 else 2081 else
2039 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2040 } 2083 }
2041 else 2084 else
2042 { 2085 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2087 (nrow
2045 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2046 / scrollbar_size ())); 2089 / scrollBar.size ()));
2047 } 2090 }
2048 2091
2049 break; 2092 break;
2050 } 2093 }
2051 } 2094 }
… …
2061 2104
2062 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2106 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2108
2066 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2067 { 2110 {
2068 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2069 scrollbar_show (0); 2112 scrollBar.show (0);
2070 } 2113 }
2071 2114
2072#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2075#endif 2117#endif
2076 2118
2077 if (ev.window == vt) 2119 if (ev.window == vt)
2078 { 2120 {
2079 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)))
… …
2125 selection_make (ev.time); 2167 selection_make (ev.time);
2126 break; 2168 break;
2127 2169
2128 case Button2: 2170 case Button2:
2129 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?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2173 break;
2132 2174
2133#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2134 case Button4: 2176 case Button4:
2135 case Button5: 2177 case Button5:
… …
2151 { 2193 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2197
2198 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2200 }
2158 else 2201 else
2202# endif
2159 { 2203 {
2160# endif
2161 scr_page (v, i); 2204 scr_page (v, i);
2162 scrollbar_show (1); 2205 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2206 }
2165# endif
2166 } 2207 }
2167 break; 2208 break;
2168#endif 2209#endif
2169 } 2210 }
2170 } 2211 }
2171} 2212}
2172 2213
2173/*}}} */ 2214/*}}} */
2174 2215
2175bool 2216void
2176rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2177{ 2218{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2181 2221
2182 for (;;) 2222 for (;;)
2183 { 2223 {
2184 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2185 { 2225 {
2186 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2227 ch = next_char ();
2188 2228
2189 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2190 break; 2230 break;
2191 } 2231 }
2192 2232
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2234 {
2195 if (!seen_input) 2235 if (ecb_unlikely (!seen_input))
2196 { 2236 {
2197 seen_input = 1; 2237 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2253 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2255
2216 for (;;) 2256 for (;;)
2217 { 2257 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2259 break;
2220 2260
2221 *str++ = ch; 2261 *str++ = ch;
2222 2262
2223 if (ch == C0_LF || str >= eol) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2264 {
2225 if (ch == C0_LF) 2265 if (ch == C0_LF)
2226 nlines++; 2266 nlines++;
2227 2267
2228 refresh_count++; 2268 refresh_count++;
… …
2277 * 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.
2278 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2279 */ 2319 */
2280 if (refreshnow) 2320 if (refreshnow)
2281 { 2321 {
2282 flag = true;
2283 scr_refresh (); 2322 scr_refresh ();
2284 want_refresh = 1; 2323 want_refresh = 1;
2285 } 2324 }
2286
2287 } 2325 }
2288 else 2326 else
2289 { 2327 {
2290 try 2328 try
2291 { 2329 {
… …
2299 } 2337 }
2300 2338
2301 ch = NOCHAR; 2339 ch = NOCHAR;
2302 } 2340 }
2303 } 2341 }
2304
2305 return flag;
2306} 2342}
2307 2343
2308// read the next character 2344// read the next character
2309wchar_t 2345wchar_t
2310rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2311{ 2347{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2349 {
2314 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2317 2353
2318 wchar_t wc; 2354 wchar_t wc;
2319 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);
2320 2356
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2361 break;
2326 } 2362 }
2327 2363
2328 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2329 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 }
2330 2369
2331 // assume wchar == unicode 2370 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2334 } 2373 }
… …
2345 : NOCHAR; 2384 : NOCHAR;
2346} 2385}
2347 2386
2348static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2349 2388
2350/* rxvt_cmd_getc () - Return next input character */
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t 2389wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2391{
2358 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2359 2393
… …
2378/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2380FILE * 2414FILE *
2381rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2382{ 2416{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2418
2385 if (stream == NULL) 2419 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2421
2388 return stream; 2422 return stream;
… …
2399 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2400 */ 2434 */
2401void 2435void
2402rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2403{ 2437{
2404 int done; 2438 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2439
2407 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2408 return; 2441 return;
2409 2442
2410 /* 2443 /*
2411 * 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
2412 * is received. 2445 * is received.
2413 */ 2446 */
2414 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2415 { 2448 {
2416 unsigned char buf[8]; 2449 unsigned char buf[8];
2417 unicode_t ch; 2450 unicode_t ch;
2418 unsigned int i, len; 2451 unsigned int i, len;
2419 2452
… …
2453 pclose_printer (fd); 2486 pclose_printer (fd);
2454} 2487}
2455#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2456/*}}} */ 2489/*}}} */
2457 2490
2458/* *INDENT-OFF* */
2459enum { 2491enum {
2460 C1_40 = 0x40, 2492 C1_40 = 0x40,
2461 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,
2462 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,
2463 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,
2464 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,
2465}; 2497};
2466/* *INDENT-ON* */
2467 2498
2468/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2469void 2500void
2470rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2502{
… …
2564 break; 2595 break;
2565 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2598 break;
2568 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2570 break; 2601 break;
2571 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2573 /* unimplemented */ 2604 /* unimplemented */
2574 break; 2605 break;
… …
2593 return; 2624 return;
2594 } 2625 }
2595 2626
2596 switch (ch) 2627 switch (ch)
2597 { 2628 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2629 case '#':
2600 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2601 scr_E (); 2631 scr_E ();
2602 break; 2632 break;
2603 case '(': 2633 case '(':
… …
2628 scr_forwardindex (); 2658 scr_forwardindex ();
2629 break; 2659 break;
2630#endif 2660#endif
2631 case '=': 2661 case '=':
2632 case '>': 2662 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2663 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2664 break;
2635 2665
2636 case C1_40: 2666 case C1_40:
2637 cmd_getc (); 2667 cmd_getc ();
2638 break; 2668 break;
… …
2642 2672
2643 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2645 { 2675 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2678 }
2649 break; 2679 break;
2650 2680
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2653 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 */
2654 break; 2686 break;
2655 2687
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2663 scr_index (DN); 2695 scr_index (DN);
2664 break; 2696 break;
2665 2697
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2668 2700
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2671 2703
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2706 process_dcs_seq ();
2675 break; 2707 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2681 2713
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2716 process_csi_seq ();
2685 break; 2717 break;
2686 2718
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2721 process_osc_seq ();
2690 break; 2722 break;
2691 2723
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2725 case 'c':
2694 mbstate.reset (); 2726 mbstate.reset ();
2695 scr_poweron (); 2727 scr_poweron ();
2696 scrollbar_show (1); 2728 scrollBar.show (1);
2697 break; 2729 break;
2698 2730
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2732 case 'n':
2701 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
2708 } 2740 }
2709} 2741}
2710/*}}} */ 2742/*}}} */
2711 2743
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2745enum {
2715 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2716 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,
2717 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 ,
2718 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,
… …
2721 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,
2722 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 ,
2723 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
2724}; 2755};
2725 2756
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2762
2732const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2733 { 2764 {
2734 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, */
2735 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, */
2736 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, */
2737 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, [, \, ], ^, _, */
2738 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, */
2739 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, */
2740 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, */
2741 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, {, |, }, ~, */
2742 }; 2773 };
2743/* *INDENT-ON* */
2744 2774
2745void 2775void
2746rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2747{ 2777{
2748 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2752 2782
2753 nargs = 0; 2783 nargs = 0;
2754 2784
2755 priv = 0; 2785 priv = 0;
2756 ch = cmd_getc (); 2786 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2788 {
2759 /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2790 priv = ch;
2761 ch = cmd_getc (); 2791 ch = cmd_getc ();
2762 } 2792 }
2763 2793
2764 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
2813 // versions. 2843 // versions.
2814 // 2844 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2845 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2846 }
2817 break; 2847 break;
2848
2818 case '?': 2849 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2821 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, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2822 } 2865 }
2866 break;
2867 }
2868
2823 return; 2869 return;
2824 } 2870 }
2825 2871
2826 switch (ch) 2872 switch (ch)
2827 { 2873 {
… …
3042 } 3088 }
3043} 3089}
3044/*}}} */ 3090/*}}} */
3045 3091
3046#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3047/* ARGSUSED */
3048void 3093void
3049rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3050{ 3095{
3051 int x, y; 3096 int x, y;
3052 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3061 { 3106 {
3062 /* 3107 /*
3063 * commands 3108 * commands
3064 */ 3109 */
3065 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3066 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3067 break; 3112 break;
3068 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3069 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3070 break; 3115 break;
3071 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3072 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3073 break; 3118 break;
3074 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3076 break; 3121 break;
3077 case 5: /* raise window */ 3122 case 5: /* raise window */
3078 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3079 break; 3124 break;
3080 case 6: /* lower window */ 3125 case 6: /* lower window */
3081 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3082 break; 3127 break;
3083 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3084 scr_touch (true); 3129 scr_touch (true);
3085 break; 3130 break;
3086 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3097 3142
3098 /* 3143 /*
3099 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3100 */ 3145 */
3101 case 11: /* report window state */ 3146 case 11: /* report window state */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3104 break; 3149 break;
3105 case 13: /* report window position */ 3150 case 13: /* report window position */
3106 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3107 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3108 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3109 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3110 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3111 break; 3156 break;
3112 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3115 break; 3160 break;
3116 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3117 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3118 break; 3163 break;
… …
3120 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3121 break; 3166 break;
3122 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3123 { 3168 {
3124 char *s; 3169 char *s;
3125 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3126 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 */
3127 XFree (s); 3172 XFree (s);
3128 } 3173 }
3129 break; 3174 break;
3130 case 21: /* report window title */ 3175 case 21: /* report window title */
3131 { 3176 {
3132 char *s; 3177 char *s;
3133 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3134 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 */
3135 XFree (s); 3180 XFree (s);
3136 } 3181 }
3137 break; 3182 break;
3138 } 3183 }
… …
3194 * 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)'
3195 */ 3240 */
3196void 3241void
3197rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3198{ 3243{
3199 char *s;
3200 unicode_t eh;
3201
3202 /* 3244 /*
3203 * Not handled yet 3245 * Not handled yet
3204 */ 3246 */
3247
3248 unicode_t eh;
3205 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3206 if (s) 3250 if (s)
3207 free (s); 3251 free (s);
3208 3252
3209 return; 3253 return;
3210} 3254}
… …
3214 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3215 */ 3259 */
3216void 3260void
3217rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3218{ 3262{
3219 unicode_t ch, eh;
3220 int arg; 3263 int arg;
3221 3264
3222 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3223 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3224 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3225 3268
3226 if (ch == ';') 3269 if (ch == ';')
3227 { 3270 {
3271 unicode_t eh;
3228 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3229 3273
3230 if (s) 3274 if (s)
3231 { 3275 {
3232 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3256 3300
3257/* 3301/*
3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3259 */ 3303 */
3260void 3304void
3261rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3262{ 3306{
3263 int color; 3307 int color;
3264 char *buf, *name; 3308 char *buf, *name;
3265 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3266 int saveop = op; 3310 int saveop = op;
… …
3293 unsigned long bytes_after; 3337 unsigned long bytes_after;
3294 unsigned char *value = 0; 3338 unsigned char *value = 0;
3295 const char *str = ""; 3339 const char *str = "";
3296 3340
3297 if (prop 3341 if (prop
3298 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3299 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3300 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3301 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3302 && actual_type != None 3346 && actual_type != None
3303 && actual_format == 8) 3347 && actual_format == 8)
… …
3307 3351
3308 XFree (value); 3352 XFree (value);
3309 } 3353 }
3310 else 3354 else
3311 { 3355 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3313 3357
3314 if (eq) 3358 if (eq)
3315 { 3359 {
3316 *eq = 0; 3360 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3318 } 3362 }
3319 else 3363 else
3320 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3321 display->atom (str)); 3365 display->atom (str));
3322 } 3366 }
3323 break; 3367 break;
3324 3368
3325 case XTerm_Color: 3369 case XTerm_Color:
… …
3338 *buf++ = '\0'; 3382 *buf++ = '\0';
3339 3383
3340 process_color_seq (op, color, name, resp); 3384 process_color_seq (op, color, name, resp);
3341 } 3385 }
3342 break; 3386 break;
3387 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3388 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3389 process_color_seq (op, Color_fg, str, resp);
3345 break; 3390 break;
3391 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3392 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3393 process_color_seq (op, Color_bg, str, resp);
3348 break; 3394 break;
3349#ifndef NO_CURSORCOLOR 3395#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3396 case XTerm_Color_cursor:
… …
3355 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3356 break; 3402 break;
3357 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3358 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3359 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
3360#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3361 case XTerm_Color_RV:
3362 process_color_seq (op, Color_RV, str, resp);
3363 break;
3364 case Rxvt_Color_BD:
3365 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3367 break; 3417 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3371 break; 3420 break;
3372 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3374 break; 3423 break;
3375#endif 3424#endif
3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3376#if ENABLE_TRANSPARENCY 3428#if ENABLE_TRANSPARENCY
3377 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3379 { 3431 {
3380 bool changed = false; 3432 bool changed = false;
3433
3381 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3383 else 3436
3384 changed = bgPixmap.unset_tint ();
3385 if (changed) 3437 if (changed)
3386 update_background (); 3438 update_background ();
3387 } 3439 }
3388 3440
3389 break; 3441 break;
… …
3393 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3394 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3395 { 3447 {
3396 char str[256]; 3448 char str[256];
3397 3449
3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3450 sprintf (str, "[%dx%d+%d+%d]",
3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3401 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3402 } 3454 }
3403 else 3455 else
3404 { 3456 {
3405 int changed = 0; 3457 int changed = 0;
3406 3458
3407 if (*str != ';') 3459 if (*str != ';')
3408 { 3460 {
3409 /* reset to default scaling :*/
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3462 {
3412 changed++; 3463 changed++;
3413 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3414 if (str == NULL) 3465 if (str == NULL)
3415 bgPixmap.set_defaultGeometry (); 3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3416 } 3470 }
3417 while (str) 3471 else
3418 { 3472 {
3419 str++; 3473 str++;
3420 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3421 changed++; 3475 changed++;
3422 str = strchr (str, ';');
3423 } 3476 }
3477
3424 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 }
3425 update_background (); 3486 update_background ();
3487 }
3426 } 3488 }
3427 break; 3489 break;
3428#endif 3490#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3491
3437 case XTerm_logfile: 3492 case XTerm_logfile:
3438 // TODO, when secure mode? 3493 // TODO, when secure mode?
3439 break; 3494 break;
3440 3495
… …
3507 break; 3562 break;
3508#endif 3563#endif
3509 3564
3510#if ENABLE_PERL 3565#if ENABLE_PERL
3511 case URxvt_perl: 3566 case URxvt_perl:
3512 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));
3513 ; // no responses yet
3514 break; 3568 break;
3515#endif 3569#endif
3516 } 3570 }
3517} 3571}
3518/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
3541 { 3595 {
3542 if (mode == 'r') 3596 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3598 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3600
3601 set_privmode (bit, state);
3547 } 3602 }
3548 3603
3549 return state; 3604 return state;
3550} 3605}
3551 3606
3552/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
3553void 3608void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3610{
3556 unsigned int i, j; 3611 unsigned int i, j;
3557 int state; 3612 int state;
3558 3613
3559 static const struct 3614 static const struct
3560 { 3615 {
3561 const int argval; 3616 const int argval;
3562 const unsigned long bit; 3617 const unsigned long bit;
3563 } argtopriv[] = { 3618 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3619 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3620 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3621 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3622 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3626 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3628 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3633#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3636 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3637 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3638 // 45 margin bell NYI
3582 // 46 start logging 3639 // 46 start logging
3583 { 47, PrivMode_Screen }, 3640 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3642#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3643 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3644#endif
3588 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3646 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3647 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 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
3593 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3598 { 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 */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3663 { 2004, PrivMode_BracketPaste },
3600 }; 3664 };
3601 3665
3602 if (nargs == 0) 3666 if (nargs == 0)
3603 return; 3667 return;
3604 3668
… …
3611 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3612 { 3676 {
3613 state = -1; 3677 state = -1;
3614 3678
3615 /* basic handling */ 3679 /* basic handling */
3616 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
3617 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3618 { 3682 {
3619 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3620 break; 3684 break;
3621 } 3685 }
… …
3629 3693
3630 scr_touch (true); 3694 scr_touch (true);
3631 break; 3695 break;
3632#endif 3696#endif
3633 case 1048: /* alternative cursor save */ 3697 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3698 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3699 if (mode == 0)
3637 scr_cursor (RESTORE); 3700 scr_cursor (RESTORE);
3638 else if (mode == 1) 3701 else if (mode == 1)
3639 scr_cursor (SAVE); 3702 scr_cursor (SAVE);
… …
3648 case 2: /* VT52 mode */ 3711 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3712 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3713 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3714 * within VT52 mode
3652 */ 3715 */
3653 PrivMode (1, PrivMode_vt52); 3716 set_privmode (PrivMode_vt52, 1);
3654 break; 3717 break;
3655 case 3: /* 80/132 */ 3718 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3719 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3721 break;
3659 case 4: /* smooth scrolling */ 3722 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3723 set_option (Opt_jumpScroll, !state);
3661 break; 3724 break;
3662 case 5: /* reverse video */ 3725 case 5: /* reverse video */
… …
3673 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3738 break;
3676#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3677 case scrollBar_esc: 3740 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3741 if (scrollBar.map (state))
3679 { 3742 {
3680 resize_all_windows (0, 0, 0); 3743 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3744 scr_touch (true);
3682 } 3745 }
3683 break; 3746 break;
… …
3700 case 1003: 3763 case 1003:
3701 if (state) 3764 if (state)
3702 { 3765 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3767 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3768 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3769 vt_emask_mouse = PointerMotionMask;
3706 } 3770 }
3707 else 3771 else
3708 vt_emask_mouse = NoEventMask; 3772 vt_emask_mouse = NoEventMask;
3773
3709 vt_select_input (); 3774 vt_select_input ();
3710 break; 3775 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3776 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3777 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3778 break;
3714 case 1011: /* scroll to bottom on key press */ 3779 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3780 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3781 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3782 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3784 if (!state)
3720 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786
3721 scr_change_screen (state); 3787 scr_change_screen (state);
3722 break; 3788 break;
3723 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
3724 scr_change_screen (state); 3794 scr_change_screen (state);
3795
3725 if (option (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3797 if (state)
3727 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799 else
3800 scr_cursor (RESTORE);
3728 break; 3801 break;
3729 default: 3802 default:
3730 break; 3803 break;
3731 } 3804 }
3732 } 3805 }
… …
3885 } 3958 }
3886 } 3959 }
3887} 3960}
3888/*}}} */ 3961/*}}} */
3889 3962
3890/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3891void
3892rxvt_term::process_graphics ()
3893{
3894 unicode_t ch, cmd = cmd_getc ();
3895
3896 if (cmd == 'Q')
3897 {
3898 /* query graphics */
3899 tt_printf ("\033G0\012"); /* no graphics */
3900 return;
3901 }
3902 /* swallow other graphics sequences until terminating ':' */
3903 do
3904 ch = cmd_getc ();
3905 while (ch != ':');
3906}
3907/*}}} */
3908
3909/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3910 3964
3911/* 3965/*
3912 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
3913 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
3926 3980
3927/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
3928/* 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,
3929 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
3930 */ 3984 */
3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3932 3986
3933void 3987void
3934rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
3935{ 3989{
3936 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)))
… …
3941 3995
3942 if (v_buflen == 0) 3996 if (v_buflen == 0)
3943 { 3997 {
3944 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));
3945 3999
4000 max_it (written, 0);
4001
3946 if ((unsigned int)written == len) 4002 if (written == len)
3947 return; 4003 return;
3948 4004
3949 data += written; 4005 data += written;
3950 len -= written; 4006 len -= written;
3951 } 4007 }
3952 4008
3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3954 4010
3955 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
3956 v_buflen += len; 4012 v_buflen += len;
3957 4013
3958 pty_ev.set (ev::READ | ev::WRITE); 4014 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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