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.345 by sasha, Mon Aug 13 22:41:34 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 {
… …
459# endif 519# endif
460 return; 520 return;
461 } 521 }
462 else 522 else
463 { 523 {
464# if ENABLE_OVERLAY 524# if ISO_14755
465 scr_overlay_off (); 525 scr_overlay_off ();
466# endif 526# endif
467 iso14755buf = 0; 527 iso14755buf = 0;
468 } 528 }
469 } 529 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
473 { 533 {
474 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY 535# if ISO_14755
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_Insert
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 ISO_14755
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 ISO_14755
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 ();
917 1039
918#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
919 if (want_full_refresh) 1041 if (want_full_refresh)
920 { 1042 {
921 want_full_refresh = 0; 1043 want_full_refresh = 0;
922 scr_clear (); 1044 scr_clear ();
923 scr_touch (false); 1045 scr_touch (false);
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;
958 refresh_count = 0; 1115 refresh_count = 0;
959 flush (); 1116 flush ();
960} 1117}
961 1118
962#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
964rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
965{ 1122{
966 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1124 want_refresh = 1;
968 1125
969 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
970} 1127}
971#endif 1128#endif
972 1129
973#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
974void 1131void
… …
988rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
989{ 1146{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 { 1149 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1150 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 } 1152 }
997} 1153}
998#endif 1154#endif
… …
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1003{ 1159{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1161 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1163 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 } 1165 }
1011} 1166}
1012#endif 1167#endif
… …
1017{ 1172{
1018 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1176 {
1022 refresh_type |= SMOOTH_REFRESH; 1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1023 want_refresh = 1; 1180 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1182 }
1026} 1183}
1027#endif 1184#endif
1028 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
1029bool 1211bool
1030rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1031{ 1213{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1215
1034 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1035 { 1217 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0; 1219 n = 0;
1038 } 1220 }
1039 1221
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1043 1225
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1227
1046 if (n > 0) 1228 if (r > 0)
1047 { 1229 {
1048 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
1049 return true; 1231 return true;
1050 } 1232 }
1051 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
1052 destroy (); 1245 destroy ();
1053 1246 }
1247
1054 return false; 1248 return false;
1055} 1249}
1056 1250
1057void 1251void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1253{
1060 SET_R (this); 1254 make_current ();
1061 SET_LOCALE (locale);
1062 1255
1063 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1258 while (pty_fill ())
1066 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1071} 1264}
1072 1265
1073void 1266void
1074rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1075{ 1268{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1077 recolour_cursor (); 1270 recolour_cursor ();
1078 1271
1079#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1273 hidden_pointer = 0;
1081 1274
1082 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1277#endif
1085} 1278}
1086 1279
1087#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1088void 1281void
1089rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1090{ 1283{
1091 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1092 return; 1285 return;
1093 1286
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1095 XFlush (display->display); 1288 XFlush (dpy);
1096 1289
1097 hidden_pointer = 1; 1290 hidden_pointer = 1;
1098} 1291}
1099 1292
1100void 1293void
1101rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1102{ 1295{
1103 SET_R (this); 1296 make_current ();
1104 SET_LOCALE (locale);
1105 1297
1106 pointer_blank (); 1298 pointer_blank ();
1107} 1299}
1108#endif 1300#endif
1109 1301
… …
1174 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1175 (32 + x + 1), 1367 (32 + x + 1),
1176 (32 + y + 1)); 1368 (32 + y + 1));
1177} 1369}
1178 1370
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 */ 1371/*{{{ process an X event */
1190void 1372void
1191rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1192{ 1374{
1193 SET_R (this); 1375 make_current ();
1194 SET_LOCALE (locale);
1195 1376
1196#if defined(CURSOR_BLINK) 1377 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 1378
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
1206 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1207#endif 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1382 return;
1208 1383
1209#if defined(POINTER_BLANK) 1384 // 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; 1385 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1387 unsigned int unused_mask;
1226 1388
1227 switch (ev.type) 1389 switch (ev.type)
1228 { 1390 {
1229 case KeyPress: 1391 case KeyPress:
1230#if ISO_14755 1392 key_press (ev.xkey);
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1233 lookup_key (ev.xkey);
1234
1235 break; 1393 break;
1236 1394
1237 case KeyRelease: 1395 case KeyRelease:
1238 { 1396 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; 1397 break;
1306 }
1307 1398
1308 case ButtonPress: 1399 case ButtonPress:
1309 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1310 break; 1401 break;
1311 1402
… …
1313 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1314 break; 1405 break;
1315 1406
1316 case ClientMessage: 1407 case ClientMessage:
1317 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1327 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1412 {
1329 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1330 unsigned char *data; 1414 {
1331 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1332 1416 {
1333 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1334 xa[XA_DNDSELECTION], 1418 destroy ();
1335 0L, 1000000L, 1419 }
1336 False, AnyPropertyType, 1420#if ENABLE_EWMH
1337 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1338 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1339 &data); 1424 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1425#endif
1341 XFree (data); 1426 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1427 }
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1344 } 1437 }
1345#endif /* OFFIX_DND */
1346 break;
1347
1348 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1438 break;
1351 1439
1352 /* 1440 /*
1353 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1354 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1373 break; 1461 break;
1374 } 1462 }
1375 break; 1463 break;
1376 1464
1377 case FocusIn: 1465 case FocusIn:
1378 if (!TermWin.focus) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1469 focus_in ();
1470 break;
1471
1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1476 focus_out ();
1477 break;
1478
1479 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0])
1379 { 1481 {
1380 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 { 1483 ;
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 1484
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) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1486 {
1450 seen_resize = 1; 1487 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render ();
1494 scr_touch (true);
1495 }
1496#endif
1452 } 1497 }
1453 1498
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1455 if (options & Opt_transparent) 1502 if (option (Opt_transparent))
1456 check_our_parents (); 1503 bgPixmap.render ();
1457#endif 1504#endif
1458 } 1505 }
1459 break; 1506 break;
1460 1507
1461 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465 1513
1466 break; 1514 break;
1467 1515
1468 case SelectionClear: 1516 case SelectionClear:
1469 selection_clear (); 1517 selection_clear ();
… …
1476 1524
1477 case SelectionRequest: 1525 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1479 break; 1527 break;
1480 1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break;
1536
1481 case UnmapNotify: 1537 case UnmapNotify:
1482 TermWin.mapped = 0; 1538 mapped = 0;
1483#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1485#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1486 break; 1543 break;
1487 1544
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break;
1494
1495#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1496 case ReparentNotify: 1546 case ReparentNotify:
1497 rootwin_cb (ev); 1547 rootwin_cb (ev);
1498 break; 1548 break;
1499#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1500 1550
1501 case GraphicsExpose: 1551 case GraphicsExpose:
1502 case Expose: 1552 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == vt)
1504 { 1554 {
1505 do 1555 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1559
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1561
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1515 1565
1516 scr_refresh (refresh_type); 1566 want_refresh = 1;
1517 } 1567 }
1518 else 1568 else
1519 { 1569 {
1520 XEvent unused_event; 1570 XEvent unused_event;
1521 1571
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1523 ; 1573 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1575 ;
1526 1576
1527 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1528 { 1578 {
1529 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1530 scrollbar_show (0); 1580 scrollbar_show (0);
1531 } 1581 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1541 } 1582 }
1542 break; 1583 break;
1543 1584
1544 case MotionNotify: 1585 case MotionNotify:
1545#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1587 if (hidden_pointer)
1547 pointer_unblank (); 1588 pointer_unblank ();
1548#endif 1589#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) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1591 break;
1558 1592
1559 if (ev.xany.window == TermWin.vt) 1593 if (ev.xany.window == vt)
1560 { 1594 {
1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1597 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1599 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1564 ; 1601 ;
1565 1602
1566 XQueryPointer (display->display, TermWin.vt, 1603 XQueryPointer (dpy, vt,
1567 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1607 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1583#endif 1620#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1621 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1622 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1623
1587#ifdef SELECTION_SCROLLING 1624#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1625 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1626 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1627 {
1591 int dist; 1628 int dist;
1592 1629
1593 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1640 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1641 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1642
1606 /* calc number of lines to scroll */ 1643 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1644 if (ev.xbutton.y < int_bwidth)
1608 { 1645 {
1609 scroll_selection_dir = UP; 1646 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1647 dist = int_bwidth - ev.xbutton.y;
1611 } 1648 }
1612 else 1649 else
1613 { 1650 {
1614 scroll_selection_dir = DN; 1651 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1652 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1653 }
1617 1654
1618 scroll_selection_lines = Pixel2Height (dist) 1655 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1656 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1657 + 1;
1621 MIN_IT (scroll_selection_lines, 1658 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1659 SELECTION_SCROLL_MAX_LINES);
1623 } 1660 }
1624 else 1661 else
1625 { 1662 {
1626 /* we are within the text window, so we 1663 /* we are within the text window, so we
… …
1635#endif 1672#endif
1636 } 1673 }
1637 } 1674 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1676 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1642 ; 1679 ;
1643 1680
1644 XQueryPointer (display->display, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1685 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1687 scrollbar_size ());
1651 scr_refresh (refresh_type);
1652 refresh_limit = 0; 1688 want_refresh = 1;
1653 scrollbar_show (1); 1689 scrollbar_show (1);
1654 } 1690 }
1655 break; 1691 break;
1656 } 1692 }
1657}
1658 1693
1659#if TRANSPARENT 1694#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1696 {
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1704 }
1705#endif
1706
1707#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 {
1710 if (ev.type == MotionNotify
1711 || ev.type == ButtonPress
1712 || ev.type == ButtonRelease)
1713 if (hidden_pointer)
1714 pointer_unblank ();
1715
1716 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank ();
1718 }
1719#endif
1720}
1721
1722void
1723rxvt_term::focus_in ()
1724{
1725 if (!focus)
1726 {
1727 focus = 1;
1728 want_refresh = 1;
1729
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM
1733 if (Input_Context != NULL)
1734 {
1735 IMSetPosition ();
1736 XSetICFocus (Input_Context);
1737 }
1738#endif
1739#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1742#endif
1743#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade])
1745 {
1746 pix_colors = pix_colors_focused;
1747 scr_recolour ();
1748 }
1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 XWMHints *h;
1754
1755 h = XGetWMHints(dpy, parent[0]);
1756 if (h != NULL)
1757 {
1758 h->flags &= ~XUrgencyHint;
1759 XSetWMHints(dpy, parent[0], h);
1760 }
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ISO_14755
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1802}
1803
1804void
1805rxvt_term::update_fade_color (unsigned int idx)
1806{
1807#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade])
1809 {
1810 rgba c;
1811 pix_colors [Color_fade].get (c);
1812 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1813 }
1814#endif
1815}
1816
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL
1660void 1818void
1661rxvt_term::rootwin_cb (XEvent &ev) 1819rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1820{
1663 SET_R (this); 1821 make_current ();
1664 SET_LOCALE (locale);
1665 1822
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825 return;
1826
1827# if ENABLE_TRANSPARENCY
1666 switch (ev.type) 1828 switch (ev.type)
1667 { 1829 {
1668 case PropertyNotify: 1830 case PropertyNotify:
1669 /* 1831 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1832 * 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. 1833 * use the property to determine the pixmap. We use it later on.
1672 */ 1834 */
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]) 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1677 return; 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1678 1837 {
1679 /* FALLTHROUGH */ 1838 bgPixmap.set_root_pixmap ();
1680 case ReparentNotify: 1839 bgPixmap.render ();
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1840 }
1682 want_refresh = want_full_refresh = 1;
1683 break; 1841 break;
1684 } 1842 }
1843# endif
1685} 1844}
1686#endif 1845#endif
1687 1846
1688void 1847void
1689rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1690{ 1849{
1691 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1692 1851
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1694 if (!bypass_keystate) 1854 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1856
1697 /* 1857 /*
1698 * VT window processing of button press 1858 * VT window processing of button press
1699 */ 1859 */
1700 if (ev.window == TermWin.vt) 1860 if (ev.window == vt)
1701 { 1861 {
1862 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1863 return;
1864
1702#if ISO_14755 1865#if ISO_14755
1703 // 5.4 1866 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1868 {
1706 iso14755_54 (ev.x, ev.y); 1869 iso14755_54 (ev.x, ev.y);
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1881#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1882 if (ev.button == MEvent.button && clickintime)
1720 { 1883 {
1721 /* same button, within alloted time */ 1884 /* same button, within alloted time */
1722 MEvent.clicks++; 1885 MEvent.clicks++;
1886
1723 if (MEvent.clicks > 1) 1887 if (MEvent.clicks > 1)
1724 { 1888 {
1725 /* only report double clicks */ 1889 /* only report double clicks */
1726 MEvent.clicks = 2; 1890 MEvent.clicks = 2;
1727 mouse_report (ev); 1891 mouse_report (ev);
… …
1753 { 1917 {
1754 case Button1: 1918 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1919 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1920 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1921#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1922 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1923#else
1760 selection.rect = false; 1924 selection.rect = false;
1761#endif 1925#endif
1762 1926
1763 /* allow shift+left click to extend selection */ 1927 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1928 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1929 {
1766 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1768 else 1932 else
1769 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
… …
1910 case Button3: 2074 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2075 if (scrollBar.style != R_SB_XTERM)
1912 { 2076 {
1913 if (scrollbar_above_slider (ev.y)) 2077 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2078# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2079 scr_page (UP, nrow - 1);
1916# else 2080# else
1917 scr_page (UP, TermWin.nrow / 4); 2081 scr_page (UP, nrow / 4);
1918# endif 2082# endif
1919 else if (scrollbar_below_slider (ev.y)) 2083 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2084# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2085 scr_page (DN, nrow - 1);
1922# else 2086# else
1923 scr_page (DN, TermWin.nrow / 4); 2087 scr_page (DN, nrow / 4);
1924# endif 2088# endif
1925 else 2089 else
1926 scrollBar.setMotion (); 2090 scrollBar.setMotion ();
1927 } 2091 }
1928 else 2092 else
1929 { 2093 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2094 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2095 (nrow
1932 * scrollbar_position (ev.y) 2096 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2097 / scrollbar_size ()));
1934 } 2098 }
1935 2099
1936 break; 2100 break;
1937 } 2101 }
1938 } 2102 }
2103
1939 return; 2104 return;
1940 } 2105 }
1941#if MENUBAR
1942 /*
1943 * Menubar window processing of button press
1944 */
1945 if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948} 2106}
1949 2107
1950void 2108void
1951rxvt_term::button_release (XButtonEvent &ev) 2109rxvt_term::button_release (XButtonEvent &ev)
1952{ 2110{
… …
1958 2116
1959 if (scrollbar_isUpDn ()) 2117 if (scrollbar_isUpDn ())
1960 { 2118 {
1961 scrollBar.setIdle (); 2119 scrollBar.setIdle ();
1962 scrollbar_show (0); 2120 scrollbar_show (0);
1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1964 refresh_type &= ~SMOOTH_REFRESH;
1965#endif
1966 } 2121 }
1967 2122
1968#ifdef SELECTION_SCROLLING 2123#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2124 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2125 sel_scroll_ev.stop();
1971#endif 2126#endif
1972 2127
1973 if (ev.window == TermWin.vt) 2128 if (ev.window == vt)
1974 { 2129 {
2130 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2131 return;
2132
1975#if ISO_14755 2133#if ISO_14755
1976 // 5.4 2134 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2135 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2136 return;
1979#endif 2137#endif
2138
1980 if (reportmode) 2139 if (reportmode)
1981 { 2140 {
1982 /* mouse report from vt window */ 2141 /* mouse report from vt window */
1983 /* don't report release of wheel "buttons" */ 2142 /* don't report release of wheel "buttons" */
1984 if (ev.button >= 4) 2143 if (ev.button >= 4)
… …
2014 { 2173 {
2015 case Button1: 2174 case Button1:
2016 case Button3: 2175 case Button3:
2017 selection_make (ev.time); 2176 selection_make (ev.time);
2018 break; 2177 break;
2178
2019 case Button2: 2179 case Button2:
2020 selection_request (ev.time, ev.x, ev.y); 2180 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2181 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2021 break; 2182 break;
2183
2022#ifdef MOUSE_WHEEL 2184#ifdef MOUSE_WHEEL
2023 case Button4: 2185 case Button4:
2024 case Button5: 2186 case Button5:
2025 { 2187 {
2026 int i; 2188 int i;
… …
2028 2190
2029 v = ev.button == Button4 ? UP : DN; 2191 v = ev.button == Button4 ? UP : DN;
2030 2192
2031 if (ev.state & ShiftMask) 2193 if (ev.state & ShiftMask)
2032 i = 1; 2194 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2195 else if (option (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2196 i = nrow - 1;
2035 else 2197 else
2036 i = 5; 2198 i = 5;
2037 2199
2038# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2201 if (ev.state & ControlMask)
2040 { 2202 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2203 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2204 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; 2205 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2206
2045 if (slip_wheel_ev.at < NOW) 2207 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2208 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2209
2048 slip_wheel_ev.start (); 2210 slip_wheel_ev.start ();
2049 } 2211 }
2050 else 2212 else
2051 { 2213 {
2052# endif 2214# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2215 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2216 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 2217# ifdef MOUSE_SLIP_WHEELING
2066 } 2218 }
2067#endif 2219# endif
2068 } 2220 }
2069 break; 2221 break;
2070#endif 2222#endif
2071 } 2223 }
2072 } 2224 }
2073#ifdef MENUBAR
2074 else if (isMenuBarWindow (ev.window))
2075 menubar_control (ev);
2076#endif
2077} 2225}
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 2226
2559/*}}} */ 2227/*}}} */
2560 2228
2561bool 2229bool
2562rxvt_term::cmd_parse () 2230rxvt_term::cmd_parse ()
2563{ 2231{
2564 bool flag = false; 2232 bool flag = false;
2565 unicode_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2567 2235
2568 for (;;) 2236 for (;;)
2569 { 2237 {
2570 if (ch == NOCHAR) 2238 if (ch == NOCHAR)
2571 { 2239 {
2572 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2241 ch = next_char ();
2574 }
2575 2242
2576 if (ch == NOCHAR) // TODO: improve 2243 if (ch == NOCHAR)
2577 break; 2244 break;
2245 }
2578 2246
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 { 2248 {
2581 if (!seen_input) 2249 if (!seen_input)
2582 { 2250 {
… …
2586 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2255 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2256 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2257 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2258 // resized.
2591 if (seen_resize) 2259 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2260 kill (-cmd_pid, SIGWINCH);
2593 } 2261 }
2594 2262
2595 /* Read a text string from the input buffer */ 2263 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2264 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2265 bool refreshnow = false;
2598 int nlines = 0; 2266 int nlines = 0;
2599 unicode_t *str = buf; 2267 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2269
2601 for (;;) 2270 for (;;)
2602 { 2271 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2273 break;
2605 2274
2606 *str++ = ch; 2275 *str++ = ch;
2607 2276
2608 if (ch == C0_LF) 2277 if (ch == C0_LF || str >= eol)
2609 { 2278 {
2279 if (ch == C0_LF)
2610 nlines++; 2280 nlines++;
2281
2611 refresh_count++; 2282 refresh_count++;
2612 2283
2613 if (!(options & Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2615 { 2285 {
2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2289 {
2616 refreshnow = true; 2290 refreshnow = true;
2617 ch = NOCHAR; 2291 ch = NOCHAR;
2618 break; 2292 break;
2293 }
2619 } 2294 }
2620 2295
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2297 if (nlines >= nrow - 1)
2623 { 2298 {
2299 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2300 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2624 scr_add_lines (buf, nlines, str - buf); 2301 scr_add_lines (buf, str - buf, nlines);
2302
2625 nlines = 0; 2303 nlines = 0;
2626 str = buf; 2304 str = buf;
2305 eol = str + min (ncol, UBUFSIZ);
2627 } 2306 }
2628 }
2629 2307
2630 if (str >= buf + UBUFSIZ) 2308 if (str >= eol)
2631 { 2309 {
2310 if (eol >= buf + UBUFSIZ)
2311 {
2632 ch = NOCHAR; 2312 ch = NOCHAR;
2633 break; 2313 break;
2314 }
2315 else
2316 eol = min (eol + ncol, buf + UBUFSIZ);
2317 }
2318
2634 } 2319 }
2635 2320
2636 seq_begin = cmdbuf_ptr; 2321 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2322 ch = next_char ();
2638 } 2323 }
2639 2324
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2327 scr_add_lines (buf, str - buf, nlines);
2641 2328
2642 /* 2329 /*
2643 * If there have been a lot of new lines, then update the screen 2330 * 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. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which 2332 * if skipScroll is enabled.
2646 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2333 */
2648 if (refreshnow) 2334 if (refreshnow)
2649 { 2335 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++;
2652 else
2653 {
2654 flag = true; 2336 flag = true;
2655 scr_refresh (refresh_type); 2337 scr_refresh ();
2656 } 2338 want_refresh = 1;
2657 } 2339 }
2658 2340
2659 } 2341 }
2660 else 2342 else
2661 { 2343 {
… …
2675 } 2357 }
2676 2358
2677 return flag; 2359 return flag;
2678} 2360}
2679 2361
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 2362// read the next character
2690unicode_t 2363wchar_t
2691rxvt_term::next_char () 2364rxvt_term::next_char () NOTHROW
2692{ 2365{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2367 {
2695 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2698 2371
2699 wchar_t wc; 2372 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2374
2702 if (len == (size_t)-2) 2375 if (len == (size_t)-2)
2703 { 2376 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2377 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2379 break;
2707 } 2380 }
2708 2381
2709 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2383 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2384
2712 // assume wchar == unicode 2385 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2714 return wc; 2387 return wc & UNICODE_MASK;
2715 } 2388 }
2716 2389
2717 return NOCHAR; 2390 return NOCHAR;
2718} 2391}
2392
2393// read the next octet
2394uint32_t
2395rxvt_term::next_octet () NOTHROW
2396{
2397 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR;
2400}
2401
2402static class out_of_input out_of_input;
2719 2403
2720/* rxvt_cmd_getc () - Return next input character */ 2404/* rxvt_cmd_getc () - Return next input character */
2721/* 2405/*
2722 * Return the next input character after first passing any keyboard input 2406 * Return the next input character after first passing any keyboard input
2723 * to the command. 2407 * to the command.
2724 */ 2408 */
2725unicode_t 2409wchar_t
2726rxvt_term::cmd_getc () 2410rxvt_term::cmd_getc () THROW ((class out_of_input))
2727{ 2411{
2728 unicode_t c = next_char (); 2412 wchar_t c = next_char ();
2729 2413
2730 if (c == NOCHAR) 2414 if (c == NOCHAR)
2731 throw out_of_input; 2415 throw out_of_input;
2732 2416
2733 return c; 2417 return c;
2734} 2418}
2735 2419
2736unicode_t 2420uint32_t
2737rxvt_term::cmd_get8 () 2421rxvt_term::cmd_get8 () THROW ((class out_of_input))
2738{ 2422{
2739 unicode_t c = next_octet (); 2423 uint32_t c = next_octet ();
2740 2424
2741 if (c == NOCHAR) 2425 if (c == NOCHAR)
2742 throw out_of_input; 2426 throw out_of_input;
2743 2427
2744 return c; 2428 return c;
… …
2808 { 2492 {
2809 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2810 break; /* done = 1 */ 2494 break; /* done = 1 */
2811 } 2495 }
2812 } 2496 }
2813 2497
2814 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2815 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2816 { 2500 {
2817 done = 1; 2501 done = 1;
2818 break; 2502 break;
… …
2844 case C0_ESC: 2528 case C0_ESC:
2845 process_escape_seq (); 2529 process_escape_seq ();
2846 break; 2530 break;
2847 case C0_ENQ: /* terminal Status */ 2531 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 2532 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2533 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 2534 else
2852 tt_write ((unsigned char *)VT100_ANS, 2535 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 2536 break;
2855 case C0_BEL: /* bell */ 2537 case C0_BEL: /* bell */
2856 scr_bell (); 2538 scr_bell ();
2857 break; 2539 break;
2858 case C0_BS: /* backspace */ 2540 case C0_BS: /* backspace */
… …
2882 process_dcs_seq (); 2564 process_dcs_seq ();
2883 break; 2565 break;
2884 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2885 process_csi_seq (); 2567 process_csi_seq ();
2886 break; 2568 break;
2887 case 0x9d: /* CSI */ 2569 case 0x9d: /* OSC */
2888 process_osc_seq (); 2570 process_osc_seq ();
2889 break; 2571 break;
2890#endif 2572#endif
2891 } 2573 }
2892} 2574}
… …
2982 scr_charset_set (2, (unsigned int)cmd_getc ()); 2664 scr_charset_set (2, (unsigned int)cmd_getc ());
2983 break; 2665 break;
2984 case '+': 2666 case '+':
2985 scr_charset_set (3, (unsigned int)cmd_getc ()); 2667 scr_charset_set (3, (unsigned int)cmd_getc ());
2986 break; 2668 break;
2987#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
2988 case '6': 2670 case '6':
2989 scr_backindex (); 2671 scr_backindex ();
2990 break; 2672 break;
2991#endif 2673#endif
2992 case '7': 2674 case '7':
2993 scr_cursor (SAVE); 2675 scr_cursor (SAVE);
2994 break; 2676 break;
2995 case '8': 2677 case '8':
2996 scr_cursor (RESTORE); 2678 scr_cursor (RESTORE);
2997 break; 2679 break;
2998#if ENABLE_FRILLS 2680#if !ENABLE_MINIMAL
2999 case '9': 2681 case '9':
3000 scr_forwardindex (); 2682 scr_forwardindex ();
3001 break; 2683 break;
3002#endif 2684#endif
3003 case '=': 2685 case '=':
… …
3013 break; 2695 break;
3014 2696
3015 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
3017 { 2699 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 2701 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 2702 }
3021 break; 2703 break;
3022 2704
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 2728 process_dcs_seq ();
3047 break; 2729 break;
3048 2730
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2731 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 2732 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 2733 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 2734 break; /* steal obsolete ESC [ c */
3054 2735
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2736 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 2737 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 2738 process_csi_seq ();
… …
3121 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3122 unsigned int nargs, p; 2803 unsigned int nargs, p;
3123 int n, ndef; 2804 int n, ndef;
3124 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS];
3125 2806
3126 for (nargs = ESC_ARGS; nargs > 0;) 2807 memset (arg, 0, sizeof (arg));
3127 arg[--nargs] = 0; 2808 nargs = 0;
3128 2809
3129 priv = 0; 2810 priv = 0;
3130 ch = cmd_getc (); 2811 ch = cmd_getc ();
3131 if (ch >= '<' && ch <= '?') 2812 if (ch >= '<' && ch <= '?')
3132 { /* '<' '=' '>' '?' */ 2813 { /* '<' '=' '>' '?' */
… …
3166 ndef = get_byte_array_bit (csi_defaults, i); 2847 ndef = get_byte_array_bit (csi_defaults, i);
3167 for (p = 0; p < nargs; p++) 2848 for (p = 0; p < nargs; p++)
3168 if (arg[p] == -1) 2849 if (arg[p] == -1)
3169 arg[p] = ndef; 2850 arg[p] = ndef;
3170 2851
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 /* 2852 /*
3179 * private mode handling 2853 * private mode handling
3180 */ 2854 */
3181 if (priv) 2855 if (priv)
3182 { 2856 {
3183 switch (priv) 2857 switch (priv)
3184 { 2858 {
3185 case '>': 2859 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 2860 if (ch == CSI_DA) /* secondary device attributes */
2861 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2867 // that we do not support xterm mouse reporting (should be 95 when we do).
2868 //
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2869 tt_printf ("\033[>%d;94;0c", 'U');
2870 }
3188 break; 2871 break;
3189 case '?': 2872 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 2875 break;
… …
3297 2980
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2981 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 2982 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 2983 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2984 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2985 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 2986 break;
3304 2987
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2988 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 2989 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 2990 break;
3309 2991
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2992 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 2993 process_sgr_mode (nargs, arg);
3312 break; 2994 break;
… …
3319 break; 3001 break;
3320 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
3321 scr_report_position (); 3003 scr_report_position ();
3322 break; 3004 break;
3323 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3006 if (option (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3008 break;
3327 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3011 break;
… …
3396 break; 3078 break;
3397 case CSI_75: 3079 case CSI_75:
3398 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3399 break; 3081 break;
3400 3082
3401#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3402 case CSI_74: 3084 case CSI_74:
3403 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
3404 break; 3086 break;
3405#endif 3087#endif
3406 3088
… …
3413 break; 3095 break;
3414 } 3096 }
3415} 3097}
3416/*}}} */ 3098/*}}} */
3417 3099
3418#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3419/* ARGSUSED */ 3101/* ARGSUSED */
3420void 3102void
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3104{
3423 int x, y; 3105 int x, y;
3424 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
3425 Window wdummy; 3107 Window wdummy;
3108
3109 dLocal (Display *, dpy);
3426 3110
3427 if (nargs == 0) 3111 if (nargs == 0)
3428 return; 3112 return;
3429 3113
3430 switch (args[0]) 3114 switch (args[0])
3431 { 3115 {
3432 /* 3116 /*
3433 * commands 3117 * commands
3434 */ 3118 */
3435 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (dpy, parent[0]);
3437 break; 3121 break;
3438 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (dpy, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3124 break;
3442 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent[0], args[1], args[2]);
3444 break; 3127 break;
3445 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3130 break;
3448 case 5: /* raise window */ 3131 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3132 XRaiseWindow (dpy, parent[0]);
3450 break; 3133 break;
3451 case 6: /* lower window */ 3134 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3135 XLowerWindow (dpy, parent[0]);
3453 break; 3136 break;
3454 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3455 scr_touch (true); 3138 scr_touch (true);
3456 break; 3139 break;
3457 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3141 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3142 (unsigned int) (args[1] * fheight));
3460 break; 3143 break;
3461 3144
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3145 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3146 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3148 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3149 (unsigned int) (args[1] * fheight));
3467 break; 3150 break;
3468
3469 3151
3470 /* 3152 /*
3471 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3472 */ 3154 */
3473 case 11: /* report window state */ 3155 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3158 break;
3477 case 13: /* report window position */ 3159 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3165 break;
3484 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3169 break;
3488 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3172 break;
3491 case 19: /* report window size (chars) */ 3173 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3175 break;
3494 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3495 { 3177 {
3496 char *s; 3178 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3179 XGetIconName (dpy, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3181 XFree (s);
3500 } 3182 }
3501 break; 3183 break;
3502 case 21: /* report window title */ 3184 case 21: /* report window title */
3503 { 3185 {
3504 char *s; 3186 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3187 XFetchName (dpy, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3189 XFree (s);
3508 } 3190 }
3509 break; 3191 break;
3510 } 3192 }
3511} 3193}
… …
3514/*----------------------------------------------------------------------*/ 3196/*----------------------------------------------------------------------*/
3515/* 3197/*
3516 * get input up until STRING TERMINATOR (or BEL) 3198 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3199 * ends_how is terminator used. returned input must be free()'d
3518 */ 3200 */
3519unsigned char * 3201char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3202rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3203{
3522 unicode_t ch; 3204 unicode_t ch;
3523 bool seen_esc = false; 3205 bool seen_esc = false;
3524 unsigned int n = 0; 3206 unsigned int n = 0;
… …
3538 seen_esc = true; 3220 seen_esc = true;
3539 continue; 3221 continue;
3540 } 3222 }
3541 else if (ch == C0_BEL || ch == CHAR_ST) 3223 else if (ch == C0_BEL || ch == CHAR_ST)
3542 break; 3224 break;
3225 else if (ch == C0_SYN)
3226 ch = cmd_get8 ();
3543 else if (ch < 0x20) 3227 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
3545 3229
3546 seen_esc = false; 3230 seen_esc = false;
3547 3231
3548 if (n >= sizeof (string) - 1) 3232 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3233 // stop at some sane length
3550 return NULL; 3234 return NULL;
3551 3235
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
3555 string[n++] = ch; 3236 string[n++] = ch;
3556 } 3237 }
3557 3238
3558 string[n++] = '\0'; 3239 string[n++] = '\0';
3559 3240
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3242
3562 return (unsigned char *)rxvt_wcstombs (string); 3243 return rxvt_wcstombs (string);
3563} 3244}
3564 3245
3565/*----------------------------------------------------------------------*/ 3246/*----------------------------------------------------------------------*/
3566/* 3247/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3249 */
3569void 3250void
3570rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3571{ 3252{
3572 unsigned char *s; 3253 char *s;
3573 unicode_t eh; 3254 unicode_t eh;
3574 3255
3575 /* 3256 /*
3576 * Not handled yet 3257 * Not handled yet
3577 */ 3258 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3598 3279
3599 if (ch == ';') 3280 if (ch == ';')
3600 { 3281 {
3601 unsigned char *s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3602 3283
3603 if (s) 3284 if (s)
3604 { 3285 {
3605 process_xterm_seq (arg, (char *)s, eh); 3286 process_xterm_seq (arg, s, eh);
3606 free (s); 3287 free (s);
3607 } 3288 }
3608 } 3289 }
3609} 3290}
3610 3291
3611void 3292void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3293rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3294{
3614 if (str[0] == '?' && !str[1]) 3295 if (str[0] == '?' && !str[1])
3615 { 3296 {
3616 unsigned short r, g, b; 3297 rgba c;
3617 pix_colors_focused[color].get (display, r, g, b); 3298 pix_colors_focused[color].get (c);
3299
3300#if XFT
3301 if (c.a != rgba::MAX_CC)
3302 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3303 else
3304#endif
3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3305 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3619 } 3306 }
3620 else 3307 else
3621 set_window_color (color, str); 3308 set_window_color (color, str);
3622} 3309}
3623 3310
3624/* 3311/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * 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 */ 3313 */
3649void 3314void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3315rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3316{
3652 int changed = 0;
3653 int color; 3317 int color;
3654 char *buf, *name; 3318 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3319 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3320 int saveop = op;
3657 3321
3322 dLocal (Display *, dpy);
3323
3658 assert (str != NULL); 3324 assert (str != NULL);
3325
3326 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3327 return;
3328
3659 switch (op) 3329 switch (op)
3660 { 3330 {
3661 case XTerm_name: 3331 case XTerm_name:
3662 set_title (str); 3332 set_title (str);
3663 /* FALLTHROUGH */ 3333 /* FALLTHROUGH */
… …
3677 unsigned long bytes_after; 3347 unsigned long bytes_after;
3678 unsigned char *value = 0; 3348 unsigned char *value = 0;
3679 const char *str = ""; 3349 const char *str = "";
3680 3350
3681 if (prop 3351 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3352 && XGetWindowProperty (dpy, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3353 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3354 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3355 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3356 && actual_type != None
3687 && actual_format == 8) 3357 && actual_format == 8)
3688 str = (const char *)(value); 3358 str = (const char *)(value);
3689 3359
3690 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3360 tt_printf ("\033]%d;%s%c", op, str, resp);
3691 3361
3692 XFree (value); 3362 XFree (value);
3693 } 3363 }
3694 else 3364 else
3695 { 3365 {
… …
3699 { 3369 {
3700 *eq = 0; 3370 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3371 set_utf8_property (display->atom (str), eq + 1);
3702 } 3372 }
3703 else 3373 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3374 XDeleteProperty (dpy, parent[0],
3705 display->atom (str)); 3375 display->atom (str));
3706 } 3376 }
3707 break; 3377 break;
3708 3378
3709 case XTerm_Color: 3379 case XTerm_Color:
… …
3711 { 3381 {
3712 if ((name = strchr (buf, ';')) == NULL) 3382 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3383 break;
3714 3384
3715 *name++ = '\0'; 3385 *name++ = '\0';
3716 color = atoi (buf); 3386 color = atoi (buf) + minCOLOR;
3717 3387
3718 if (color < 0 || color >= TOTAL_COLORS) 3388 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3389 break;
3720 3390
3721 if ((buf = strchr (name, ';')) != NULL) 3391 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3392 *buf++ = '\0';
3723 3393
3724 if (name[0] == '?' && !name[1]) 3394 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 } 3395 }
3733 break; 3396 break;
3734 case XTerm_Color00: 3397 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
3736 break; 3399 break;
3737 case XTerm_Color01: 3400 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3401 process_color_seq (op, Color_bg, str, resp);
3739 break; 3402 break;
3740#ifndef NO_CURSORCOLOR 3403#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3404 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3405 process_color_seq (op, Color_cursor, str, resp);
3743 break; 3406 break;
3744#endif 3407#endif
3745 case XTerm_Color_pointer_fg: 3408 case XTerm_Color_pointer_fg:
3746 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3409 process_color_seq (op, Color_pointer_fg, str, resp);
3747 break; 3410 break;
3748 case XTerm_Color_pointer_bg: 3411 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3412 process_color_seq (op, Color_pointer_bg, str, resp);
3750 break; 3413 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#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: 3415 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3416 process_color_seq (op, Color_RV, str, resp);
3763 break; 3417 break;
3418 case Rxvt_Color_BD:
3419 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp);
3421 break;
3422 case Rxvt_Color_UL:
3423 case URxvt_Color_UL:
3424 process_color_seq (op, Color_UL, str, resp);
3425 break;
3426 case URxvt_Color_IT:
3427 process_color_seq (op, Color_IT, str, resp);
3428 break;
3764#endif 3429#endif
3765#if TRANSPARENT && TINTING 3430#if ENABLE_TRANSPARENCY
3766 case XTerm_Color_tint: 3431 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3432 process_color_seq (op, Color_tint, str, resp);
3768 check_our_parents (); 3433 {
3769 if (am_transparent) 3434 bool changed = false;
3770 want_full_refresh = want_refresh = 1; 3435 if (ISSET_PIXCOLOR (Color_tint))
3771 break; 3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3772#endif 3437 else
3438 changed = bgPixmap.unset_tint ();
3439 if (changed)
3440 bgPixmap.render ();
3441 }
3773 3442
3443 break;
3444#endif
3445
3446#if XPM_BACKGROUND
3774 case XTerm_Pixmap: 3447 case Rxvt_Pixmap:
3775 if (*str != ';') 3448 if (!strcmp (str, "?"))
3776 { 3449 {
3777#if XPM_BACKGROUND 3450 char str[256];
3778 scale_pixmap (""); /* reset to default scaling */ 3451
3779 set_bgPixmap (str); /* change pixmap */ 3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3780#endif 3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3781 scr_touch (true); 3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3455 process_xterm_seq (XTerm_title, str, CHAR_ST);
3782 } 3456 }
3783 while ((str = strchr (str, ';')) != NULL) 3457 else
3784 { 3458 {
3459 int changed = 0;
3460
3461 if (*str != ';')
3462 {
3463 /* reset to default scaling :*/
3464 bgPixmap.unset_geometry ();
3465 if (bgPixmap.set_file (str)) /* change pixmap */
3466 changed++;
3467 str = strchr (str, ';');
3468 if (str == NULL)
3469 bgPixmap.set_defaultGeometry ();
3470 }
3471 while (str)
3472 {
3785 str++; 3473 str++;
3786#if XPM_BACKGROUND 3474 if (bgPixmap.set_geometry (str))
3787 changed += scale_pixmap (str); 3475 changed++;
3788#endif 3476 str = strchr (str, ';');
3789 3477 }
3478 if (changed)
3479 {
3480 bgPixmap.render ();
3481 scr_touch (true);
3482 }
3790 } 3483 }
3791 if (changed)
3792 {
3793#ifdef XPM_BACKGROUND
3794 resize_pixmap ();
3795#endif
3796 scr_touch (true);
3797 }
3798 break; 3484 break;
3485#endif
3799 3486
3800 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3801 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3802 break; 3489 break;
3803 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3804 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3805 break; 3492 break;
3806 3493
3807 case XTerm_logfile: 3494 case XTerm_logfile:
3808 // TODO, when secure mode? 3495 // TODO, when secure mode?
3809 break; 3496 break;
3810 3497
3498#if 0
3499 case Rxvt_dumpscreen: /* no error notices */
3500 {
3501 int fd;
3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3503 {
3504 scr_dump (fd);
3505 close (fd);
3506 }
3507 }
3508 break;
3509#endif
3811 case XTerm_font: 3510 case XTerm_font:
3812 op = URxvt_font; 3511 op = URxvt_font;
3813 case URxvt_font: 3512 case URxvt_font:
3814#if ENABLE_STYLES 3513#if ENABLE_STYLES
3815 case URxvt_boldFont: 3514 case URxvt_boldFont:
3816 case URxvt_italicFont: 3515 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3818#endif 3517#endif
3819 if (query) 3518 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3522 resp);
3824 else 3523 else
3825 { 3524 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3526
… …
3829 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3830 set_fonts (); 3529 set_fonts ();
3831 } 3530 }
3832 break; 3531 break;
3833 3532
3834#if ENABLE_FRILLS 3533 case URxvt_version:
3835 case XTerm_locale:
3836 if (query) 3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3542 case URxvt_locale:
3543 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3838 else 3545 else
3839 { 3546 {
3840 set_locale (str); 3547 set_locale (str);
3841# ifdef USE_XIM 3548 pty->set_utf8_mode (enc_utf8);
3842 im_cb (); 3549 init_xlocale ();
3843# endif
3844 } 3550 }
3845 break; 3551 break;
3846#endif
3847 3552
3848#ifdef MENUBAR 3553 case URxvt_view_up:
3849 case XTerm_Menu: 3554 case URxvt_view_down:
3850 if (options & Opt_insecure) 3555 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3556 int lines = atoi (str);
3557
3558 if (lines)
3559 scr_page (op == URxvt_view_up ? UP : DN, lines);
3560 else
3561 scr_erase_savelines ();
3562 }
3563
3852 break; 3564 break;
3853#endif 3565#endif
3854#if 0 3566
3855 case XTerm_dumpscreen: /* no error notices */ 3567#if ENABLE_PERL
3856 { 3568 case URxvt_perl:
3857 int fd; 3569 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) 3570 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 3571 break;
3865#endif 3572#endif
3866 } 3573 }
3867} 3574}
3868/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
… …
3899 return state; 3606 return state;
3900} 3607}
3901 3608
3902/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
3903void 3610void
3904rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3905{ 3612{
3906 unsigned int i, j; 3613 unsigned int i, j;
3907 int state; 3614 int state;
3908 3615
3909 static const struct 3616 static const struct
3910 { 3617 {
3911 const int argval; 3618 const int argval;
3912 const unsigned long bit; 3619 const unsigned long bit;
3913 }
3914
3915 argtopriv[] = { 3620 } argtopriv[] = {
3916 { 1, PrivMode_aplCUR }, 3621 { 1, PrivMode_aplCUR },
3917 { 2, PrivMode_vt52 }, 3622 { 2, PrivMode_vt52 },
3918 { 3, PrivMode_132 }, 3623 { 3, PrivMode_132 },
3919 { 4, PrivMode_smoothScroll }, 3624 { 4, PrivMode_smoothScroll },
3920 { 5, PrivMode_rVideo }, 3625 { 5, PrivMode_rVideo },
3921 { 6, PrivMode_relOrigin }, 3626 { 6, PrivMode_relOrigin },
3922 { 7, PrivMode_Autowrap }, 3627 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode 3628 // 8, bi-directional support mode
3924 { 9, PrivMode_MouseX10 }, 3629 { 9, PrivMode_MouseX10 },
3925#ifdef menuBar_esc
3926 { menuBar_esc, PrivMode_menuBar },
3927#endif
3928 // 18, 19 printing-related 3630 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor },
3930#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3931 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3932#endif 3634#endif
… …
3977 } 3679 }
3978 3680
3979 /* extra handling for values with state unkept */ 3681 /* extra handling for values with state unkept */
3980 switch (arg[i]) 3682 switch (arg[i])
3981 { 3683 {
3684#if ENABLE_STYLES
3685 case 1021:
3686 set_option (Opt_intensityStyles, mode);
3687
3688 scr_touch (true);
3689 break;
3690#endif
3982 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3983 case 1049: 3692 case 1049:
3984 if (options & Opt_secondaryScreen) 3693 if (option (Opt_secondaryScreen))
3985 if (mode == 0) 3694 if (mode == 0)
3986 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
3987 else if (mode == 1) 3696 else if (mode == 1)
3988 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
3989 break; 3698 break;
… …
4001 */ 3710 */
4002 PrivMode (1, PrivMode_vt52); 3711 PrivMode (1, PrivMode_vt52);
4003 break; 3712 break;
4004 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3715 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 3716 break;
4008 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 3718 set_option (Opt_jumpScroll, !state);
4013 break; 3719 break;
4014 case 5: /* reverse video */ 3720 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 3721 scr_rvideo_mode (state);
4016 break; 3722 break;
4017 case 6: /* relative/absolute origins */ 3723 case 6: /* relative/absolute origins */
… …
4023 /* case 8: - auto repeat, can't do on a per window basis */ 3729 /* case 8: - auto repeat, can't do on a per window basis */
4024 case 9: /* X10 mouse reporting */ 3730 case 9: /* X10 mouse reporting */
4025 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
4026 priv_modes &= ~PrivMode_MouseX11; 3732 priv_modes &= ~PrivMode_MouseX11;
4027 break; 3733 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 3734#ifdef scrollBar_esc
4036 case scrollBar_esc: 3735 case scrollBar_esc:
4037 if (scrollbar_mapping (state)) 3736 if (scrollbar_mapping (state))
4038 { 3737 {
4039 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
… …
4058#if 0 3757#if 0
4059 case 1001: 3758 case 1001:
4060 break; /* X11 mouse highlighting */ 3759 break; /* X11 mouse highlighting */
4061#endif 3760#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 3761 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 3762 set_option (Opt_scrollTtyOutput, !state);
4067 break; 3763 break;
4068 case 1011: /* scroll to bottom on key press */ 3764 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 3765 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 3766 break;
4074 case 1047: /* secondary screen w/ clearing last */ 3767 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 3768 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 3770 scr_erase_screen (2);
4078 scr_change_screen (state); 3771 scr_change_screen (state);
4079 break; 3772 break;
4080 case 1049: /* secondary screen w/ clearing first */ 3773 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 3774 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 3775 if (option (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 3776 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 3777 scr_erase_screen (2);
4085 break; 3778 break;
4086 default: 3779 default:
4087 break; 3780 break;
… …
4215 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4216 break; 3909 break;
4217 3910
4218 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4219 3912
4220#ifndef NO_BRIGHTCOLOR 3913#if !ENABLE_MINIMAL
4221 case 90: 3914 case 90:
4222 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4223 case 92: 3916 case 92:
4224 case 93: 3917 case 93:
4225 case 94: 3918 case 94:
… …
4237 case 106: 3930 case 106:
4238 case 107: 3931 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3932 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 3933 break;
4241#endif 3934#endif
4242
4243 } 3935 }
4244 } 3936 }
4245} 3937}
4246/*}}} */ 3938/*}}} */
4247 3939
… …
4271 */ 3963 */
4272void 3964void
4273rxvt_term::tt_printf (const char *fmt,...) 3965rxvt_term::tt_printf (const char *fmt,...)
4274{ 3966{
4275 va_list arg_ptr; 3967 va_list arg_ptr;
4276 unsigned char buf[256]; 3968 char buf[256];
4277 3969
4278 va_start (arg_ptr, fmt); 3970 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3971 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 3972 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 3973 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 3978 * or generated by us in response to a query ESC sequence.
4287 */ 3979 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 3981
4290void 3982void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3983rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 3984{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3986 return;
3987
3988 if (pty->pty < 0)
3989 return;
3990
4293 if (v_buflen == 0) 3991 if (v_buflen == 0)
4294 { 3992 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4296 3994
4297 if ((unsigned int)written == len) 3995 if ((unsigned int)written == len)
4298 return; 3996 return;
4299 3997
4300 data += written; 3998 data += written;
4301 len -= written; 3999 len -= written;
4302 } 4000 }
4303 4001
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4003
4306 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4005 v_buflen += len;
4308 4006
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4007 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310} 4008}
4311 4009
4312void rxvt_term::pty_write () 4010void rxvt_term::pty_write ()
4313{ 4011{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315 4013
4316 if (written > 0) 4014 if (written > 0)
4317 { 4015 {
4318 v_buflen -= written; 4016 v_buflen -= written;
4319 4017
… …
4328 } 4026 }
4329 4027
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4029 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4031 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4032}
4336 4033
4337/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4338 4035

Diff Legend

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