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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
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.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE_3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
253} 282}
254 283
255int 284static int
256rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
257{ 286{
258 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
259 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
260 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
261 { 290 {
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
275void 392void
276rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
277{ 394{
278 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
279 unsigned int newlen;
280 KeySym keysym; 396 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 397 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
286 404
287 /* 405 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
290 * 408 *
… …
308 Status status_return; 426 Status status_return;
309 427
310#if 0 428#if 0
311#ifdef X_HAVE_UTF8_STRING 429#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 430 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 431 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 432 KBUFSZ, &keysym, &status_return);
315 else 433 else
316#endif 434#endif
317#endif 435#endif
318 { 436 {
… …
355 || status_return == XLookupBoth; 473 || status_return == XLookupBoth;
356 } 474 }
357 else 475 else
358#endif 476#endif
359 { 477 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 478 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 479 valid_keysym = keysym != NoSymbol;
362 } 480 }
363 481
364 if (valid_keysym) 482 if (valid_keysym)
365 { 483 {
… …
417 scr_move_to (0, 1); 535 scr_move_to (0, 1);
418 return; 536 return;
419 } 537 }
420 else if (keysym == XK_End) 538 else if (keysym == XK_End)
421 { 539 {
422 scr_move_to (1, 0); 540 scr_move_to (1, 1);
423 return; 541 return;
424 } 542 }
425 } 543 }
426#endif 544#endif
427 } 545 }
… …
438 { 556 {
439 switch (keysym) 557 switch (keysym)
440 { 558 {
441 /* normal XTerm key bindings */ 559 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 560 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 561 selection_request (ev.time);
444 return; 562 return;
445#if TODO 563#if TODO
446 /* rxvt extras */ 564 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 565 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 566 change_font (FONT_UP);
… …
467 { 585 {
468 commit_iso14755 (); 586 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 587 iso14755buf = ISO_14755_51;
470# if ISO_14755 588# if ISO_14755
471 iso14755_51 (0); 589 iso14755_51 (0);
590# endif
591 return;
592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
472# endif 598# endif
473 return; 599 return;
474 } 600 }
475 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
476 { 602 {
… …
481# endif 607# endif
482 return; 608 return;
483 } 609 }
484 else 610 else
485 { 611 {
486# if ENABLE_OVERLAY 612# if ISO_14755
487 scr_overlay_off (); 613 scr_overlay_off ();
488# endif 614# endif
489 iso14755buf = 0; 615 iso14755buf = 0;
490 } 616 }
491 } 617 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
495 { 621 {
496 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 623# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 626# endif
501 } 627 }
502#endif 628#endif
503 629
504#ifdef PRINTPIPE 630#ifdef PRINTPIPE
505 if (keysym == XK_Print) 631 if (keysym == XK_Print)
506 { 632 {
507 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
508 return; 634 return;
509 } 635 }
510#endif 636#endif
511 637
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 { 639 {
514 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
515 newlen = 1; 641 unsigned int newlen = 1;
516 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
517 { 644 {
518#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 646 case XK_BackSpace:
520 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
521 { 648 {
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
525 } 652 }
526 else 653 else
527 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 655 break;
529#endif 656#endif
530#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
541 case XK_Delete: 658 case XK_Delete:
542 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 660 break;
544#endif 661#endif
545 case XK_Tab: 662 case XK_Tab:
546 if (shft) 663 if (shft)
547 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
557#endif 674#endif
558 newlen = 0; 675 newlen = 0;
559 } 676 }
560 break; 677 break;
561 678
562#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
568 {
569 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break;
572 }
573 else
574 /* translate to std. cursor key */
575 keysym = XK_Left + (keysym - XK_KP_Left);
576 /* FALLTHROUGH */
577#endif
578 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
579 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
580 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
581 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
582 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
591 } 692 }
592 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
593 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
594 break; 695 break;
595 696
596#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior
598 case XK_KP_Prior:
599 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
601 {
602 strcpy (kbuf, "\033Oy");
603 break;
604 }
605 /* FALLTHROUGH */
606# endif
607 case XK_Prior:
608 strcpy (kbuf, "\033[5~");
609 break;
610# ifdef XK_KP_Next
611 case XK_KP_Next:
612 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
614 {
615 strcpy (kbuf, "\033Os");
616 break;
617 }
618 /* FALLTHROUGH */
619# endif
620 case XK_Next:
621 strcpy (kbuf, "\033[6~");
622 break;
623#endif
624 case XK_KP_Enter: 697 case XK_KP_Enter:
625 /* allow shift to override */ 698 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
627 { 700 {
628 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
629 break; 702 break;
630 } 703 }
631 704
… …
643 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
644 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
645 } 718 }
646 break; 719 break;
647 720
648#ifdef XK_KP_Begin
649 case XK_KP_Begin:
650 strcpy (kbuf, "\033Ou");
651 break;
652
653#endif
654 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
658 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 745 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
680 { 747 {
681 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 750 }
684 else 751 else
… …
686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
687 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
688 } 755 }
689 break; 756 break;
690 757
691 case XK_Find:
692 strcpy (kbuf, "\033[1~");
693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_Insert:
706 strcpy (kbuf, "\033[2~");
707 break;
708#ifdef DXK_Remove /* support for DEC remove like key */
709 case DXK_Remove:
710 /* FALLTHROUGH */
711#endif
712 case XK_Execute:
713 strcpy (kbuf, "\033[3~");
714 break;
715 case XK_Select:
716 strcpy (kbuf, "\033[4~");
717 break;
718#ifdef XK_KP_End
719 case XK_KP_End:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Oq");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_End: 758 case XK_End:
729 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
730 break; 760 break;
731#ifdef XK_KP_Home
732 case XK_KP_Home:
733 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
735 {
736 strcpy (kbuf, "\033Ow");
737 break;
738 }
739 /* FALLTHROUGH */
740#endif
741 case XK_Home: 761 case XK_Home:
742 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
743 break; 763 break;
744 764
745#define FKEY(n, fkey) \
746 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
747
748 case XK_F1: /* "\033[11~" */
749 case XK_F2: /* "\033[12~" */
750 case XK_F3: /* "\033[13~" */
751 case XK_F4: /* "\033[14~" */
752 case XK_F5: /* "\033[15~" */
753 FKEY (11, XK_F1);
754 break;
755 case XK_F6: /* "\033[17~" */
756 case XK_F7: /* "\033[18~" */
757 case XK_F8: /* "\033[19~" */
758 case XK_F9: /* "\033[20~" */
759 case XK_F10: /* "\033[21~" */
760 FKEY (17, XK_F6);
761 break;
762 case XK_F11: /* "\033[23~" */
763 case XK_F12: /* "\033[24~" */
764 case XK_F13: /* "\033[25~" */
765 case XK_F14: /* "\033[26~" */
766 FKEY (23, XK_F11);
767 break;
768 case XK_F15: /* "\033[28~" */
769 case XK_F16: /* "\033[29~" */
770 FKEY (28, XK_F15);
771 break;
772 case XK_Help: /* "\033[28~" */
773 FKEY (28, XK_Help);
774 break;
775 case XK_Menu: /* "\033[29~" */
776 FKEY (29, XK_Menu);
777 break;
778 case XK_F17: /* "\033[31~" */
779 case XK_F18: /* "\033[32~" */
780 case XK_F19: /* "\033[33~" */
781 case XK_F20: /* "\033[34~" */
782 case XK_F21: /* "\033[35~" */
783 case XK_F22: /* "\033[36~" */
784 case XK_F23: /* "\033[37~" */
785 case XK_F24: /* "\033[38~" */
786 case XK_F25: /* "\033[39~" */
787 case XK_F26: /* "\033[40~" */
788 case XK_F27: /* "\033[41~" */
789 case XK_F28: /* "\033[42~" */
790 case XK_F29: /* "\033[43~" */
791 case XK_F30: /* "\033[44~" */
792 case XK_F31: /* "\033[45~" */
793 case XK_F32: /* "\033[46~" */
794 case XK_F33: /* "\033[47~" */
795 case XK_F34: /* "\033[48~" */
796 case XK_F35: /* "\033[49~" */
797 FKEY (31, XK_F17);
798 break;
799#undef FKEY
800 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
801 newlen = 0; 771 newlen = 0;
772 }
802 break; 773 break;
803 } 774 }
804 775
805 if (newlen) 776 if (newlen)
806 len = strlen (kbuf); 777 len = strlen (kbuf);
807 }
808 778
809 /* 779 /*
810 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
811 */ 781 */
812#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
829 { 799 {
830#ifdef META8_OPTION 800#ifdef META8_OPTION
831 /* set 8-bit on */ 801 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 802 if (meta && (meta_char == 0x80))
833 { 803 {
834 unsigned char *ch; 804 char *ch;
835 805
836 for (ch = kbuf; ch < kbuf + len; ch++) 806 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 807 *ch |= 0x80;
838 808
839 meta = 0; 809 meta = 0;
… …
841#endif 811#endif
842 /* nil */ ; 812 /* nil */ ;
843 } 813 }
844 } 814 }
845 815
816 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
817 return;
818
846 if (len <= 0) 819 if (len <= 0)
847 return; /* not mapped */ 820 return; /* not mapped */
848 821
849 if (options & Opt_scrollTtyKeypress) 822 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 823 if (view_start)
851 { 824 {
852 view_start = 0; 825 view_start = 0;
853 want_refresh = 1; 826 want_refresh = 1;
854 } 827 }
… …
872#ifdef META8_OPTION 845#ifdef META8_OPTION
873 && meta_char == C0_ESC 846 && meta_char == C0_ESC
874#endif 847#endif
875 ) 848 )
876 { 849 {
877 const unsigned char ch = C0_ESC; 850 const char ch = C0_ESC;
878 tt_write (&ch, 1); 851 tt_write (&ch, 1);
879 } 852 }
880 853
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
892} 855}
893/*}}} */
894 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
933
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 935unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 937{
901 unsigned int n, s; 938 unsigned int n, s;
902 939
903 n = cmdbuf_ptr - cmdbuf_base; 940 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 967void
931rxvt_term::flush () 968rxvt_term::flush ()
932{ 969{
933 flush_ev.stop (); 970 flush_ev.stop ();
934 971
935#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
937 { 974 {
938 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
939 scr_clear ();
940 scr_touch (false); 976 scr_touch (false);
941 } 977 }
942#endif 978#endif
943 979
944 if (want_refresh) 980 if (want_refresh)
945 { 981 {
982 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
983 {
984 int row = view_start;
985 int end_row = row + nrow;
986
987 while (row > top_row && ROW (row - 1).is_longer ())
988 --row;
989
990 do
991 {
992 int start_row = row;
993 line_t *l;
994
995 do
996 {
997 l = &ROW (row++);
998
999 if (!(l->f & LINE_FILTERED))
1000 {
1001 // line not filtered, mark it as filtered
1002 l->f |= LINE_FILTERED;
1003 while (l->is_longer ())
1004 {
1005 l = &ROW (row++);
1006 l->f |= LINE_FILTERED;
1007 }
1008
1009 // and filter it
1010 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1011
1012 break;
1013 }
1014 }
1015 while (l->is_longer () && row < end_row);
1016 }
1017 while (row < end_row);
1018 }
1019
946 scr_refresh (refresh_type); 1020 scr_refresh ();
947 scrollbar_show (1); 1021 scrollbar_show (1);
948#ifdef USE_XIM 1022#ifdef USE_XIM
949 IMSendSpot (); 1023 IMSendSpot ();
950#endif 1024#endif
951 } 1025 }
952 1026
953 display->flush (); 1027 display->flush ();
954} 1028}
955 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
956void 1031void
957rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
958{ 1033{
959 SET_R (this); 1034 if (want_refresh && !flush_ev.is_active ())
960 SET_LOCALE (locale); 1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
961 1036
962 display->flush (); 1037 display->flush ();
963
964 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01);
966} 1038}
967 1039
968void 1040void
969rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1042{
971 SET_R (this); 1043 make_current ();
972 SET_LOCALE (locale);
973 1044
974 refresh_limit = 1;
975 refresh_count = 0; 1045 refresh_count = 0;
976 flush (); 1046 flush ();
977} 1047}
978 1048
979#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
980void 1050void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1052{
983 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1054 want_refresh = 1;
985 1055 refresh_check ();
986 w.start (w.at + BLINK_INTERVAL);
987} 1056}
988#endif 1057#endif
989 1058
990#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
991void 1060void
992rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1062{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1064 {
996 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
997 want_refresh = 1; 1066 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
999 } 1068 }
1069 else
1070 w.stop ();
1000} 1071}
1001#endif 1072#endif
1002 1073
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1075void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1077{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1009 { 1080 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1081 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1013 } 1083 }
1084 else
1085 w.stop ();
1014} 1086}
1015#endif 1087#endif
1016 1088
1017#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1018void 1090void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1092{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1094 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1096 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1027 } 1098 }
1099 else
1100 w.stop ();
1028} 1101}
1029#endif 1102#endif
1030 1103
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1105void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1107{
1035 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1109 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1110 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1046 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1047} 1119}
1120#endif
1121
1122#if LINUX_YIELD_HACK
1123static struct event_handler
1124{
1125 ev::prepare yield_ev;
1126
1127 void yield_cb (ev::prepare &w, int revents)
1128 {
1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133
1134 struct timespec ts = { 0, 0 };
1135 nanosleep (&ts, 0);
1136
1137 w.stop ();
1138 }
1139
1140 event_handler ()
1141 : yield_ev (this, &event_handler::yield_cb)
1142 {
1143 }
1144} event_handler;
1048#endif 1145#endif
1049 1146
1050bool 1147bool
1051rxvt_term::pty_fill () 1148rxvt_term::pty_fill ()
1052{ 1149{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1151
1055 if (CBUFSIZ == n) 1152 if (CBUFSIZ == n)
1056 { 1153 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1155 n = 0;
1059 } 1156 }
1060 1157
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1159 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1160 cmdbuf_endp = cmdbuf_ptr + n;
1064 1161
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1163
1067 if (n > 0) 1164 if (r > 0)
1068 { 1165 {
1069 cmdbuf_endp += n; 1166 cmdbuf_endp += r;
1070 return true; 1167 return true;
1071 } 1168 }
1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1170 {
1171#if LINUX_YIELD_HACK
1172 if (display->is_local)
1173 event_handler.yield_ev.start ();
1174#endif
1175 }
1176 else
1073 { 1177 {
1074 pty_ev.stop (); 1178 pty_ev.stop ();
1075 1179
1076 if (!(options & Opt_hold)) 1180 if (!option (Opt_hold))
1077 destroy (); 1181 destroy ();
1078 } 1182 }
1079 1183
1080 return false; 1184 return false;
1081} 1185}
1082 1186
1083void 1187void
1084rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1085{ 1189{
1086 SET_R (this); 1190 make_current ();
1087 SET_LOCALE (locale);
1088 1191
1089 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1090 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1091 while (pty_fill ()) 1194 while (pty_fill ())
1092 if (cmd_parse ()) 1195 if (cmd_parse ())
1093 break; 1196 break;
1094 1197
1095 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1096 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1097} 1202}
1098 1203
1099void 1204void
1100rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1101{ 1206{
1102 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1103 recolour_cursor (); 1208 recolour_cursor ();
1104 1209
1105#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1211 hidden_pointer = 0;
1107 1212
1108 if (options & Opt_pointerBlank) 1213 if (option (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1110#endif 1215#endif
1111} 1216}
1112 1217
1113#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1114void 1219void
1115rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1116{ 1221{
1117 if (! (options & Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1118 return; 1223 return;
1119 1224
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1121 XFlush (display->display); 1226 XFlush (dpy);
1122 1227
1123 hidden_pointer = 1; 1228 hidden_pointer = 1;
1124} 1229}
1125 1230
1126void 1231void
1127rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1128{ 1233{
1129 SET_R (this); 1234 make_current ();
1130 SET_LOCALE (locale);
1131 1235
1132 pointer_blank (); 1236 pointer_blank ();
1133} 1237}
1134#endif 1238#endif
1135 1239
1136void 1240void
1137rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1138{ 1242{
1139 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1140 int x, y; 1244 int x, y;
1245 int code = 32;
1141 1246
1142 x = ev.x; 1247 x = Pixel2Col (ev.x);
1143 y = ev.y; 1248 y = Pixel2Row (ev.y);
1144 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1145 1257
1146 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1147 button_number = 3; 1259 button_number = 3;
1148 else 1260 else
1149 { 1261 {
… …
1195 x + 1, 1307 x + 1,
1196 y + 1); 1308 y + 1);
1197#endif 1309#endif
1198 1310
1199 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1200 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1201 (32 + x + 1), 1313 (32 + x + 1),
1202 (32 + y + 1)); 1314 (32 + y + 1));
1203} 1315}
1204
1205#ifdef USING_W11LIB
1206void
1207rxvt_W11_process_x_event (XEvent *ev)
1208{
1209 rxvt_t *r = rxvt_get_r ();
1210
1211 x_cb (*ev);
1212}
1213#endif
1214 1316
1215/*{{{ process an X event */ 1317/*{{{ process an X event */
1216void 1318void
1217rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1218{ 1320{
1219 dDisp; 1321 make_current ();
1220 1322
1221 SET_R (this); 1323 dLocal (Display *, dpy);
1222 SET_LOCALE (locale);
1223 1324
1224#if defined(CURSOR_BLINK) 1325 if (ev.xany.window == vt
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1226 { 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1227 if (hidden_cursor) 1328 return;
1228 {
1229 hidden_cursor = 0;
1230 want_refresh = 1;
1231 }
1232 1329
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1330 // for XQueryPointer
1234 }
1235#endif
1236
1237#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1239 {
1240 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease)
1243 if (hidden_pointer)
1244 pointer_unblank ();
1245
1246 if (ev.type == KeyPress && hidden_pointer == 0)
1247 pointer_blank ();
1248 }
1249#endif
1250
1251 Window unused_root, unused_child; 1331 Window unused_root, unused_child;
1252 int unused_root_x, unused_root_y; 1332 int unused_root_x, unused_root_y;
1253 unsigned int unused_mask; 1333 unsigned int unused_mask;
1254 1334
1255 switch (ev.type) 1335 switch (ev.type)
1256 { 1336 {
1257 case KeyPress: 1337 case KeyPress:
1258#if ISO_14755 1338 key_press (ev.xkey);
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1261 lookup_key (ev.xkey);
1262
1263 break; 1339 break;
1264 1340
1265 case KeyRelease: 1341 case KeyRelease:
1266 { 1342 key_release (ev.xkey);
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1326
1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1328 if (!(ev.xkey.state & ControlMask))
1329 slip_wheel_ev.stop ();
1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1331 mouse_slip_wheel_speed = 0;
1332#endif
1333 break; 1343 break;
1334 }
1335 1344
1336 case ButtonPress: 1345 case ButtonPress:
1337 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1338 break; 1347 break;
1339 1348
… …
1341 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1342 break; 1351 break;
1343 1352
1344 case ClientMessage: 1353 case ClientMessage:
1345 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1347 { 1356 {
1357 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1358 {
1359 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1360 {
1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1361 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1362 {
1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1349 destroy (); 1364 destroy ();
1365 }
1350#if ENABLE_EWMH 1366#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev); 1370 &ev);
1371#endif
1372 }
1373 }
1374#if ENABLE_XEMBED
1375 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1376 {
1377 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1378 focus_in ();
1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1380 focus_out ();
1381 }
1355#endif 1382#endif
1356 } 1383 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1366#ifdef OFFIX_DND
1367 /* OffiX Dnd (drag 'n' drop) protocol */
1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1369 && (ev.xclient.data.l[0] == DndFile
1370 || ev.xclient.data.l[0] == DndDir
1371 || ev.xclient.data.l[0] == DndLink))
1372 {
1373 /* Get Dnd data */
1374 Atom ActualType;
1375 int ActualFormat;
1376 unsigned char *data;
1377 unsigned long Size, RemainingBytes;
1378
1379 XGetWindowProperty (disp, display->root,
1380 xa[XA_DNDSELECTION],
1381 0L, 1000000L,
1382 False, AnyPropertyType,
1383 &ActualType, &ActualFormat,
1384 &Size, &RemainingBytes,
1385 &data);
1386 set_string_property (XA_CUT_BUFFER0, data);
1387 XFree (data);
1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1390 }
1391#endif /* OFFIX_DND */
1392 break;
1393
1394 case MappingNotify:
1395 XRefreshKeyboardMapping (&ev.xmapping);
1396 break; 1384 break;
1397 1385
1398 /* 1386 /*
1399 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1400 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1419 break; 1407 break;
1420 } 1408 }
1421 break; 1409 break;
1422 1410
1423 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1424 focus_in (); 1415 focus_in ();
1425 break; 1416 break;
1426 1417
1427 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1422 focus_out ();
1429 break; 1423 break;
1430 1424
1431 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1432 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1433 { 1430 {
1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ; 1432 ;
1436 1433
1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1438 { 1435 {
1439 seen_resize = 1; 1436 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1438 }
1442 1439 else
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1444 if (options & Opt_transparent) 1441#ifdef HAVE_BG_PIXMAP
1445 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1446#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1447 } 1453 }
1448 break; 1454 break;
1449 1455
1450 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1452 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1453 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1454 1461
1455 break; 1462 break;
1456 1463
1457 case SelectionClear: 1464 case SelectionClear:
1458 selection_clear (); 1465 selection_clear ();
… …
1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1464 break; 1471 break;
1465 1472
1466 case SelectionRequest: 1473 case SelectionRequest:
1467 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1475 break;
1476
1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start ();
1497#endif
1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 break; 1499 break;
1469 1500
1470 case UnmapNotify: 1501 case UnmapNotify:
1471 mapped = 0; 1502 mapped = 0;
1472#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1473 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1474#endif 1505#endif
1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 break; 1507 break;
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1481#endif
1482 break;
1483
1484#ifdef TRANSPARENT
1485 case ReparentNotify:
1486 rootwin_cb (ev);
1487 break;
1488#endif /* TRANSPARENT */
1489 1508
1490 case GraphicsExpose: 1509 case GraphicsExpose:
1491 case Expose: 1510 case Expose:
1492 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1493 { 1512 {
1494 do 1513 do
1514 {
1495 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1496 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1498 1519
1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1500 1521
1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1504 1527
1505 scr_refresh (refresh_type); 1528 want_refresh = 1;
1506 } 1529 }
1507 else 1530 else
1508 { 1531 {
1509 XEvent unused_event; 1532 XEvent unused_event;
1510 1533
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1512 ; 1535 ;
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1514 ; 1537 ;
1515 1538
1516 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1517 { 1540 {
1518 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1519 scrollbar_show (0); 1542 scrollbar_show (0);
1520 } 1543 }
1521#ifdef MENUBAR
1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1523 menubar_expose ();
1524#endif
1525
1526#ifdef TRANSPARENT
1527 if (am_transparent && ev.xany.window == parent[0])
1528 XClearWindow (disp, ev.xany.window);
1529#endif
1530 } 1544 }
1531 break; 1545 break;
1532 1546
1533 case MotionNotify: 1547 case MotionNotify:
1534#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1535 if (hidden_pointer) 1549 if (hidden_pointer)
1536 pointer_unblank (); 1550 pointer_unblank ();
1537#endif 1551#endif
1538#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1540 {
1541 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1542 break;
1543 }
1544#endif
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1556 break;
1547 1557
1548 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1549 { 1559 {
1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1562 ; // nop
1550 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1551 { 1564 {
1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1553 ; 1566 ;
1554 1567
1555 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1556 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1557 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1558 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1559 &ev.xbutton.state); 1572 &ev.xbutton.state);
1560#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1580 int dist; 1593 int dist;
1581 1594
1582 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1583 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1584 */ 1597 */
1585 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1586 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1587 1600
1588 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1589 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1590 */ 1603 */
1591 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1613 else 1626 else
1614 { 1627 {
1615 /* we are within the text window, so we 1628 /* we are within the text window, so we
1616 * shouldn't be scrolling 1629 * shouldn't be scrolling
1617 */ 1630 */
1618 if (sel_scroll_ev.active)
1619 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1620 } 1632 }
1621#endif 1633#endif
1622#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1623 } 1635 }
1624#endif 1636#endif
1625 } 1637 }
1626 } 1638 }
1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1628 { 1640 {
1629 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1630 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1631 ; 1643 ;
1632 1644
1633 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1634 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1637 &unused_mask); 1649 &unused_mask);
1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1639 scrollbar_size ()); 1651 scrollbar_size ());
1640 scr_refresh (refresh_type);
1641 refresh_limit = 0; 1652 want_refresh = 1;
1642 scrollbar_show (1); 1653 scrollbar_show (1);
1643 } 1654 }
1644 break; 1655 break;
1645 } 1656 }
1657
1658#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again ();
1668 }
1669#endif
1670
1671#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 {
1674 if (ev.type == MotionNotify
1675 || ev.type == ButtonPress
1676 || ev.type == ButtonRelease)
1677 if (hidden_pointer)
1678 pointer_unblank ();
1679
1680 if (ev.type == KeyPress && hidden_pointer == 0)
1681 pointer_blank ();
1682 }
1683#endif
1684
1685 refresh_check ();
1646} 1686}
1647 1687
1648void 1688void
1649rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1650{ 1690{
1651 if (!focus) 1691 if (!focus)
1652 { 1692 {
1653 focus = 1; 1693 focus = 1;
1654 want_refresh = 1; 1694 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1655#if USE_XIM 1698#if USE_XIM
1656 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1657 { 1700 {
1658 IMSetStatusPosition (); 1701 IMSetPosition ();
1659 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1660 } 1703 }
1661#endif 1704#endif
1662#if CURSOR_BLINK 1705#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1706 if (option (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1665#endif 1708#endif
1666#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1668 { 1711 {
1669 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1670 scr_recolour (); 1713 scr_recolour ();
1671 } 1714 }
1672#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1673 } 1726 }
1674} 1727}
1675 1728
1676void 1729void
1677rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1679 if (focus) 1732 if (focus)
1680 { 1733 {
1681 focus = 0; 1734 focus = 0;
1682 want_refresh = 1; 1735 want_refresh = 1;
1683 1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1684#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1685 iso14755buf = 0; 1742 iso14755buf = 0;
1686#endif 1743# if ISO_14755
1687#if ENABLE_OVERLAY
1688 scr_overlay_off (); 1744 scr_overlay_off ();
1745# endif
1746 }
1689#endif 1747#endif
1690#if USE_XIM 1748#if USE_XIM
1691 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1693#endif 1751#endif
1694#if CURSOR_BLINK 1752#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1753 if (option (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1697 hidden_cursor = 0; 1756 hidden_cursor = 0;
1698#endif 1757#endif
1699#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1701 { 1760 {
… …
1704 } 1763 }
1705#endif 1764#endif
1706 } 1765 }
1707} 1766}
1708 1767
1709#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1710void 1782void
1711rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1712{ 1784{
1713 SET_R (this); 1785 make_current ();
1714 SET_LOCALE (locale);
1715 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1716 switch (ev.type) 1792 switch (ev.type)
1717 { 1793 {
1718 case PropertyNotify: 1794 case PropertyNotify:
1719 /* 1795 /*
1720 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1721 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1722 */ 1798 */
1723 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1725 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1726 1805
1727 /* FALLTHROUGH */
1728 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1;
1731 break; 1806 break;
1732 } 1807 }
1808# endif
1809
1810 refresh_check ();
1733} 1811}
1734#endif 1812#endif
1735 1813
1736void 1814void
1737rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
1738{ 1816{
1739 int reportmode = 0, clickintime; 1817 int reportmode = 0, clickintime;
1740 1818
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1819 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1820
1742 if (!bypass_keystate) 1821 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1822 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1823
1745 /* 1824 /*
1746 * VT window processing of button press 1825 * VT window processing of button press
1747 */ 1826 */
1748 if (ev.window == vt) 1827 if (ev.window == vt)
1749 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1750#if ISO_14755 1832#if ISO_14755
1751 // 5.4 1833 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 { 1835 {
1754 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1766#ifdef MOUSE_REPORT_DOUBLECLICK 1848#ifdef MOUSE_REPORT_DOUBLECLICK
1767 if (ev.button == MEvent.button && clickintime) 1849 if (ev.button == MEvent.button && clickintime)
1768 { 1850 {
1769 /* same button, within alloted time */ 1851 /* same button, within alloted time */
1770 MEvent.clicks++; 1852 MEvent.clicks++;
1853
1771 if (MEvent.clicks > 1) 1854 if (MEvent.clicks > 1)
1772 { 1855 {
1773 /* only report double clicks */ 1856 /* only report double clicks */
1774 MEvent.clicks = 2; 1857 MEvent.clicks = 2;
1775 mouse_report (ev); 1858 mouse_report (ev);
… …
1787 mouse_report (ev); 1870 mouse_report (ev);
1788 } 1871 }
1789#else 1872#else
1790 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1791 mouse_report (ev); 1874 mouse_report (ev);
1792#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1793 1876
1794 } 1877 }
1795 else 1878 else
1796 { 1879 {
1797 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1807#else 1890#else
1808 selection.rect = false; 1891 selection.rect = false;
1809#endif 1892#endif
1810 1893
1811 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1813 { 1896 {
1814 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1816 else 1899 else
1817 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
… …
1845 } 1928 }
1846 1929
1847 /* 1930 /*
1848 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1849 */ 1932 */
1850 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1851 { 1934 {
1852 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1853 /* 1943 /*
1854 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1855 * move up if mouse is above slider 1945 * move up if mouse is above slider
1856 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1857 * 1947 *
… …
1866 /* 1956 /*
1867 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1868 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1869 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1870 */ 1960 */
1871 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1872 && scrollbarnext_upButton (ev.y))
1873 || (scrollBar.style == R_SB_RXVT
1874 && scrollbarrxvt_upButton (ev.y)))
1875 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1876 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1877 && scrollbarnext_dnButton (ev.y))
1878 || (scrollBar.style == R_SB_RXVT
1879 && scrollbarrxvt_dnButton (ev.y)))
1880 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1881 else 1965 else
1882 switch (ev.button) 1966 switch (ev.button)
1883 { 1967 {
1884 case Button2: 1968 case Button2:
… …
1891 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1892 break; 1976 break;
1893 } 1977 }
1894 } 1978 }
1895 else 1979 else
1896#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1897
1898 {
1899 char upordown = 0;
1900
1901 if (scrollBar.style == R_SB_NEXT)
1902 { 1981 {
1903 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1904 upordown = -1; /* up */
1905 else if (scrollbarnext_dnButton (ev.y))
1906 upordown = 1; /* down */
1907 }
1908 else if (scrollBar.style == R_SB_RXVT)
1909 {
1910 if (scrollbarrxvt_upButton (ev.y))
1911 upordown = -1; /* up */
1912 else if (scrollbarrxvt_dnButton (ev.y))
1913 upordown = 1; /* down */
1914 }
1915 if (upordown)
1916 { 1983 {
1917#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1918 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1919#endif 1987#endif
1920 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1921 { 1989 {
1922 if (upordown < 0) 1990 if (direction == UP)
1923 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1924 else 1992 else
1925 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1926 } 1994 }
1927 } 1995 }
1928 else 1996 else
1929 switch (ev.button) 1997 switch (ev.button)
1930 { 1998 {
1931 case Button2: 1999 case Button2:
1932 switch (scrollbar_align) 2000 switch (scrollBar.align)
1933 { 2001 {
1934 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
1935 csrO = 0; 2003 csrO = 0;
1936 break; 2004 break;
1937 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
1945 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
1946 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
1947 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
1948 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1949 2017
1950 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
1951 break; 2019 break;
1952 2020
1953 case Button1: 2021 case Button1:
1954 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1955 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
1956 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
1957 2025
1958 case Button3: 2026 case Button3:
1959 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
1969 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
1970# else 2038# else
1971 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
1972# endif 2040# endif
1973 else 2041 else
1974 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
1975 } 2043 }
1976 else 2044 else
1977 { 2045 {
1978 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
1979 (nrow 2047 (nrow
… …
1982 } 2050 }
1983 2051
1984 break; 2052 break;
1985 } 2053 }
1986 } 2054 }
2055
1987 return; 2056 return;
1988 } 2057 }
1989#if MENUBAR
1990 /*
1991 * Menubar window processing of button press
1992 */
1993 if (isMenuBarWindow (ev.window))
1994 menubar_control (ev);
1995#endif
1996} 2058}
1997 2059
1998void 2060void
1999rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2000{ 2062{
… …
2002 2064
2003 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2004 if (!bypass_keystate) 2066 if (!bypass_keystate)
2005 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2006 2068
2007 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2008 { 2070 {
2009 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2010 scrollbar_show (0); 2072 scrollbar_show (0);
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2012 refresh_type &= ~SMOOTH_REFRESH;
2013#endif
2014 } 2073 }
2015 2074
2016#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2017 if (sel_scroll_ev.active)
2018 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2019#endif 2077#endif
2020 2078
2021 if (ev.window == vt) 2079 if (ev.window == vt)
2022 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2023#if ISO_14755 2084#if ISO_14755
2024 // 5.4 2085 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return; 2087 return;
2027#endif 2088#endif
2089
2028 if (reportmode) 2090 if (reportmode)
2029 { 2091 {
2030 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2031 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2032 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2043 mouse_report (ev); 2105 mouse_report (ev);
2044 } 2106 }
2045#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2046 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2047 mouse_report (ev); 2109 mouse_report (ev);
2048#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2049 return; 2111 return;
2050 } 2112 }
2051 2113
2052 /* 2114 /*
2053 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2062 { 2124 {
2063 case Button1: 2125 case Button1:
2064 case Button3: 2126 case Button3:
2065 selection_make (ev.time); 2127 selection_make (ev.time);
2066 break; 2128 break;
2129
2067 case Button2: 2130 case Button2:
2068 selection_request (ev.time, ev.x, ev.y); 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2069 break; 2133 break;
2134
2070#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2071 case Button4: 2136 case Button4:
2072 case Button5: 2137 case Button5:
2073 { 2138 {
2074 int i; 2139 int i;
… …
2076 2141
2077 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2078 2143
2079 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2080 i = 1; 2145 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2146 else if (option (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2147 i = nrow - 1;
2083 else 2148 else
2084 i = 5; 2149 i = 5;
2085 2150
2086# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2088 { 2153 {
2089 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2092 2157
2093 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2095
2096 slip_wheel_ev.start ();
2097 } 2160 }
2098 else 2161 else
2162# endif
2099 { 2163 {
2100# endif
2101# ifdef JUMP_MOUSE_WHEEL
2102 scr_page (v, i); 2164 scr_page (v, i);
2103 scr_refresh (SMOOTH_REFRESH);
2104 scrollbar_show (1); 2165 scrollbar_show (1);
2105# else
2106 while (i--)
2107 {
2108 scr_page (v, 1);
2109 scr_refresh (SMOOTH_REFRESH);
2110 scrollbar_show (1);
2111 }
2112# endif
2113# ifdef MOUSE_SLIP_WHEELING
2114 } 2166 }
2115#endif
2116 } 2167 }
2117 break; 2168 break;
2118#endif 2169#endif
2119 } 2170 }
2120 } 2171 }
2121#ifdef MENUBAR
2122 else if (isMenuBarWindow (ev.window))
2123 menubar_control (ev);
2124#endif
2125} 2172}
2126
2127#ifdef TRANSPARENT
2128#if TINTING
2129/* taken from aterm-0.4.2 */
2130
2131typedef uint32_t RUINT32T;
2132
2133void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2134{
2135 int sh_r, sh_g, sh_b;
2136 RUINT32T mask_r, mask_g, mask_b;
2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2140 int i;
2141
2142 Visual *visual = display->visual;
2143
2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2145
2146 /* for convenience */
2147 mask_r = visual->red_mask;
2148 mask_g = visual->green_mask;
2149 mask_b = visual->blue_mask;
2150
2151 /* boring lookup table pre-initialization */
2152 switch (srcImage->bits_per_pixel) {
2153 case 15:
2154 if ((mask_r != 0x7c00) ||
2155 (mask_g != 0x03e0) ||
2156 (mask_b != 0x001f))
2157 return;
2158 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2159 lookup_r = lookup;
2160 lookup_g = lookup+32;
2161 lookup_b = lookup+32+32;
2162 sh_r = 10;
2163 sh_g = 5;
2164 sh_b = 0;
2165 break;
2166 case 16:
2167 if ((mask_r != 0xf800) ||
2168 (mask_g != 0x07e0) ||
2169 (mask_b != 0x001f))
2170 return;
2171 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2172 lookup_r = lookup;
2173 lookup_g = lookup+32;
2174 lookup_b = lookup+32+64;
2175 sh_r = 11;
2176 sh_g = 5;
2177 sh_b = 0;
2178 break;
2179 case 24:
2180 if ((mask_r != 0xff0000) ||
2181 (mask_g != 0x00ff00) ||
2182 (mask_b != 0x0000ff))
2183 return;
2184 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2185 lookup_r = lookup;
2186 lookup_g = lookup+256;
2187 lookup_b = lookup+256+256;
2188 sh_r = 16;
2189 sh_g = 8;
2190 sh_b = 0;
2191 break;
2192 case 32:
2193 if ((mask_r != 0xff0000) ||
2194 (mask_g != 0x00ff00) ||
2195 (mask_b != 0x0000ff))
2196 return;
2197 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2198 lookup_r = lookup;
2199 lookup_g = lookup+256;
2200 lookup_b = lookup+256+256;
2201 sh_r = 16;
2202 sh_g = 8;
2203 sh_b = 0;
2204 break;
2205 default:
2206 return; /* we do not support this color depth */
2207 }
2208
2209 /* prepare limits for color transformation (each channel is handled separately) */
2210 if (shade < 0) {
2211 shade = -shade;
2212 if (shade < 0) shade = 0;
2213 if (shade > 100) shade = 100;
2214
2215 lower_lim_r = 65535-rm;
2216 lower_lim_g = 65535-gm;
2217 lower_lim_b = 65535-bm;
2218
2219 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2220 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2221 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2222
2223 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2224 } else {
2225 if (shade < 0) shade = 0;
2226 if (shade > 100) shade = 100;
2227
2228 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2229
2230 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2231 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2232 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2233 }
2234
2235 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2236 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2237 {
2238 unsigned int tmp;
2239
2240 tmp = lower_lim_r;
2241 lower_lim_r = lower_lim_b;
2242 lower_lim_b = tmp;
2243
2244 tmp = upper_lim_r;
2245 upper_lim_r = upper_lim_b;
2246 upper_lim_b = tmp;
2247 }
2248
2249 /* fill our lookup tables */
2250 for (i = 0; i <= mask_r>>sh_r; i++)
2251 {
2252 RUINT32T tmp;
2253 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2254 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2255 lookup_r[i] = (tmp/65535)<<sh_r;
2256 }
2257 for (i = 0; i <= mask_g>>sh_g; i++)
2258 {
2259 RUINT32T tmp;
2260 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2261 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2262 lookup_g[i] = (tmp/65535)<<sh_g;
2263 }
2264 for (i = 0; i <= mask_b>>sh_b; i++)
2265 {
2266 RUINT32T tmp;
2267 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2268 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2269 lookup_b[i] = (tmp/65535)<<sh_b;
2270 }
2271
2272 /* apply table to input image (replacing colors by newly calculated ones) */
2273 switch (srcImage->bits_per_pixel)
2274 {
2275 case 15:
2276 {
2277 unsigned short *p1, *pf, *p, *pl;
2278 p1 = (unsigned short *) srcImage->data;
2279 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2280 while (p1 < pf)
2281 {
2282 p = p1;
2283 pl = p1 + srcImage->width;
2284 for (; p < pl; p++)
2285 {
2286 *p = lookup_r[(*p & 0x7c00)>>10] |
2287 lookup_g[(*p & 0x03e0)>> 5] |
2288 lookup_b[(*p & 0x001f)];
2289 }
2290 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2291 }
2292 break;
2293 }
2294 case 16:
2295 {
2296 unsigned short *p1, *pf, *p, *pl;
2297 p1 = (unsigned short *) srcImage->data;
2298 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2299 while (p1 < pf)
2300 {
2301 p = p1;
2302 pl = p1 + srcImage->width;
2303 for (; p < pl; p++)
2304 {
2305 *p = lookup_r[(*p & 0xf800)>>11] |
2306 lookup_g[(*p & 0x07e0)>> 5] |
2307 lookup_b[(*p & 0x001f)];
2308 }
2309 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2310 }
2311 break;
2312 }
2313 case 24:
2314 {
2315 unsigned char *p1, *pf, *p, *pl;
2316 p1 = (unsigned char *) srcImage->data;
2317 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2318 while (p1 < pf)
2319 {
2320 p = p1;
2321 pl = p1 + srcImage->width * 3;
2322 for (; p < pl; p += 3)
2323 {
2324 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2325 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2326 p[2] = lookup_r[(p[2] & 0x0000ff)];
2327 }
2328 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2329 }
2330 break;
2331 }
2332 case 32:
2333 {
2334 RUINT32T *p1, *pf, *p, *pl;
2335 p1 = (RUINT32T *) srcImage->data;
2336 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0xff0000)>>16] |
2345 lookup_g[(*p & 0x00ff00)>> 8] |
2346 lookup_b[(*p & 0x0000ff)] |
2347 (*p & ~0xffffff);
2348 }
2349 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 }
2354
2355 free (lookup);
2356}
2357#endif
2358
2359/*
2360 * Check our parents are still who we think they are.
2361 * Do transparency updates if required
2362 */
2363int
2364rxvt_term::check_our_parents ()
2365{
2366 int i, pchanged, aformat, have_pixmap, rootdepth;
2367 unsigned long nitems, bytes_after;
2368 Atom atype;
2369 unsigned char *prop = NULL;
2370 Window root, oldp, *list;
2371 Pixmap rootpixmap = None;
2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2374
2375 pchanged = 0;
2376
2377 if (!(options & Opt_transparent))
2378 return pchanged; /* Don't try any more */
2379
2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth;
2382
2383 XGetWindowAttributes (disp, parent[0], &wattr);
2384
2385 if (rootdepth != wattr.depth)
2386 {
2387 if (am_transparent)
2388 {
2389 pchanged = 1;
2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2391 am_transparent = am_pixmap_trans = 0;
2392 }
2393
2394 return pchanged; /* Don't try any more */
2395 }
2396
2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2398 XSync (disp, False);
2399
2400 /*
2401 * Make the frame window set by the window manager have
2402 * the root background. Some window managers put multiple nested frame
2403 * windows for each client, so we have to take care about that.
2404 */
2405 i = (xa[XA_XROOTPMAP_ID]
2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2408 &nitems, &bytes_after, &prop) == Success);
2409
2410 if (!i || prop == NULL)
2411 i = (xa[XA_ESETROOT_PMAP_ID]
2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2414 &nitems, &bytes_after, &prop) == Success);
2415
2416 if (!i || prop == NULL
2417#if TINTING
2418 || !rs[Rs_color + Color_tint]
2419#endif
2420 )
2421 have_pixmap = 0;
2422 else
2423 {
2424 have_pixmap = 1;
2425 rootpixmap = *(Pixmap *)prop;
2426 XFree (prop);
2427 }
2428
2429 if (have_pixmap)
2430 {
2431 /*
2432 * Copy display->root pixmap transparency
2433 */
2434 int sx, sy, nx, ny;
2435 unsigned int nw, nh;
2436 Window cr;
2437 XImage *image;
2438 GC gc;
2439 XGCValues gcvalue;
2440
2441 XTranslateCoordinates (disp, parent[0], display->root,
2442 0, 0, &sx, &sy, &cr);
2443 nw = (unsigned int)szHint.width;
2444 nh = (unsigned int)szHint.height;
2445 nx = ny = 0;
2446
2447 if (sx < 0)
2448 {
2449 nw += sx;
2450 nx = -sx;
2451 sx = 0;
2452 }
2453
2454 if (sy < 0)
2455 {
2456 nh += sy;
2457 ny = -sy;
2458 sy = 0;
2459 }
2460
2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463
2464 XSync (disp, False);
2465 allowedxerror = -1;
2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2467
2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2469 /* XXX: may need a delay here? */
2470 allowedxerror = 0;
2471
2472 if (image == NULL)
2473 {
2474 if (am_transparent && am_pixmap_trans)
2475 {
2476 pchanged = 1;
2477 if (pixmap != None)
2478 {
2479 XFreePixmap (disp, pixmap);
2480 pixmap = None;
2481 }
2482 }
2483
2484 am_pixmap_trans = 0;
2485 }
2486 else
2487 {
2488 if (pixmap != None)
2489 XFreePixmap (disp, pixmap);
2490
2491#if TINTING
2492 if (ISSET_PIXCOLOR (Color_tint))
2493 {
2494 unsigned short rm, gm, bm;
2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2496
2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2498
2499 ShadeXImage (display, image, shade, rm, gm, bm);
2500 }
2501#endif
2502
2503 pixmap = XCreatePixmap (disp, vt,
2504 szHint.width, szHint.height, image->depth);
2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2507 nx, ny, image->width, image->height);
2508 XFreeGC (disp, gc);
2509 XDestroyImage (image);
2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2511 XClearWindow (disp, parent[0]);
2512
2513 if (!am_transparent || !am_pixmap_trans)
2514 pchanged = 1;
2515
2516 am_transparent = am_pixmap_trans = 1;
2517 }
2518 }
2519
2520 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2522 else
2523 {
2524 unsigned int n;
2525 /*
2526 * InheritPixmap transparency
2527 */
2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2529 {
2530 oldp = parent[i];
2531 XQueryTree (disp, parent[i - 1], &root,
2532 &parent[i], &list, &n);
2533 XFree (list);
2534
2535 if (parent[i] == display->root)
2536 {
2537 if (oldp != None)
2538 pchanged = 1;
2539
2540 break;
2541 }
2542
2543 if (oldp != parent[i])
2544 pchanged = 1;
2545 }
2546
2547 n = 0;
2548
2549 if (pchanged)
2550 {
2551 for (; n < (unsigned int)i; n++)
2552 {
2553 XGetWindowAttributes (disp, parent[n], &wattr);
2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2555 {
2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2557 break;
2558 }
2559 }
2560 }
2561
2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2563 {
2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2566 am_transparent = 0;
2567 /* XXX: also turn off Opt_transparent? */
2568 }
2569 else
2570 {
2571#if WAIT_FOR_WM
2572 /* wait (an arbitrary period) for the WM to do its thing
2573 * needed for fvwm2.2.2 (and before?) */
2574 sleep (1);
2575#endif
2576 for (n = 0; n < (unsigned int)i; n++)
2577 {
2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2579 XClearWindow (disp, parent[n]);
2580 }
2581
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 am_transparent = 1;
2584 }
2585
2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 parent[i] = None;
2588 }
2589
2590 if (scrollBar.win)
2591 {
2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2593 scrollBar.setIdle ();
2594 scrollbar_show (0);
2595 }
2596
2597 if (am_transparent)
2598 {
2599 want_refresh = want_full_refresh = 1;
2600 if (am_pixmap_trans)
2601 flush ();
2602 }
2603
2604 return pchanged;
2605}
2606#endif
2607 2173
2608/*}}} */ 2174/*}}} */
2609 2175
2610bool 2176bool
2611rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2612{ 2178{
2613 bool flag = false; 2179 bool flag = false;
2614 unicode_t ch = NOCHAR; 2180 wchar_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2181 char *seq_begin; // remember start of esc-sequence here
2616 2182
2617 for (;;) 2183 for (;;)
2618 { 2184 {
2619 if (ch == NOCHAR) 2185 if (ch == NOCHAR)
2620 { 2186 {
2621 seq_begin = cmdbuf_ptr; 2187 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2188 ch = next_char ();
2623 }
2624 2189
2625 if (ch == NOCHAR) // TODO: improve 2190 if (ch == NOCHAR)
2626 break; 2191 break;
2192 }
2627 2193
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2629 { 2195 {
2630 if (!seen_input) 2196 if (!seen_input)
2631 { 2197 {
… …
2640 if (seen_resize && cmd_pid) 2206 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH); 2207 kill (-cmd_pid, SIGWINCH);
2642 } 2208 }
2643 2209
2644 /* Read a text string from the input buffer */ 2210 /* Read a text string from the input buffer */
2645 unicode_t buf[UBUFSIZ]; 2211 wchar_t buf[UBUFSIZ];
2646 bool refreshnow = false; 2212 bool refreshnow = false;
2647 int nlines = 0; 2213 int nlines = 0;
2648 unicode_t *str = buf; 2214 wchar_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ); 2215 wchar_t *eol = str + min (ncol, UBUFSIZ);
2650 2216
2651 for (;;) 2217 for (;;)
2652 { 2218 {
2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2654 break; 2220 break;
… …
2660 if (ch == C0_LF) 2226 if (ch == C0_LF)
2661 nlines++; 2227 nlines++;
2662 2228
2663 refresh_count++; 2229 refresh_count++;
2664 2230
2665 if (!(options & Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2232 {
2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2668 refreshnow = true; 2237 refreshnow = true;
2669 ch = NOCHAR; 2238 ch = NOCHAR;
2670 break; 2239 break;
2240 }
2671 } 2241 }
2672 2242
2673 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2675 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2248 scr_add_lines (buf, str - buf, nlines);
2249
2677 nlines = 0; 2250 nlines = 0;
2678 str = buf; 2251 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
2680 } 2253 }
2681 2254
… …
2694 2267
2695 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2269 ch = next_char ();
2697 } 2270 }
2698 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2274 scr_add_lines (buf, str - buf, nlines);
2700 2275
2701 /* 2276 /*
2702 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2705 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2280 */
2707 if (refreshnow) 2281 if (refreshnow)
2708 { 2282 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++;
2711 else
2712 {
2713 flag = true; 2283 flag = true;
2714 scr_refresh (refresh_type); 2284 scr_refresh ();
2715 } 2285 want_refresh = 1;
2716 } 2286 }
2717 2287
2718 } 2288 }
2719 else 2289 else
2720 { 2290 {
… …
2734 } 2304 }
2735 2305
2736 return flag; 2306 return flag;
2737} 2307}
2738 2308
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2309// read the next character
2749unicode_t 2310wchar_t
2750rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2751{ 2312{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2314 {
2754 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2317 return *cmdbuf_ptr++;
2757 2318
2758 wchar_t wc; 2319 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2321
2761 if (len == (size_t)-2) 2322 if (len == (size_t)-2)
2762 { 2323 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2324 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2325 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2326 break;
2766 } 2327 }
2767 2328
2768 if (len == (size_t)-1) 2329 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770 2331
2771 // assume wchar == unicode 2332 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2333 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2334 return wc & UNICODE_MASK;
2774 } 2335 }
2775 2336
2776 return NOCHAR; 2337 return NOCHAR;
2777} 2338}
2339
2340// read the next octet
2341uint32_t
2342rxvt_term::next_octet () NOTHROW
2343{
2344 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR;
2347}
2348
2349static class out_of_input out_of_input;
2778 2350
2779/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2780/* 2352/*
2781 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2782 * to the command. 2354 * to the command.
2783 */ 2355 */
2784unicode_t 2356wchar_t
2785rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2786{ 2358{
2787 unicode_t c = next_char (); 2359 wchar_t c = next_char ();
2788 2360
2789 if (c == NOCHAR) 2361 if (c == NOCHAR)
2790 throw out_of_input; 2362 throw out_of_input;
2791 2363
2792 return c; 2364 return c;
2793} 2365}
2794 2366
2795unicode_t 2367uint32_t
2796rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2797{ 2369{
2798 unicode_t c = next_octet (); 2370 uint32_t c = next_octet ();
2799 2371
2800 if (c == NOCHAR) 2372 if (c == NOCHAR)
2801 throw out_of_input; 2373 throw out_of_input;
2802 2374
2803 return c; 2375 return c;
… …
2867 { 2439 {
2868 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2869 break; /* done = 1 */ 2441 break; /* done = 1 */
2870 } 2442 }
2871 } 2443 }
2872 2444
2873 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2874 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2875 { 2447 {
2876 done = 1; 2448 done = 1;
2877 break; 2449 break;
… …
2879 } 2451 }
2880 } 2452 }
2881 2453
2882 pclose_printer (fd); 2454 pclose_printer (fd);
2883} 2455}
2884#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2885/*}}} */ 2457/*}}} */
2886 2458
2887/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2888enum { 2460enum {
2889 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2903 case C0_ESC: 2475 case C0_ESC:
2904 process_escape_seq (); 2476 process_escape_seq ();
2905 break; 2477 break;
2906 case C0_ENQ: /* terminal Status */ 2478 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2479 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2480 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2481 else
2911 tt_write ((unsigned char *)VT100_ANS, 2482 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2483 break;
2914 case C0_BEL: /* bell */ 2484 case C0_BEL: /* bell */
2915 scr_bell (); 2485 scr_bell ();
2916 break; 2486 break;
2917 case C0_BS: /* backspace */ 2487 case C0_BS: /* backspace */
… …
2941 process_dcs_seq (); 2511 process_dcs_seq ();
2942 break; 2512 break;
2943 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2944 process_csi_seq (); 2514 process_csi_seq ();
2945 break; 2515 break;
2946 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
2947 process_osc_seq (); 2517 process_osc_seq ();
2948 break; 2518 break;
2949#endif 2519#endif
2950 } 2520 }
2951} 2521}
… …
3041 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3042 break; 2612 break;
3043 case '+': 2613 case '+':
3044 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3045 break; 2615 break;
3046#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3047 case '6': 2617 case '6':
3048 scr_backindex (); 2618 scr_backindex ();
3049 break; 2619 break;
3050#endif 2620#endif
3051 case '7': 2621 case '7':
3052 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3053 break; 2623 break;
3054 case '8': 2624 case '8':
3055 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3056 break; 2626 break;
3057#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3058 case '9': 2628 case '9':
3059 scr_forwardindex (); 2629 scr_forwardindex ();
3060 break; 2630 break;
3061#endif 2631#endif
3062 case '=': 2632 case '=':
… …
3072 break; 2642 break;
3073 2643
3074 /* 8.3.87: NEXT LINE */ 2644 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 2645 case C1_NEL: /* ESC E */
3076 { 2646 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 2647 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 2649 }
3080 break; 2650 break;
3081 2651
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 2652 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 2653 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 2675 process_dcs_seq ();
3106 break; 2676 break;
3107 2677
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 2679 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 2681 break; /* steal obsolete ESC [ c */
3113 2682
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 2684 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 2685 process_csi_seq ();
… …
3178rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3179{ 2748{
3180 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3181 unsigned int nargs, p; 2750 unsigned int nargs, p;
3182 int n, ndef; 2751 int n, ndef;
3183 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3184 2753
3185 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3186 arg[--nargs] = 0;
3187 2755
3188 priv = 0; 2756 priv = 0;
3189 ch = cmd_getc (); 2757 ch = cmd_getc ();
3190 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3191 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3192 priv = ch; 2761 priv = ch;
3193 ch = cmd_getc (); 2762 ch = cmd_getc ();
3194 } 2763 }
3195 2764
3196 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3225 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3226 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3227 if (arg[p] == -1) 2796 if (arg[p] == -1)
3228 arg[p] = ndef; 2797 arg[p] = ndef;
3229 2798
3230#ifdef DEBUG_CMD
3231 fprintf (stderr, "CSI ");
3232 for (p = 0; p < nargs; p++)
3233 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3234 fprintf (stderr, "%c\n", ch);
3235#endif
3236
3237 /* 2799 /*
3238 * private mode handling 2800 * private mode handling
3239 */ 2801 */
3240 if (priv) 2802 if (priv)
3241 { 2803 {
3242 switch (priv) 2804 switch (priv)
3243 { 2805 {
3244 case '>': 2806 case '>':
3245 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2808 {
2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2811 //
2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2814 // versions.
2815 //
2816 tt_printf ("\033[>%d;95;0c", 'U');
2817 }
3247 break; 2818 break;
2819
3248 case '?': 2820 case '?':
3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3250 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3251 break; 2823 break;
3252 } 2824 }
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2932 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2933 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 2934 break;
3363 2935
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2936 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 2938 break;
3368 2939
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2940 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 2941 process_sgr_mode (nargs, arg);
3371 break; 2942 break;
… …
3378 break; 2949 break;
3379 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3380 scr_report_position (); 2951 scr_report_position ();
3381 break; 2952 break;
3382 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 2954 if (option (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 2956 break;
3386 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 2959 break;
… …
3455 break; 3026 break;
3456 case CSI_75: 3027 case CSI_75:
3457 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3458 break; 3029 break;
3459 3030
3460#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3461 case CSI_74: 3032 case CSI_74:
3462 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3463 break; 3034 break;
3464#endif 3035#endif
3465 3036
… …
3472 break; 3043 break;
3473 } 3044 }
3474} 3045}
3475/*}}} */ 3046/*}}} */
3476 3047
3477#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3478/* ARGSUSED */ 3049/* ARGSUSED */
3479void 3050void
3480rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3481{ 3052{
3482 int x, y; 3053 int x, y;
3483 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3484 Window wdummy; 3055 Window wdummy;
3485 dDisp; 3056
3057 dLocal (Display *, dpy);
3486 3058
3487 if (nargs == 0) 3059 if (nargs == 0)
3488 return; 3060 return;
3489 3061
3490 switch (args[0]) 3062 switch (args[0])
3491 { 3063 {
3492 /* 3064 /*
3493 * commands 3065 * commands
3494 */ 3066 */
3495 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3496 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3497 break; 3069 break;
3498 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3499 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3500 break; 3072 break;
3501 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3503 break; 3075 break;
3504 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3078 break;
3507 case 5: /* raise window */ 3079 case 5: /* raise window */
3508 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3509 break; 3081 break;
3510 case 6: /* lower window */ 3082 case 6: /* lower window */
3511 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3512 break; 3084 break;
3513 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3514 scr_touch (true); 3086 scr_touch (true);
3515 break; 3087 break;
3516 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3523 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3526 break; 3098 break;
3527 3099
3528
3529 /* 3100 /*
3530 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3531 */ 3102 */
3532 case 11: /* report window state */ 3103 case 11: /* report window state */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3106 break;
3536 case 13: /* report window position */ 3107 case 13: /* report window position */
3537 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3538 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3113 break;
3543 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3117 break;
3547 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3120 break;
… …
3551 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3123 break;
3553 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3554 { 3125 {
3555 char *s; 3126 char *s;
3556 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3129 XFree (s);
3559 } 3130 }
3560 break; 3131 break;
3561 case 21: /* report window title */ 3132 case 21: /* report window title */
3562 { 3133 {
3563 char *s; 3134 char *s;
3564 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3137 XFree (s);
3567 } 3138 }
3568 break; 3139 break;
3569 } 3140 }
3570} 3141}
… …
3573/*----------------------------------------------------------------------*/ 3144/*----------------------------------------------------------------------*/
3574/* 3145/*
3575 * get input up until STRING TERMINATOR (or BEL) 3146 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3147 * ends_how is terminator used. returned input must be free()'d
3577 */ 3148 */
3578unsigned char * 3149char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3150rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3151{
3581 unicode_t ch; 3152 unicode_t ch;
3582 bool seen_esc = false; 3153 bool seen_esc = false;
3583 unsigned int n = 0; 3154 unsigned int n = 0;
… …
3597 seen_esc = true; 3168 seen_esc = true;
3598 continue; 3169 continue;
3599 } 3170 }
3600 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3601 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3602 else if (ch < 0x20) 3175 else if (ch < 0x20)
3603 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3604 3177
3605 seen_esc = false; 3178 seen_esc = false;
3606 3179
3607 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3608 // stop at some sane length 3181 // stop at some sane length
3609 return NULL; 3182 return NULL;
3610 3183
3611 if (ch == C0_SYN)
3612 string[n++] = cmd_get8 ();
3613 else
3614 string[n++] = ch; 3184 string[n++] = ch;
3615 } 3185 }
3616 3186
3617 string[n++] = '\0'; 3187 string[n++] = '\0';
3618 3188
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3190
3621 return (unsigned char *)rxvt_wcstombs (string); 3191 return rxvt_wcstombs (string);
3622} 3192}
3623 3193
3624/*----------------------------------------------------------------------*/ 3194/*----------------------------------------------------------------------*/
3625/* 3195/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3197 */
3628void 3198void
3629rxvt_term::process_dcs_seq () 3199rxvt_term::process_dcs_seq ()
3630{ 3200{
3631 unsigned char *s; 3201 char *s;
3632 unicode_t eh; 3202 unicode_t eh;
3633 3203
3634 /* 3204 /*
3635 * Not handled yet 3205 * Not handled yet
3636 */ 3206 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3225 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3226 arg = arg * 10 + (ch - '0');
3657 3227
3658 if (ch == ';') 3228 if (ch == ';')
3659 { 3229 {
3660 unsigned char *s = get_to_st (eh); 3230 char *s = get_to_st (eh);
3661 3231
3662 if (s) 3232 if (s)
3663 { 3233 {
3664 process_xterm_seq (arg, (char *)s, eh); 3234 process_xterm_seq (arg, s, eh);
3665 free (s); 3235 free (s);
3666 } 3236 }
3667 } 3237 }
3668} 3238}
3669 3239
3670void 3240void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3241rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3242{
3673 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3674 { 3244 {
3675 unsigned short r, g, b; 3245 rgba c;
3676 pix_colors_focused[color].get (display, r, g, b); 3246 pix_colors_focused[color].get (c);
3247
3248#if XFT
3249 if (c.a != rgba::MAX_CC)
3250 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3251 else
3252#endif
3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3253 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3678 } 3254 }
3679 else 3255 else
3680 set_window_color (color, str); 3256 set_window_color (color, str);
3681} 3257}
3682 3258
3683/* 3259/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3261 */
3686void 3262void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3264{
3689 int changed = 0;
3690 int color; 3265 int color;
3691 char *buf, *name; 3266 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3693 int saveop = op; 3268 int saveop = op;
3694 dDisp; 3269
3270 dLocal (Display *, dpy);
3695 3271
3696 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3697 switch (op) 3277 switch (op)
3698 { 3278 {
3699 case XTerm_name: 3279 case XTerm_name:
3700 set_title (str); 3280 set_title (str);
3701 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3715 unsigned long bytes_after; 3295 unsigned long bytes_after;
3716 unsigned char *value = 0; 3296 unsigned char *value = 0;
3717 const char *str = ""; 3297 const char *str = "";
3718 3298
3719 if (prop 3299 if (prop
3720 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3304 && actual_type != None
3725 && actual_format == 8) 3305 && actual_format == 8)
3726 str = (const char *)(value); 3306 str = (const char *)(value);
3727 3307
3728 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3729 3309
3730 XFree (value); 3310 XFree (value);
3731 } 3311 }
3732 else 3312 else
3733 { 3313 {
… …
3737 { 3317 {
3738 *eq = 0; 3318 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3740 } 3320 }
3741 else 3321 else
3742 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3743 display->atom (str)); 3323 display->atom (str));
3744 } 3324 }
3745 break; 3325 break;
3746 3326
3747 case XTerm_Color: 3327 case XTerm_Color:
… …
3749 { 3329 {
3750 if ((name = strchr (buf, ';')) == NULL) 3330 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3331 break;
3752 3332
3753 *name++ = '\0'; 3333 *name++ = '\0';
3754 color = atoi (buf); 3334 color = atoi (buf) + minCOLOR;
3755 3335
3756 if (color < 0 || color >= TOTAL_COLORS) 3336 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3337 break;
3758 3338
3759 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3340 *buf++ = '\0';
3761 3341
3762 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3763 {
3764 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 }
3768 else
3769 set_window_color (color + minCOLOR, name);
3770 } 3343 }
3771 break; 3344 break;
3345 case Rxvt_restoreFG:
3772 case XTerm_Color00: 3346 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3774 break; 3348 break;
3349 case Rxvt_restoreBG:
3775 case XTerm_Color01: 3350 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3777 break; 3352 break;
3778#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3781 break; 3356 break;
3782#endif 3357#endif
3783 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3784 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3785 break; 3360 break;
3786 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3788 break; 3363 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp);
3371 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp);
3798 break; 3375 break;
3799 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3801 break; 3378 break;
3802#endif 3379#endif
3803#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3804 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3806 check_our_parents (); 3383 {
3807 if (am_transparent) 3384 bool changed = false;
3808 want_full_refresh = want_refresh = 1;
3809 break;
3810#endif
3811 3385
3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390
3391 if (changed)
3392 update_background ();
3393 }
3394
3395 break;
3396#endif
3397
3398#if BG_IMAGE_FROM_FILE
3812 case XTerm_Pixmap: 3399 case Rxvt_Pixmap:
3813 if (*str != ';') 3400 if (!strcmp (str, "?"))
3814 { 3401 {
3815#if XPM_BACKGROUND 3402 char str[256];
3816 scale_pixmap (""); /* reset to default scaling */ 3403
3817 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3818#endif 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3819 scr_touch (true); 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3820 } 3408 }
3821 while ((str = strchr (str, ';')) != NULL) 3409 else
3822 { 3410 {
3411 int changed = 0;
3412
3413 if (*str != ';')
3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3823 str++; 3426 str++;
3824#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3825 changed += scale_pixmap (str); 3428 changed++;
3826#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3827 } 3434 }
3828
3829 if (changed)
3830 {
3831#ifdef XPM_BACKGROUND
3832 resize_pixmap ();
3833#endif
3834 scr_touch (true);
3835 }
3836 break; 3435 break;
3837 3436#endif
3838 case XTerm_restoreFG:
3839 set_window_color (Color_fg, str);
3840 break;
3841 case XTerm_restoreBG:
3842 set_window_color (Color_bg, str);
3843 break;
3844 3437
3845 case XTerm_logfile: 3438 case XTerm_logfile:
3846 // TODO, when secure mode? 3439 // TODO, when secure mode?
3847 break; 3440 break;
3848 3441
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0 3442#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3857 { 3444 {
3858 int fd; 3445 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3446 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3447 {
3861 scr_dump (fd); 3448 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3459 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3874#endif 3461#endif
3875 if (query) 3462 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3466 resp);
3880 else 3467 else
3881 { 3468 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3885 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3886 set_fonts (); 3473 set_fonts ();
3887 } 3474 }
3888 break; 3475 break;
3889 3476
3890#if ENABLE_FRILLS 3477 case URxvt_version:
3478 if (query)
3479 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3480 op,
3481 rs[Rs_name], VERSION[0], VERSION[2],
3482 resp);
3483 break;
3484
3485#if !ENABLE_MINIMAL
3891 case URxvt_locale: 3486 case URxvt_locale:
3892 if (query) 3487 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3894 else 3489 else
3895 { 3490 {
3896 set_locale (str); 3491 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3493 init_xlocale ();
3899 } 3494 }
3900 break; 3495 break;
3901 3496
3902 case URxvt_view_up: 3497 case URxvt_view_up:
3903 case URxvt_view_down: 3498 case URxvt_view_down:
3499 {
3904 int lines = atoi (str); 3500 int lines = atoi (str);
3905 3501
3906 if (lines) 3502 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 3503 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 3504 else
3909 {
3910 scr_erase_savelines (); 3505 scr_erase_savelines ();
3911 } 3506 }
3912 3507
3508 break;
3509#endif
3510
3511#if ENABLE_PERL
3512 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3514 ; // no responses yet
3913 break; 3515 break;
3914#endif 3516#endif
3915 } 3517 }
3916} 3518}
3917/*----------------------------------------------------------------------*/ 3519/*----------------------------------------------------------------------*/
… …
3948 return state; 3550 return state;
3949} 3551}
3950 3552
3951/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
3952void 3554void
3953rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3954{ 3556{
3955 unsigned int i, j; 3557 unsigned int i, j;
3956 int state; 3558 int state;
3957 3559
3958 static const struct 3560 static const struct
3959 { 3561 {
3960 const int argval; 3562 const int argval;
3961 const unsigned long bit; 3563 const unsigned long bit;
3962 }
3963
3964 argtopriv[] = { 3564 } argtopriv[] = {
3965 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
3966 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
3967 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
3968 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
3969 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
3970 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
3971 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
3973 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
3974#ifdef menuBar_esc
3975 { menuBar_esc, PrivMode_menuBar },
3976#endif
3977 // 18, 19 printing-related 3574 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
3979#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
3980 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
3981#endif 3578#endif
… …
3988 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
3989#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
3990 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
3991#endif 3588#endif
3992 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
3993 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
3994 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
3995 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3996 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3997 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
3998 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
3999 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4000 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4001 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4002 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4003 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4004 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4005 }; 3602 };
4006 3603
4007 if (nargs == 0) 3604 if (nargs == 0)
4008 return; 3605 return;
4009 3606
… …
4026 } 3623 }
4027 3624
4028 /* extra handling for values with state unkept */ 3625 /* extra handling for values with state unkept */
4029 switch (arg[i]) 3626 switch (arg[i])
4030 { 3627 {
3628#if ENABLE_STYLES
3629 case 1021:
3630 set_option (Opt_intensityStyles, mode);
3631
3632 scr_touch (true);
3633 break;
3634#endif
4031 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4032 case 1049: 3636 case 1049:
4033 if (options & Opt_secondaryScreen) 3637 if (option (Opt_secondaryScreen))
4034 if (mode == 0) 3638 if (mode == 0)
4035 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4036 else if (mode == 1) 3640 else if (mode == 1)
4037 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4038 break; 3642 break;
… …
4050 */ 3654 */
4051 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4052 break; 3656 break;
4053 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4056 break; 3663 break;
4057 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 3665 set_option (Opt_jumpScroll, !state);
4062 break; 3666 break;
4063 case 5: /* reverse video */ 3667 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 3668 scr_rvideo_mode (state);
4065 break; 3669 break;
4066 case 6: /* relative/absolute origins */ 3670 case 6: /* relative/absolute origins */
… …
4070 scr_autowrap (state); 3674 scr_autowrap (state);
4071 break; 3675 break;
4072 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4073 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4074 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4075 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4076 break; 3680 break;
4077#ifdef menuBar_esc
4078 case menuBar_esc:
4079#ifdef MENUBAR
4080 map_menuBar (state);
4081#endif
4082 break;
4083#endif
4084#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4085 case scrollBar_esc: 3682 case scrollBar_esc:
4086 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4087 { 3684 {
4088 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4100 break; 3697 break;
4101 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4102 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4103 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4104 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4105 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4106 break; 3703 break;
4107#if 0
4108 case 1001: 3704 case 1002:
4109 break; /* X11 mouse highlighting */ 3705 case 1003:
4110#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 3717 set_option (Opt_scrollTtyOutput, !state);
4116 break; 3718 break;
4117 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 3720 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 3721 break;
4123 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 3723 if (option (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 3725 scr_erase_screen (2);
4127 scr_change_screen (state); 3726 scr_change_screen (state);
4128 break; 3727 break;
4129 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 3729 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 3730 if (option (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 3732 scr_erase_screen (2);
4134 break; 3733 break;
4135 default: 3734 default:
4136 break; 3735 break;
… …
4264 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4265 break; 3864 break;
4266 3865
4267 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4268 3867
4269#ifndef NO_BRIGHTCOLOR 3868#if !ENABLE_MINIMAL
4270 case 90: 3869 case 90:
4271 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4272 case 92: 3871 case 92:
4273 case 93: 3872 case 93:
4274 case 94: 3873 case 94:
… …
4286 case 106: 3885 case 106:
4287 case 107: 3886 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3887 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 3888 break;
4290#endif 3889#endif
4291
4292 } 3890 }
4293 } 3891 }
4294} 3892}
4295/*}}} */ 3893/*}}} */
4296 3894
… …
4299rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4300{ 3898{
4301 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4302 3900
4303 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4304 { /* query graphics */ 3903 /* query graphics */
4305 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4306 return; 3905 return;
4307 } 3906 }
4308 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4309 do 3908 do
… …
4320 */ 3919 */
4321void 3920void
4322rxvt_term::tt_printf (const char *fmt,...) 3921rxvt_term::tt_printf (const char *fmt,...)
4323{ 3922{
4324 va_list arg_ptr; 3923 va_list arg_ptr;
4325 unsigned char buf[256]; 3924 char buf[256];
4326 3925
4327 va_start (arg_ptr, fmt); 3926 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3927 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 3928 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 3929 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 3934 * or generated by us in response to a query ESC sequence.
4336 */ 3935 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 3937
4339void 3938void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 3940{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3942 return;
3943
3944 if (pty->pty < 0)
3945 return;
3946
4342 if (v_buflen == 0) 3947 if (v_buflen == 0)
4343 { 3948 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4345 3950
4346 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4347 return; 3952 return;
4348 3953
4349 data += written; 3954 data += written;
4350 len -= written; 3955 len -= written;
4351 } 3956 }
4352 3957
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 3959
4355 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 3961 v_buflen += len;
4357 3962
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4359} 3964}
4360 3965
4361void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4362{ 3967{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364 3969
4365 if (written > 0) 3970 if (written > 0)
4366 { 3971 {
4367 v_buflen -= written; 3972 v_buflen -= written;
4368 3973
4369 if (v_buflen == 0) 3974 if (v_buflen == 0)
4370 { 3975 {
4371 free (v_buffer); 3976 free (v_buffer);
4372 v_buffer = 0; 3977 v_buffer = 0;
4373 v_buflen = 0;
4374 3978
4375 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4376 return; 3980 return;
4377 } 3981 }
4378 3982
4379 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 3984 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4383} 3987}
4384 3988
4385/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4386 3990

Diff Legend

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