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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
54#include <signal.h> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
55 63
56/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
57 65
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 67
63#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
64 69
65#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
114 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 121 XK_Print, 0x2399,
117 122
118 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
120 0, 133 0,
121}; 134};
122 135
123void 136void
124rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
125{ 138{
126 x = Pixel2Col (x); 139 x = Pixel2Col (x);
127 y = Pixel2Row (y); 140 y = Pixel2Row (y);
128 141
129 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 144 return;
132 145
133 for (;;) 146 for (;;)
134 { 147 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
136 151
137 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
138 { 153 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
142 break; 156 break;
143 } 157 }
144 158
145 x--; 159 x--;
146 } 160 }
147
148} 161}
149#endif
150 162
151#if ENABLE_OVERLAY
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
159 170
171 fname = rxvt_utf8towcs (f->name);
172
160#if ENABLE_COMBINING 173# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
166 } 179 }
167 else 180 else
168#endif 181# endif
169 { 182 {
170 ch2 = ch; 183 ch2 = ch;
171 184
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 char attr[80]; // plenty
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
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);
180 214
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 216
183 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
184 { 218 {
… …
187 ch = *chr++; 221 ch = *chr++;
188 222
189 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
192#if !UNICODE3 226# if !UNICODE3
193 if (ch >= 0x10000) 227 if (ch >= 0x10000)
194 ch = 0xfffd; 228 ch = 0xfffd;
195#endif 229# endif
196 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
197 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
198 } 234 }
199 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);
200 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
201 243
244 free (fname);
245
202#if ENABLE_COMBINING 246# if ENABLE_COMBINING
203 if (alloc) 247 if (alloc)
204 delete [] alloc; 248 delete [] alloc;
205#endif 249# endif
206} 250}
207#endif 251#endif
208 252
209void 253void
210rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 271 mb[0] = ch[0];
228 len = 1; 272 len = 1;
229 } 273 }
230 274
231 if (len > 0) 275 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
233 else 277 else
234 scr_bell (); 278 scr_bell ();
235 } 279 }
236 280
237 iso14755buf = 0; 281 iso14755buf = 0;
… …
254 298
255 return -1; 299 return -1;
256} 300}
257#endif 301#endif
258 302
259/*{{{ Convert the keypress event into a string */
260void 303void
261rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
262{ 305{
263 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
264 unsigned int newlen; 307 unsigned int newlen;
265 KeySym keysym; 308 KeySym keysym;
266#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */
268#endif
269 int valid_keysym; 309 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
271 316
272 /* 317 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
275 * 320 *
276 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
277 */ 322 */
278 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
281 326
282 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
283 { 328 {
284 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 338 Status status_return;
294 339
295#if 0 340#if 0
296#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
300 else 345 else
301#endif 346#endif
302#endif 347#endif
303 { 348 {
… …
305 350
306 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
310 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
313 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 361 SET_LOCALE (locale);
315 362
316 if (status_return == XLookupChars 363 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
339 } 386 }
340 else 387 else
341#endif 388#endif
342 { 389 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
345 } 392 }
346 393
347 if (valid_keysym) 394 if (valid_keysym)
348 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
349 if (TermWin.saveLines) 401 if (saveLines)
350 { 402 {
351#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 404 if (!ctrl && !meta)
353#else 405#else
354 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
355#endif 407#endif
356 { 408 {
357 int lnsppg; 409 int lnsppg;
358 410
359#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 413#else
362 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
363#endif 415#endif
364 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
365 { 417 {
366 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
367 return; 419 return;
… …
395 scr_move_to (0, 1); 447 scr_move_to (0, 1);
396 return; 448 return;
397 } 449 }
398 else if (keysym == XK_End) 450 else if (keysym == XK_End)
399 { 451 {
400 scr_move_to (1, 0); 452 scr_move_to (1, 1);
401 return; 453 return;
402 } 454 }
403 } 455 }
404#endif 456#endif
405 } 457 }
… …
416 { 468 {
417 switch (keysym) 469 switch (keysym)
418 { 470 {
419 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
422 return; 474 return;
423#if TODO 475#if TODO
424 /* rxvt extras */ 476 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
445 { 497 {
446 commit_iso14755 (); 498 commit_iso14755 ();
447 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
448# if ISO_14755 500# if ISO_14755
449 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
450# endif 510# endif
451 return; 511 return;
452 } 512 }
453 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
454 { 514 {
… …
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif 538# endif
479 } 539 }
480#endif 540#endif
481 541
482#ifdef PRINTPIPE 542#ifdef PRINTPIPE
483 if (keysym == XK_Print) 543 if (keysym == XK_Print)
484 { 544 {
485 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
486 return; 546 return;
487 } 547 }
488#endif 548#endif
489 549
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 551 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 552 {
518 newlen = 1; 553 newlen = 1;
519 switch (keysym) 554 switch (keysym)
520 { 555 {
521#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
… …
529 else 564 else
530 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
531 break; 566 break;
532#endif 567#endif
533#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
534 case XK_Delete: 579 case XK_Delete:
535 strcpy (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
536 break; 581 break;
537#endif 582#endif
538 case XK_Tab: 583 case XK_Tab:
… …
641#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
642 case XK_KP_Begin: 687 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
644 break; 689 break;
645 690
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 691#endif
654 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
… …
689 break; 727 break;
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
694 case XK_Insert: 743 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
696 break; 745 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 747 case DXK_Remove:
… …
788#undef FKEY 837#undef FKEY
789 default: 838 default:
790 newlen = 0; 839 newlen = 0;
791 break; 840 break;
792 } 841 }
842
793 if (newlen) 843 if (newlen)
794 len = strlen (kbuf); 844 len = strlen (kbuf);
795 } 845 }
796 846
797 /* 847 /*
… …
806 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
807 { 857 {
808 len = 1; 858 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
811 else 866 else
812 { 867 {
813#ifdef META8_OPTION 868#ifdef META8_OPTION
814 /* set 8-bit on */ 869 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
816 { 871 {
817 unsigned char *ch; 872 char *ch;
818 873
819 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 875 *ch |= 0x80;
821 876
822 meta = 0; 877 meta = 0;
… …
824#endif 879#endif
825 /* nil */ ; 880 /* nil */ ;
826 } 881 }
827 } 882 }
828 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
829 if (len <= 0) 887 if (len <= 0)
830 return; /* not mapped */ 888 return; /* not mapped */
831 889
832 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 891 if (view_start)
834 { 892 {
835 TermWin.view_start = 0; 893 view_start = 0;
836 want_refresh = 1; 894 want_refresh = 1;
837 } 895 }
838 896
839 /* 897 /*
840 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 913#ifdef META8_OPTION
856 && meta_char == C0_ESC 914 && meta_char == C0_ESC
857#endif 915#endif
858 ) 916 )
859 { 917 {
860 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
861 tt_write (&ch, 1); 919 tt_write (&ch, 1);
862 } 920 }
863 921
864#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */
866 unsigned char *p;
867 int i;
868
869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
870 for (i = 0, p = kbuf; i < len; i++, p++)
871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
872 fprintf (stderr, "'\n");
873#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
875} 923}
876/*}}} */
877 924
878#if (MENUBAR_MAX) 925void
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
880/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
881unsigned int 1003unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 1005{
884 unsigned int n, s; 1006 unsigned int n, s;
885 1007
886 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 1028
907 cmd_parse (); 1029 cmd_parse ();
908 1030
909 return 0; 1031 return 0;
910} 1032}
911#endif /* MENUBAR_MAX */ 1033#endif
912 1034
913void 1035void
914rxvt_term::flush () 1036rxvt_term::flush ()
915{ 1037{
916 flush_ev.stop (); 1038 flush_ev.stop ();
… …
924 } 1046 }
925#endif 1047#endif
926 1048
927 if (want_refresh) 1049 if (want_refresh)
928 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
929 scr_refresh (refresh_type); 1089 scr_refresh ();
930 scrollbar_show (1); 1090 scrollbar_show (1);
931#ifdef USE_XIM 1091#ifdef USE_XIM
932 IMSendSpot (); 1092 IMSendSpot ();
933#endif 1093#endif
934 } 1094 }
… …
937} 1097}
938 1098
939void 1099void
940rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
941{ 1101{
942 SET_R (this); 1102 make_current ();
943 SET_LOCALE (locale);
944 1103
945 display->flush (); 1104 display->flush ();
946 1105
947 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1108}
950 1109
951void 1110void
952rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
953{ 1112{
954 SET_R (this); 1113 make_current ();
955 SET_LOCALE (locale);
956 1114
957 refresh_limit = 1; 1115 refresh_limit = 1;
958 refresh_count = 0; 1116 refresh_count = 0;
959 flush (); 1117 flush ();
960} 1118}
… …
964rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
965{ 1123{
966 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1125 want_refresh = 1;
968 1126
969 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
970} 1128}
971#endif 1129#endif
972 1130
973#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
974void 1132void
… …
988rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
989{ 1147{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 { 1150 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1151 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 } 1153 }
997} 1154}
998#endif 1155#endif
… …
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1003{ 1160{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1162 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1164 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 } 1166 }
1011} 1167}
1012#endif 1168#endif
… …
1017{ 1173{
1018 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1177 {
1022 refresh_type |= SMOOTH_REFRESH; 1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1023 want_refresh = 1; 1181 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1183 }
1026} 1184}
1027#endif 1185#endif
1028 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1029bool 1212bool
1030rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1031{ 1214{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1216
1034 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1035 { 1218 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1220 n = 0;
1038 } 1221 }
1039 1222
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1043 1226
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1228
1046 if (n > 0) 1229 if (r > 0)
1047 { 1230 {
1048 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1049 return true; 1232 return true;
1050 } 1233 }
1051 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1052 destroy (); 1246 destroy ();
1053 1247 }
1248
1054 return false; 1249 return false;
1055} 1250}
1056 1251
1057void 1252void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1254{
1060 SET_R (this); 1255 make_current ();
1061 SET_LOCALE (locale);
1062 1256
1063 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1259 while (pty_fill ())
1066 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1071} 1265}
1072 1266
1073void 1267void
1074rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1075{ 1269{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1077 recolour_cursor (); 1271 recolour_cursor ();
1078 1272
1079#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1274 hidden_pointer = 0;
1081 1275
1082 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1278#endif
1085} 1279}
1086 1280
1087#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1088void 1282void
1089rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1090{ 1284{
1091 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1092 return; 1286 return;
1093 1287
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1095 XFlush (display->display); 1289 XFlush (dpy);
1096 1290
1097 hidden_pointer = 1; 1291 hidden_pointer = 1;
1098} 1292}
1099 1293
1100void 1294void
1101rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1102{ 1296{
1103 SET_R (this); 1297 make_current ();
1104 SET_LOCALE (locale);
1105 1298
1106 pointer_blank (); 1299 pointer_blank ();
1107} 1300}
1108#endif 1301#endif
1109 1302
… …
1174 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1175 (32 + x + 1), 1368 (32 + x + 1),
1176 (32 + y + 1)); 1369 (32 + y + 1));
1177} 1370}
1178 1371
1179#ifdef USING_W11LIB
1180void
1181rxvt_W11_process_x_event (XEvent *ev)
1182{
1183 rxvt_t *r = rxvt_get_r ();
1184
1185 x_cb (*ev);
1186}
1187#endif
1188
1189/*{{{ process an X event */ 1372/*{{{ process an X event */
1190void 1373void
1191rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1192{ 1375{
1193 SET_R (this); 1376 make_current ();
1194 SET_LOCALE (locale);
1195 1377
1196#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1198 {
1199 if (hidden_cursor)
1200 {
1201 hidden_cursor = 0;
1202 want_refresh = 1;
1203 }
1204 1379
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
1206 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1207#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1383 return;
1208 1384
1209#if defined(POINTER_BLANK) 1385 // for XQueryPointer
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1211 {
1212 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease)
1215 if (hidden_pointer)
1216 pointer_unblank ();
1217
1218 if (ev.type == KeyPress && hidden_pointer == 0)
1219 pointer_blank ();
1220 }
1221#endif
1222
1223 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1388 unsigned int unused_mask;
1226 1389
1227 switch (ev.type) 1390 switch (ev.type)
1228 { 1391 {
1229 case KeyPress: 1392 case KeyPress:
1230#if ISO_14755 1393 key_press (ev.xkey);
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1233 lookup_key (ev.xkey);
1234
1235 break; 1394 break;
1236 1395
1237 case KeyRelease: 1396 case KeyRelease:
1238 { 1397 key_release (ev.xkey);
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
1298
1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1300 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1303 mouse_slip_wheel_speed = 0;
1304#endif
1305 break; 1398 break;
1306 }
1307 1399
1308 case ButtonPress: 1400 case ButtonPress:
1309 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1310 break; 1402 break;
1311 1403
… …
1313 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1314 break; 1406 break;
1315 1407
1316 case ClientMessage: 1408 case ClientMessage:
1317 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1319 destroy ();
1320#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink))
1326 { 1411 {
1327 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1413 {
1329 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1330 unsigned char *data; 1415 {
1331 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1332 1417 {
1333 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1334 xa[XA_DNDSELECTION], 1419 destroy ();
1335 0L, 1000000L, 1420 }
1336 False, AnyPropertyType, 1421#if ENABLE_EWMH
1337 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1338 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1339 &data); 1425 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1426#endif
1341 XFree (data); 1427 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1428 }
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1344 } 1438 }
1345#endif /* OFFIX_DND */
1346 break; 1439 break;
1347 1440
1348 case MappingNotify: 1441 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1443 break;
… …
1373 break; 1466 break;
1374 } 1467 }
1375 break; 1468 break;
1376 1469
1377 case FocusIn: 1470 case FocusIn:
1378 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1379 { 1486 {
1380 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 { 1488 ;
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400 1489
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1447
1448 if (szHint.width != width || szHint.height != height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1491 {
1450 seen_resize = 1; 1492 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1452 } 1501 }
1453 1502
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1455 if (options & Opt_transparent) 1506 if (option (Opt_transparent))
1456 check_our_parents (); 1507 check_our_parents ();
1457#endif 1508#endif
1458 } 1509 }
1459 break; 1510 break;
1460 1511
1461 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465 1517
1466 break; 1518 break;
1467 1519
1468 case SelectionClear: 1520 case SelectionClear:
1469 selection_clear (); 1521 selection_clear ();
… …
1476 1528
1477 case SelectionRequest: 1529 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1479 break; 1531 break;
1480 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1481 case UnmapNotify: 1541 case UnmapNotify:
1482 TermWin.mapped = 0; 1542 mapped = 0;
1483#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1485#endif 1545#endif
1486 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1487
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break; 1547 break;
1494 1548
1495#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1496 case ReparentNotify: 1550 case ReparentNotify:
1497 rootwin_cb (ev); 1551 rootwin_cb (ev);
1498 break; 1552 break;
1499#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1500 1554
1501 case GraphicsExpose: 1555 case GraphicsExpose:
1502 case Expose: 1556 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1504 { 1558 {
1505 do 1559 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1563
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1565
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1515 1569
1516 scr_refresh (refresh_type); 1570 want_refresh = 1;
1517 } 1571 }
1518 else 1572 else
1519 { 1573 {
1520 XEvent unused_event; 1574 XEvent unused_event;
1521 1575
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1523 ; 1577 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1579 ;
1526 1580
1527 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1528 { 1582 {
1529 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1530 scrollbar_show (0); 1584 scrollbar_show (0);
1531 } 1585 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536 1586
1537#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1540#endif 1590#endif
1541 } 1591 }
1542 break; 1592 break;
1543 1593
1544 case MotionNotify: 1594 case MotionNotify:
1545#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1596 if (hidden_pointer)
1547 pointer_unblank (); 1597 pointer_unblank ();
1548#endif 1598#endif
1549#if MENUBAR
1550 if (isMenuBarWindow (ev.xany.window))
1551 {
1552 menubar_control (ev.xbutton);
1553 break;
1554 }
1555#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1600 break;
1558 1601
1559 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1560 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1608 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1564 ; 1610 ;
1565 1611
1566 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1567 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1616 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1583#endif 1629#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1632
1587#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1636 {
1591 int dist; 1637 int dist;
1592 1638
1593 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1651
1606 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1608 { 1654 {
1609 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1611 } 1657 }
1612 else 1658 else
1613 { 1659 {
1614 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1662 }
1617 1663
1618 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1666 + 1;
1621 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1623 } 1669 }
1624 else 1670 else
1625 { 1671 {
1626 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1635#endif 1681#endif
1636 } 1682 }
1637 } 1683 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1685 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1642 ; 1688 ;
1643 1689
1644 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1694 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1696 scrollbar_size ());
1651 scr_refresh (refresh_type); 1697 want_refresh = 1;
1652 refresh_limit = 0; 1698 refresh_limit = 0;
1653 scrollbar_show (1); 1699 scrollbar_show (1);
1654 } 1700 }
1655 break; 1701 break;
1656 } 1702 }
1657}
1658 1703
1659#if TRANSPARENT 1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1660void 1828void
1661rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1830{
1663 SET_R (this); 1831 make_current ();
1664 SET_LOCALE (locale);
1665 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1666 switch (ev.type) 1838 switch (ev.type)
1667 { 1839 {
1668 case PropertyNotify: 1840 case PropertyNotify:
1669 /* 1841 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1843 * use the property to determine the pixmap. We use it later on.
1672 */ 1844 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1847 return;
1678 1848
1679 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1680 case ReparentNotify: 1850 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1682 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1683 break; 1853 break;
1684 } 1854 }
1855# endif
1685} 1856}
1686#endif 1857#endif
1687 1858
1688void 1859void
1689rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1690{ 1861{
1691 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1692 1863
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1694 if (!bypass_keystate) 1866 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1868
1697 /* 1869 /*
1698 * VT window processing of button press 1870 * VT window processing of button press
1699 */ 1871 */
1700 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1701 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1702#if ISO_14755 1877#if ISO_14755
1703 // 5.4 1878 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1880 {
1706 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1720 { 1895 {
1721 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1722 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1723 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1724 { 1900 {
1725 /* only report double clicks */ 1901 /* only report double clicks */
1726 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1727 mouse_report (ev); 1903 mouse_report (ev);
… …
1753 { 1929 {
1754 case Button1: 1930 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1935#else
1760 selection.rect = false; 1936 selection.rect = false;
1761#endif 1937#endif
1762 1938
1763 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1941 {
1766 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1768 else 1944 else
1769 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1910 case Button3: 2086 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1912 { 2088 {
1913 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1916# else 2092# else
1917 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1918# endif 2094# endif
1919 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1922# else 2098# else
1923 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1924# endif 2100# endif
1925 else 2101 else
1926 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1927 } 2103 }
1928 else 2104 else
1929 { 2105 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2107 (nrow
1932 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2109 / scrollbar_size ()));
1934 } 2110 }
1935 2111
1936 break; 2112 break;
1937 } 2113 }
1938 } 2114 }
2115
1939 return; 2116 return;
1940 } 2117 }
1941#if MENUBAR
1942 /*
1943 * Menubar window processing of button press
1944 */
1945 if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948} 2118}
1949 2119
1950void 2120void
1951rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1952{ 2122{
… …
1958 2128
1959 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1960 { 2130 {
1961 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1962 scrollbar_show (0); 2132 scrollbar_show (0);
1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1964 refresh_type &= ~SMOOTH_REFRESH;
1965#endif
1966 } 2133 }
1967 2134
1968#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1971#endif 2138#endif
1972 2139
1973 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1974 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
1975#if ISO_14755 2145#if ISO_14755
1976 // 5.4 2146 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2148 return;
1979#endif 2149#endif
2150
1980 if (reportmode) 2151 if (reportmode)
1981 { 2152 {
1982 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1983 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1984 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2014 { 2185 {
2015 case Button1: 2186 case Button1:
2016 case Button3: 2187 case Button3:
2017 selection_make (ev.time); 2188 selection_make (ev.time);
2018 break; 2189 break;
2190
2019 case Button2: 2191 case Button2:
2020 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2021 break; 2194 break;
2195
2022#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2023 case Button4: 2197 case Button4:
2024 case Button5: 2198 case Button5:
2025 { 2199 {
2026 int i; 2200 int i;
… …
2028 2202
2029 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2030 2204
2031 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2032 i = 1; 2206 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2208 i = nrow - 1;
2035 else 2209 else
2036 i = 5; 2210 i = 5;
2037 2211
2038# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2040 { 2214 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2218
2045 if (slip_wheel_ev.at < NOW) 2219 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2221
2048 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2049 } 2223 }
2050 else 2224 else
2051 { 2225 {
2052# endif 2226# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2227 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2228 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2066 } 2230 }
2067#endif 2231# endif
2068 } 2232 }
2069 break; 2233 break;
2070#endif 2234#endif
2071 } 2235 }
2072 } 2236 }
2073#ifdef MENUBAR
2074 else if (isMenuBarWindow (ev.window))
2075 menubar_control (ev);
2076#endif
2077} 2237}
2078
2079#ifdef TRANSPARENT
2080#if TINTING
2081/* taken from aterm-0.4.2 */
2082
2083typedef uint32_t RUINT32T;
2084
2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2086{
2087 int sh_r, sh_g, sh_b;
2088 RUINT32T mask_r, mask_g, mask_b;
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
2093
2094 Visual* visual = display->visual;
2095
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097
2098 /* for convenience */
2099 mask_r = visual->red_mask;
2100 mask_g = visual->green_mask;
2101 mask_b = visual->blue_mask;
2102
2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2176 } else {
2177 if (shade < 0) shade = 0;
2178 if (shade > 100) shade = 100;
2179
2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2181
2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2185 }
2186
2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2189 {
2190 unsigned int tmp;
2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2243 }
2244 break;
2245 }
2246 case 16:
2247 {
2248 unsigned short *p1, *pf, *p, *pl;
2249 p1 = (unsigned short *) srcImage->data;
2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2251 while (p1 < pf)
2252 {
2253 p = p1;
2254 pl = p1 + srcImage->width;
2255 for (; p < pl; p++)
2256 {
2257 *p = lookup_r[(*p & 0xf800)>>11] |
2258 lookup_g[(*p & 0x07e0)>> 5] |
2259 lookup_b[(*p & 0x001f)];
2260 }
2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2281 }
2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2289
2290 while (p1 < pf)
2291 {
2292 p = p1;
2293 pl = p1 + srcImage->width;
2294 for (; p < pl; p++)
2295 {
2296 *p = lookup_r[(*p & 0xff0000)>>16] |
2297 lookup_g[(*p & 0x00ff00)>> 8] |
2298 lookup_b[(*p & 0x0000ff)] |
2299 (*p & ~0xffffff);
2300 }
2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2302 }
2303 break;
2304 }
2305 }
2306
2307 free (lookup);
2308}
2309#endif
2310
2311/*
2312 * Check our parents are still who we think they are.
2313 * Do transparency updates if required
2314 */
2315int
2316rxvt_term::check_our_parents ()
2317{
2318 int i, pchanged, aformat, have_pixmap, rootdepth;
2319 unsigned long nitems, bytes_after;
2320 Atom atype;
2321 unsigned char *prop = NULL;
2322 Window root, oldp, *list;
2323 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr;
2325
2326 pchanged = 0;
2327
2328 if (!(options & Opt_transparent))
2329 return pchanged; /* Don't try any more */
2330
2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth;
2333
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2335
2336 if (rootdepth != wattr.depth)
2337 {
2338 if (am_transparent)
2339 {
2340 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0;
2343 }
2344
2345 return pchanged; /* Don't try any more */
2346 }
2347
2348 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False);
2350
2351 /*
2352 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that.
2355 */
2356 i = (xa[XA_XROOTPMAPID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success);
2360
2361 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success);
2366
2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
2372 have_pixmap = 0;
2373 else
2374 {
2375 have_pixmap = 1;
2376 rootpixmap = *(Pixmap *)prop;
2377 XFree (prop);
2378 }
2379
2380 if (have_pixmap)
2381 {
2382 /*
2383 * Copy display->root pixmap transparency
2384 */
2385 int sx, sy, nx, ny;
2386 unsigned int nw, nh;
2387 Window cr;
2388 XImage *image;
2389 GC gc;
2390 XGCValues gcvalue;
2391
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2393 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height;
2396 nx = ny = 0;
2397
2398 if (sx < 0)
2399 {
2400 nw += sx;
2401 nx = -sx;
2402 sx = 0;
2403 }
2404
2405 if (sy < 0)
2406 {
2407 nh += sy;
2408 ny = -sy;
2409 sy = 0;
2410 }
2411
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2416 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */
2421 allowedxerror = 0;
2422
2423 if (image == NULL)
2424 {
2425 if (am_transparent && am_pixmap_trans)
2426 {
2427 pchanged = 1;
2428 if (TermWin.pixmap != None)
2429 {
2430 XFreePixmap (display->display, TermWin.pixmap);
2431 TermWin.pixmap = None;
2432 }
2433 }
2434
2435 am_pixmap_trans = 0;
2436 }
2437 else
2438 {
2439 if (TermWin.pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap);
2441
2442#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint))
2444 {
2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2447
2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2449
2450 ShadeXImage (display, image, shade, rm, gm, bm);
2451 }
2452#endif
2453
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2455 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc);
2460 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]);
2463
2464 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1;
2466
2467 am_transparent = am_pixmap_trans = 1;
2468 }
2469 }
2470
2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2474 {
2475 unsigned int n;
2476 /*
2477 * InheritPixmap transparency
2478 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2480 {
2481 oldp = TermWin.parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n);
2484 XFree (list);
2485
2486 if (TermWin.parent[i] == display->root)
2487 {
2488 if (oldp != None)
2489 pchanged = 1;
2490
2491 break;
2492 }
2493
2494 if (oldp != TermWin.parent[i])
2495 pchanged = 1;
2496 }
2497
2498 n = 0;
2499
2500 if (pchanged)
2501 {
2502 for (; n < (unsigned int)i; n++)
2503 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2508 break;
2509 }
2510 }
2511 }
2512
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2514 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */
2519 }
2520 else
2521 {
2522#if WAIT_FOR_WM
2523 /* wait (an arbitrary period) for the WM to do its thing
2524 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1);
2526#endif
2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2532
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2534 am_transparent = 1;
2535 }
2536
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None;
2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2553 }
2554
2555 return pchanged;
2556}
2557#endif
2558 2238
2559/*}}} */ 2239/*}}} */
2560 2240
2561bool 2241bool
2562rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2563{ 2243{
2564 bool flag = false; 2244 bool flag = false;
2565 unicode_t ch = NOCHAR; 2245 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2246 char *seq_begin; // remember start of esc-sequence here
2567 2247
2568 for (;;) 2248 for (;;)
2569 { 2249 {
2570 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2571 { 2251 {
2572 seq_begin = cmdbuf_ptr; 2252 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2253 ch = next_char ();
2574 }
2575 2254
2576 if (ch == NOCHAR) // TODO: improve 2255 if (ch == NOCHAR)
2577 break; 2256 break;
2257 }
2578 2258
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 { 2260 {
2581 if (!seen_input) 2261 if (!seen_input)
2582 { 2262 {
… …
2586 // some window managers resize the window early, and these programs 2266 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2267 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2268 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2269 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2270 // resized.
2591 if (seen_resize) 2271 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2272 kill (-cmd_pid, SIGWINCH);
2593 } 2273 }
2594 2274
2595 /* Read a text string from the input buffer */ 2275 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2276 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2277 bool refreshnow = false;
2598 int nlines = 0; 2278 int nlines = 0;
2599 unicode_t *str = buf; 2279 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2281
2601 for (;;) 2282 for (;;)
2602 { 2283 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2285 break;
2605 2286
2606 *str++ = ch; 2287 *str++ = ch;
2607 2288
2608 if (ch == C0_LF) 2289 if (ch == C0_LF || str >= eol)
2609 { 2290 {
2291 if (ch == C0_LF)
2610 nlines++; 2292 nlines++;
2293
2611 refresh_count++; 2294 refresh_count++;
2612 2295
2613 if (!(options & Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2298 {
2616 refreshnow = true; 2299 refreshnow = true;
2300 refresh_count = 0;
2617 ch = NOCHAR; 2301 ch = NOCHAR;
2618 break; 2302 break;
2619 } 2303 }
2620 2304
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2306 if (nlines >= nrow - 1)
2623 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2624 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
2625 nlines = 0; 2312 nlines = 0;
2626 str = buf; 2313 str = buf;
2314 eol = str + min (ncol, UBUFSIZ);
2627 } 2315 }
2628 }
2629 2316
2630 if (str >= buf + UBUFSIZ) 2317 if (str >= eol)
2631 { 2318 {
2319 if (eol >= buf + UBUFSIZ)
2320 {
2632 ch = NOCHAR; 2321 ch = NOCHAR;
2633 break; 2322 break;
2323 }
2324 else
2325 eol = min (eol + ncol, buf + UBUFSIZ);
2326 }
2327
2634 } 2328 }
2635 2329
2636 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2331 ch = next_char ();
2638 } 2332 }
2639 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2641 2337
2642 /* 2338 /*
2643 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2644 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck I'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2343 */
2648 if (refreshnow) 2344 if (refreshnow)
2649 { 2345 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++; 2347 refresh_limit++;
2652 else 2348 else
2653 { 2349 {
2654 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2655 scr_refresh (refresh_type); 2352 scr_refresh ();
2353 want_refresh = 1;
2656 } 2354 }
2657 } 2355 }
2658 2356
2659 } 2357 }
2660 else 2358 else
… …
2675 } 2373 }
2676 2374
2677 return flag; 2375 return flag;
2678} 2376}
2679 2377
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2689// read the next character 2378// read the next character
2690unicode_t 2379wchar_t
2691rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2692{ 2381{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2383 {
2695 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2698 2387
2699 wchar_t wc; 2388 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2390
2702 if (len == (size_t)-2) 2391 if (len == (size_t)-2)
2703 { 2392 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2393 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2395 break;
2707 } 2396 }
2708 2397
2709 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2400
2712 // assume wchar == unicode 2401 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2714 return wc; 2403 return wc & UNICODE_MASK;
2715 } 2404 }
2716 2405
2717 return NOCHAR; 2406 return NOCHAR;
2718} 2407}
2408
2409// read the next octet
2410uint32_t
2411rxvt_term::next_octet () NOTHROW
2412{
2413 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR;
2416}
2417
2418static class out_of_input out_of_input;
2719 2419
2720/* rxvt_cmd_getc () - Return next input character */ 2420/* rxvt_cmd_getc () - Return next input character */
2721/* 2421/*
2722 * Return the next input character after first passing any keyboard input 2422 * Return the next input character after first passing any keyboard input
2723 * to the command. 2423 * to the command.
2724 */ 2424 */
2725unicode_t 2425wchar_t
2726rxvt_term::cmd_getc () 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2727{ 2427{
2728 unicode_t c = next_char (); 2428 wchar_t c = next_char ();
2729 2429
2730 if (c == NOCHAR) 2430 if (c == NOCHAR)
2731 throw out_of_input; 2431 throw out_of_input;
2732 2432
2733 return c; 2433 return c;
2734} 2434}
2735 2435
2736unicode_t 2436uint32_t
2737rxvt_term::cmd_get8 () 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2738{ 2438{
2739 unicode_t c = next_octet (); 2439 uint32_t c = next_octet ();
2740 2440
2741 if (c == NOCHAR) 2441 if (c == NOCHAR)
2742 throw out_of_input; 2442 throw out_of_input;
2743 2443
2744 return c; 2444 return c;
… …
2808 { 2508 {
2809 if ((buf[len++] = cmd_getc ()) == 'i') 2509 if ((buf[len++] = cmd_getc ()) == 'i')
2810 break; /* done = 1 */ 2510 break; /* done = 1 */
2811 } 2511 }
2812 } 2512 }
2813 2513
2814 for (i = 0; i < len; i++) 2514 for (i = 0; i < len; i++)
2815 if (putc (buf[i], fd) == EOF) 2515 if (putc (buf[i], fd) == EOF)
2816 { 2516 {
2817 done = 1; 2517 done = 1;
2818 break; 2518 break;
… …
2844 case C0_ESC: 2544 case C0_ESC:
2845 process_escape_seq (); 2545 process_escape_seq ();
2846 break; 2546 break;
2847 case C0_ENQ: /* terminal Status */ 2547 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 2548 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2549 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 2550 else
2852 tt_write ((unsigned char *)VT100_ANS, 2551 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 2552 break;
2855 case C0_BEL: /* bell */ 2553 case C0_BEL: /* bell */
2856 scr_bell (); 2554 scr_bell ();
2857 break; 2555 break;
2858 case C0_BS: /* backspace */ 2556 case C0_BS: /* backspace */
… …
2982 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
2983 break; 2681 break;
2984 case '+': 2682 case '+':
2985 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
2986 break; 2684 break;
2987#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
2988 case '6': 2686 case '6':
2989 scr_backindex (); 2687 scr_backindex ();
2990 break; 2688 break;
2991#endif 2689#endif
2992 case '7': 2690 case '7':
2993 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
2994 break; 2692 break;
2995 case '8': 2693 case '8':
2996 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
2997 break; 2695 break;
2998#if ENABLE_FRILLS 2696#if !ENABLE_MINIMAL
2999 case '9': 2697 case '9':
3000 scr_forwardindex (); 2698 scr_forwardindex ();
3001 break; 2699 break;
3002#endif 2700#endif
3003 case '=': 2701 case '=':
… …
3013 break; 2711 break;
3014 2712
3015 /* 8.3.87: NEXT LINE */ 2713 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 2714 case C1_NEL: /* ESC E */
3017 { 2715 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 2716 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 2718 }
3021 break; 2719 break;
3022 2720
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 2721 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 2722 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 2744 process_dcs_seq ();
3047 break; 2745 break;
3048 2746
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 2748 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 2750 break; /* steal obsolete ESC [ c */
3054 2751
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 2753 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 2754 process_csi_seq ();
… …
3166 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
3167 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
3168 if (arg[p] == -1) 2865 if (arg[p] == -1)
3169 arg[p] = ndef; 2866 arg[p] = ndef;
3170 2867
3171#ifdef DEBUG_CMD
3172 fprintf (stderr, "CSI ");
3173 for (p = 0; p < nargs; p++)
3174 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3175 fprintf (stderr, "%c\n", ch);
3176#endif
3177
3178 /* 2868 /*
3179 * private mode handling 2869 * private mode handling
3180 */ 2870 */
3181 if (priv) 2871 if (priv)
3182 { 2872 {
3183 switch (priv) 2873 switch (priv)
3184 { 2874 {
3185 case '>': 2875 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
2877 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do).
2884 //
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2885 tt_printf ("\033[>%d;94;0c", 'U');
2886 }
3188 break; 2887 break;
3189 case '?': 2888 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 2891 break;
… …
3297 2996
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2997 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 2998 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 2999 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3000 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3001 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3002 break;
3304 3003
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3004 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 3006 break;
3309 3007
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3008 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 3009 process_sgr_mode (nargs, arg);
3312 break; 3010 break;
… …
3319 break; 3017 break;
3320 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3321 scr_report_position (); 3019 scr_report_position ();
3322 break; 3020 break;
3323 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3022 if (option (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3024 break;
3327 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3027 break;
… …
3396 break; 3094 break;
3397 case CSI_75: 3095 case CSI_75:
3398 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3399 break; 3097 break;
3400 3098
3401#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3402 case CSI_74: 3100 case CSI_74:
3403 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3404 break; 3102 break;
3405#endif 3103#endif
3406 3104
… …
3413 break; 3111 break;
3414 } 3112 }
3415} 3113}
3416/*}}} */ 3114/*}}} */
3417 3115
3418#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3419/* ARGSUSED */ 3117/* ARGSUSED */
3420void 3118void
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3120{
3423 int x, y; 3121 int x, y;
3424 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3425 Window wdummy; 3123 Window wdummy;
3124
3125 dLocal (Display *, dpy);
3426 3126
3427 if (nargs == 0) 3127 if (nargs == 0)
3428 return; 3128 return;
3429 3129
3430 switch (args[0]) 3130 switch (args[0])
3431 { 3131 {
3432 /* 3132 /*
3433 * commands 3133 * commands
3434 */ 3134 */
3435 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3136 XMapWindow (dpy, parent[0]);
3437 break; 3137 break;
3438 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3139 XIconifyWindow (dpy, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3140 break;
3442 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3444 break; 3143 break;
3445 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3146 break;
3448 case 5: /* raise window */ 3147 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3450 break; 3149 break;
3451 case 6: /* lower window */ 3150 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3453 break; 3152 break;
3454 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3455 scr_touch (true); 3154 scr_touch (true);
3456 break; 3155 break;
3457 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3157 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3158 (unsigned int) (args[1] * fheight));
3460 break; 3159 break;
3461 3160
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3162 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3164 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3165 (unsigned int) (args[1] * fheight));
3467 break; 3166 break;
3468
3469 3167
3470 /* 3168 /*
3471 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3472 */ 3170 */
3473 case 11: /* report window state */ 3171 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3174 break;
3477 case 13: /* report window position */ 3175 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3181 break;
3484 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3185 break;
3488 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3188 break;
3491 case 19: /* report window size (chars) */ 3189 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3191 break;
3494 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3495 { 3193 {
3496 char *s; 3194 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3197 XFree (s);
3500 } 3198 }
3501 break; 3199 break;
3502 case 21: /* report window title */ 3200 case 21: /* report window title */
3503 { 3201 {
3504 char *s; 3202 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3205 XFree (s);
3508 } 3206 }
3509 break; 3207 break;
3510 } 3208 }
3511} 3209}
… …
3514/*----------------------------------------------------------------------*/ 3212/*----------------------------------------------------------------------*/
3515/* 3213/*
3516 * get input up until STRING TERMINATOR (or BEL) 3214 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3215 * ends_how is terminator used. returned input must be free()'d
3518 */ 3216 */
3519unsigned char * 3217char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3219{
3522 unicode_t ch; 3220 unicode_t ch;
3523 bool seen_esc = false; 3221 bool seen_esc = false;
3524 unsigned int n = 0; 3222 unsigned int n = 0;
… …
3538 seen_esc = true; 3236 seen_esc = true;
3539 continue; 3237 continue;
3540 } 3238 }
3541 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3542 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3543 else if (ch < 0x20) 3243 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3545 3245
3546 seen_esc = false; 3246 seen_esc = false;
3547 3247
3548 if (n >= sizeof (string) - 1) 3248 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3249 // stop at some sane length
3550 return NULL; 3250 return NULL;
3551 3251
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
3555 string[n++] = ch; 3252 string[n++] = ch;
3556 } 3253 }
3557 3254
3558 string[n++] = '\0'; 3255 string[n++] = '\0';
3559 3256
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3258
3562 return (unsigned char *)rxvt_wcstombs (string); 3259 return rxvt_wcstombs (string);
3563} 3260}
3564 3261
3565/*----------------------------------------------------------------------*/ 3262/*----------------------------------------------------------------------*/
3566/* 3263/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3265 */
3569void 3266void
3570rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3571{ 3268{
3572 unsigned char *s; 3269 char *s;
3573 unicode_t eh; 3270 unicode_t eh;
3574 3271
3575 /* 3272 /*
3576 * Not handled yet 3273 * Not handled yet
3577 */ 3274 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3293 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3294 arg = arg * 10 + (ch - '0');
3598 3295
3599 if (ch == ';') 3296 if (ch == ';')
3600 { 3297 {
3601 unsigned char *s = get_to_st (eh); 3298 char *s = get_to_st (eh);
3602 3299
3603 if (s) 3300 if (s)
3604 { 3301 {
3605 process_xterm_seq (arg, (char *)s, eh); 3302 process_xterm_seq (arg, s, eh);
3606 free (s); 3303 free (s);
3607 } 3304 }
3608 } 3305 }
3609} 3306}
3610 3307
3611void 3308void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3310{
3614 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3615 { 3312 {
3616 unsigned short r, g, b; 3313 rgba c;
3617 pix_colors_focused[color].get (display, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3619 } 3322 }
3620 else 3323 else
3621 set_window_color (color, str); 3324 set_window_color (color, str);
3622} 3325}
3623 3326
3624/* 3327/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3329 */
3649void 3330void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3331rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3332{
3652 int changed = 0;
3653 int color; 3333 int color;
3654 char *buf, *name; 3334 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3336 int saveop = op;
3657 3337
3338 dLocal (Display *, dpy);
3339
3658 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3659 switch (op) 3345 switch (op)
3660 { 3346 {
3661 case XTerm_name: 3347 case XTerm_name:
3662 set_title (str); 3348 set_title (str);
3663 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
3677 unsigned long bytes_after; 3363 unsigned long bytes_after;
3678 unsigned char *value = 0; 3364 unsigned char *value = 0;
3679 const char *str = ""; 3365 const char *str = "";
3680 3366
3681 if (prop 3367 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3372 && actual_type != None
3687 && actual_format == 8) 3373 && actual_format == 8)
3688 str = (const char *)(value); 3374 str = (const char *)(value);
3689 3375
3690 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3691 3377
3692 XFree (value); 3378 XFree (value);
3693 } 3379 }
3694 else 3380 else
3695 { 3381 {
… …
3699 { 3385 {
3700 *eq = 0; 3386 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3387 set_utf8_property (display->atom (str), eq + 1);
3702 } 3388 }
3703 else 3389 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3390 XDeleteProperty (dpy, parent[0],
3705 display->atom (str)); 3391 display->atom (str));
3706 } 3392 }
3707 break; 3393 break;
3708 3394
3709 case XTerm_Color: 3395 case XTerm_Color:
… …
3711 { 3397 {
3712 if ((name = strchr (buf, ';')) == NULL) 3398 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3399 break;
3714 3400
3715 *name++ = '\0'; 3401 *name++ = '\0';
3716 color = atoi (buf); 3402 color = atoi (buf) + minCOLOR;
3717 3403
3718 if (color < 0 || color >= TOTAL_COLORS) 3404 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3405 break;
3720 3406
3721 if ((buf = strchr (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3408 *buf++ = '\0';
3723 3409
3724 if (name[0] == '?' && !name[1]) 3410 process_color_seq (op, color, name, resp);
3725 {
3726 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 }
3730 else
3731 set_window_color (color + minCOLOR, name);
3732 } 3411 }
3733 break; 3412 break;
3734 case XTerm_Color00: 3413 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3736 break; 3415 break;
3737 case XTerm_Color01: 3416 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3739 break; 3418 break;
3740#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3743 break; 3422 break;
3744#endif 3423#endif
3745 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3746 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3747 break; 3426 break;
3748 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3750 break; 3429 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break;
3761 case XTerm_Color_RV: 3431 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp);
3437 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp);
3441 break;
3442 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp);
3763 break; 3444 break;
3764#endif 3445#endif
3765#if TRANSPARENT && TINTING 3446#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3447 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3448 process_color_seq (op, Color_tint, str, resp);
3449
3768 check_our_parents (); 3450 check_our_parents ();
3451
3769 if (am_transparent) 3452 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3453 want_full_refresh = want_refresh = 1;
3771 break;
3772#endif
3773 3454
3455 break;
3456#endif
3457
3774 case XTerm_Pixmap: 3458 case Rxvt_Pixmap:
3459 {
3775 if (*str != ';') 3460 if (*str != ';')
3776 { 3461 {
3777#if XPM_BACKGROUND 3462#if XPM_BACKGROUND
3778 scale_pixmap (""); /* reset to default scaling */ 3463 scale_pixmap (""); /* reset to default scaling */
3779 set_bgPixmap (str); /* change pixmap */ 3464 set_bgPixmap (str); /* change pixmap */
3780#endif
3781 scr_touch (true); 3465 scr_touch (true);
3466#endif
3782 } 3467 }
3468
3469 int changed = 0;
3470
3783 while ((str = strchr (str, ';')) != NULL) 3471 while ((str = strchr (str, ';')) != NULL)
3784 { 3472 {
3785 str++; 3473 str++;
3786#if XPM_BACKGROUND 3474#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3475 changed += scale_pixmap (str);
3788#endif 3476#endif
3789
3790 } 3477 }
3478
3791 if (changed) 3479 if (changed)
3792 { 3480 {
3793#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3482 resize_pixmap ();
3795#endif
3796 scr_touch (true); 3483 scr_touch (true);
3484#endif
3797 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3798 break; 3491 break;
3799 3492
3800 case XTerm_restoreFG: 3493 case Rxvt_restoreFG:
3801 set_window_color (Color_fg, str); 3494 set_window_color (Color_fg, str);
3802 break; 3495 break;
3803 case XTerm_restoreBG: 3496 case Rxvt_restoreBG:
3804 set_window_color (Color_bg, str); 3497 set_window_color (Color_bg, str);
3805 break; 3498 break;
3806 3499
3807 case XTerm_logfile: 3500 case XTerm_logfile:
3808 // TODO, when secure mode? 3501 // TODO, when secure mode?
3809 break; 3502 break;
3810 3503
3504#if 0
3505 case Rxvt_dumpscreen: /* no error notices */
3506 {
3507 int fd;
3508 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3509 {
3510 scr_dump (fd);
3511 close (fd);
3512 }
3513 }
3514 break;
3515#endif
3811 case XTerm_font: 3516 case XTerm_font:
3812 op = URxvt_font; 3517 op = URxvt_font;
3813 case URxvt_font: 3518 case URxvt_font:
3814#if ENABLE_STYLES 3519#if ENABLE_STYLES
3815 case URxvt_boldFont: 3520 case URxvt_boldFont:
3816 case URxvt_italicFont: 3521 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3522 case URxvt_boldItalicFont:
3818#endif 3523#endif
3819 if (query) 3524 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3525 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3526 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3527 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3528 resp);
3824 else 3529 else
3825 { 3530 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3531 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3532
… …
3829 allocated.push_back ((void *)res); 3534 allocated.push_back ((void *)res);
3830 set_fonts (); 3535 set_fonts ();
3831 } 3536 }
3832 break; 3537 break;
3833 3538
3834#if ENABLE_FRILLS 3539 case URxvt_version:
3835 case XTerm_locale:
3836 if (query) 3540 if (query)
3541 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3542 op,
3543 rs[Rs_name], VERSION[0], VERSION[2],
3544 resp);
3545 break;
3546
3547#if !ENABLE_MINIMAL
3548 case URxvt_locale:
3549 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3550 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3838 else 3551 else
3839 { 3552 {
3840 set_locale (str); 3553 set_locale (str);
3841# ifdef USE_XIM 3554 pty->set_utf8_mode (enc_utf8);
3842 im_cb (); 3555 init_xlocale ();
3843# endif
3844 } 3556 }
3845 break; 3557 break;
3846#endif
3847 3558
3848#ifdef MENUBAR 3559 case URxvt_view_up:
3849 case XTerm_Menu: 3560 case URxvt_view_down:
3850 if (options & Opt_insecure) 3561 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3562 int lines = atoi (str);
3563
3564 if (lines)
3565 scr_page (op == URxvt_view_up ? UP : DN, lines);
3566 else
3567 scr_erase_savelines ();
3568 }
3569
3852 break; 3570 break;
3853#endif 3571#endif
3854#if 0 3572
3855 case XTerm_dumpscreen: /* no error notices */ 3573#if ENABLE_PERL
3856 { 3574 case URxvt_perl:
3857 int fd; 3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3576 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 3577 break;
3865#endif 3578#endif
3866 } 3579 }
3867} 3580}
3868/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
3899 return state; 3612 return state;
3900} 3613}
3901 3614
3902/* we're not using priv _yet_ */ 3615/* we're not using priv _yet_ */
3903void 3616void
3904rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3617rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3905{ 3618{
3906 unsigned int i, j; 3619 unsigned int i, j;
3907 int state; 3620 int state;
3908 3621
3909 static const struct 3622 static const struct
… …
3920 { 5, PrivMode_rVideo }, 3633 { 5, PrivMode_rVideo },
3921 { 6, PrivMode_relOrigin }, 3634 { 6, PrivMode_relOrigin },
3922 { 7, PrivMode_Autowrap }, 3635 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode 3636 // 8, bi-directional support mode
3924 { 9, PrivMode_MouseX10 }, 3637 { 9, PrivMode_MouseX10 },
3925#ifdef menuBar_esc
3926 { menuBar_esc, PrivMode_menuBar },
3927#endif
3928 // 18, 19 printing-related 3638 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor },
3930#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3931 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3932#endif 3642#endif
… …
3977 } 3687 }
3978 3688
3979 /* extra handling for values with state unkept */ 3689 /* extra handling for values with state unkept */
3980 switch (arg[i]) 3690 switch (arg[i])
3981 { 3691 {
3692#if ENABLE_STYLES
3693 case 1021:
3694 set_option (Opt_intensityStyles, mode);
3695
3696 scr_touch (true);
3697 break;
3698#endif
3982 case 1048: /* alternative cursor save */ 3699 case 1048: /* alternative cursor save */
3983 case 1049: 3700 case 1049:
3984 if (options & Opt_secondaryScreen) 3701 if (option (Opt_secondaryScreen))
3985 if (mode == 0) 3702 if (mode == 0)
3986 scr_cursor (RESTORE); 3703 scr_cursor (RESTORE);
3987 else if (mode == 1) 3704 else if (mode == 1)
3988 scr_cursor (SAVE); 3705 scr_cursor (SAVE);
3989 break; 3706 break;
… …
4001 */ 3718 */
4002 PrivMode (1, PrivMode_vt52); 3719 PrivMode (1, PrivMode_vt52);
4003 break; 3720 break;
4004 case 3: /* 80/132 */ 3721 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 3722 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3723 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 3724 break;
4008 case 4: /* smooth scrolling */ 3725 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 3726 set_option (Opt_jumpScroll, !state);
4013 break; 3727 break;
4014 case 5: /* reverse video */ 3728 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 3729 scr_rvideo_mode (state);
4016 break; 3730 break;
4017 case 6: /* relative/absolute origins */ 3731 case 6: /* relative/absolute origins */
… …
4023 /* case 8: - auto repeat, can't do on a per window basis */ 3737 /* case 8: - auto repeat, can't do on a per window basis */
4024 case 9: /* X10 mouse reporting */ 3738 case 9: /* X10 mouse reporting */
4025 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
4026 priv_modes &= ~PrivMode_MouseX11; 3740 priv_modes &= ~PrivMode_MouseX11;
4027 break; 3741 break;
4028#ifdef menuBar_esc
4029 case menuBar_esc:
4030#ifdef MENUBAR
4031 map_menuBar (state);
4032#endif
4033 break;
4034#endif
4035#ifdef scrollBar_esc 3742#ifdef scrollBar_esc
4036 case scrollBar_esc: 3743 case scrollBar_esc:
4037 if (scrollbar_mapping (state)) 3744 if (scrollbar_mapping (state))
4038 { 3745 {
4039 resize_all_windows (0, 0, 0); 3746 resize_all_windows (0, 0, 0);
… …
4058#if 0 3765#if 0
4059 case 1001: 3766 case 1001:
4060 break; /* X11 mouse highlighting */ 3767 break; /* X11 mouse highlighting */
4061#endif 3768#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 3770 set_option (Opt_scrollTtyOutput, !state);
4067 break; 3771 break;
4068 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 3773 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 3774 break;
4074 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 3776 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 3778 scr_erase_screen (2);
4078 scr_change_screen (state); 3779 scr_change_screen (state);
4079 break; 3780 break;
4080 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 3782 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 3783 if (option (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 3784 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 3785 scr_erase_screen (2);
4085 break; 3786 break;
4086 default: 3787 default:
4087 break; 3788 break;
… …
4215 scr_color (Color_bg, Color_bg); 3916 scr_color (Color_bg, Color_bg);
4216 break; 3917 break;
4217 3918
4218 //case 50: // not variable spacing 3919 //case 50: // not variable spacing
4219 3920
4220#ifndef NO_BRIGHTCOLOR 3921#if !ENABLE_MINIMAL
4221 case 90: 3922 case 90:
4222 case 91: /* set bright fg color */ 3923 case 91: /* set bright fg color */
4223 case 92: 3924 case 92:
4224 case 93: 3925 case 93:
4225 case 94: 3926 case 94:
… …
4237 case 106: 3938 case 106:
4238 case 107: 3939 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3940 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 3941 break;
4241#endif 3942#endif
4242
4243 } 3943 }
4244 } 3944 }
4245} 3945}
4246/*}}} */ 3946/*}}} */
4247 3947
… …
4271 */ 3971 */
4272void 3972void
4273rxvt_term::tt_printf (const char *fmt,...) 3973rxvt_term::tt_printf (const char *fmt,...)
4274{ 3974{
4275 va_list arg_ptr; 3975 va_list arg_ptr;
4276 unsigned char buf[256]; 3976 char buf[256];
4277 3977
4278 va_start (arg_ptr, fmt); 3978 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3979 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 3980 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 3981 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 3986 * or generated by us in response to a query ESC sequence.
4287 */ 3987 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 3989
4290void 3990void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3991rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 3992{
3993 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3994 return;
3995
3996 if (pty->pty < 0)
3997 return;
3998
4293 if (v_buflen == 0) 3999 if (v_buflen == 0)
4294 { 4000 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4001 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4296 4002
4297 if ((unsigned int)written == len) 4003 if ((unsigned int)written == len)
4298 return; 4004 return;
4299 4005
4300 data += written; 4006 data += written;
4301 len -= written; 4007 len -= written;
4302 } 4008 }
4303 4009
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4011
4306 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4013 v_buflen += len;
4308 4014
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4015 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310} 4016}
4311 4017
4312void rxvt_term::pty_write () 4018void rxvt_term::pty_write ()
4313{ 4019{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315 4021
4316 if (written > 0) 4022 if (written > 0)
4317 { 4023 {
4318 v_buflen -= written; 4024 v_buflen -= written;
4319 4025
… …
4328 } 4034 }
4329 4035
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4036 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4037 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4039 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4040}
4336 4041
4337/*----------------------- end-of-file (C source) -----------------------*/ 4042/*----------------------- end-of-file (C source) -----------------------*/
4338 4043

Diff Legend

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