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.176 by root, Mon Dec 13 01:29:03 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_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1258 while (pty_fill ())
1068 if (cmd_parse ()) 1259 if (cmd_parse ())
1069 break; 1260 break;
1261
1262 if (revents & EVENT_WRITE)
1263 pty_write ();
1070} 1264}
1071 1265
1072void 1266void
1073rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1074{ 1268{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1076 recolour_cursor (); 1270 recolour_cursor ();
1077 1271
1078#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1273 hidden_pointer = 0;
1080 1274
1081 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif 1277#endif
1084} 1278}
1085 1279
1086#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1087void 1281void
1088rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1089{ 1283{
1090 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1091 return; 1285 return;
1092 1286
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1094 XFlush (display->display); 1288 XFlush (dpy);
1095 1289
1096 hidden_pointer = 1; 1290 hidden_pointer = 1;
1097} 1291}
1098 1292
1099void 1293void
1100rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1101{ 1295{
1102 SET_R (this); 1296 make_current ();
1103 SET_LOCALE (locale);
1104 1297
1105 pointer_blank (); 1298 pointer_blank ();
1106} 1299}
1107#endif 1300#endif
1108 1301
… …
1173 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1174 (32 + x + 1), 1367 (32 + x + 1),
1175 (32 + y + 1)); 1368 (32 + y + 1));
1176} 1369}
1177 1370
1178#ifdef USING_W11LIB
1179void
1180rxvt_W11_process_x_event (XEvent *ev)
1181{
1182 rxvt_t *r = rxvt_get_r ();
1183
1184 x_cb (*ev);
1185}
1186#endif
1187
1188/*{{{ process an X event */ 1371/*{{{ process an X event */
1189void 1372void
1190rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1191{ 1374{
1192 SET_R (this); 1375 make_current ();
1193 SET_LOCALE (locale);
1194 1376
1195#if defined(CURSOR_BLINK) 1377 dLocal (Display *, dpy);
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1197 {
1198 if (hidden_cursor)
1199 {
1200 hidden_cursor = 0;
1201 want_refresh = 1;
1202 }
1203 1378
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
1205 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1206#endif 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1382 return;
1207 1383
1208#if defined(POINTER_BLANK) 1384 // for XQueryPointer
1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1210 {
1211 if (ev.type == MotionNotify
1212 || ev.type == ButtonPress
1213 || ev.type == ButtonRelease)
1214 if (hidden_pointer)
1215 pointer_unblank ();
1216
1217 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank ();
1219 }
1220#endif
1221
1222 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1387 unsigned int unused_mask;
1225 1388
1226 switch (ev.type) 1389 switch (ev.type)
1227 { 1390 {
1228 case KeyPress: 1391 case KeyPress:
1229#if ISO_14755 1392 key_press (ev.xkey);
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1232 lookup_key (ev.xkey);
1233
1234 break; 1393 break;
1235 1394
1236 case KeyRelease: 1395 case KeyRelease:
1237 { 1396 key_release (ev.xkey);
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1297
1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1302 mouse_slip_wheel_speed = 0;
1303#endif
1304 break; 1397 break;
1305 }
1306 1398
1307 case ButtonPress: 1399 case ButtonPress:
1308 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1309 break; 1401 break;
1310 1402
… …
1312 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1313 break; 1405 break;
1314 1406
1315 case ClientMessage: 1407 case ClientMessage:
1316 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1318 destroy ();
1319#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink))
1325 { 1410 {
1326 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1327 Atom ActualType; 1412 {
1328 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1329 unsigned char *data; 1414 {
1330 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1331 1416 {
1332 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1333 xa[XA_DNDSELECTION], 1418 destroy ();
1334 0L, 1000000L, 1419 }
1335 False, AnyPropertyType, 1420#if ENABLE_EWMH
1336 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1337 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1338 &data); 1424 &ev);
1339 set_string_property (XA_CUT_BUFFER0, data); 1425#endif
1340 XFree (data); 1426 }
1341 selection_paste (display->root, XA_CUT_BUFFER0, true); 1427 }
1342 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
1343 } 1437 }
1344#endif /* OFFIX_DND */
1345 break;
1346
1347 case MappingNotify:
1348 XRefreshKeyboardMapping (&ev.xmapping);
1349 break; 1438 break;
1350 1439
1351 /* 1440 /*
1352 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1353 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1372 break; 1461 break;
1373 } 1462 }
1374 break; 1463 break;
1375 1464
1376 case FocusIn: 1465 case FocusIn:
1377 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])
1378 { 1481 {
1379 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1380 want_refresh = 1;
1381#ifdef USE_XIM
1382 if (Input_Context != NULL)
1383 { 1483 ;
1384 IMSetStatusPosition ();
1385 XSetICFocus (Input_Context);
1386 }
1387#endif
1388#ifdef CURSOR_BLINK
1389 if (options & Opt_cursorBlink)
1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1398#endif
1399 1484
1400 }
1401 break;
1402
1403 case FocusOut:
1404 if (TermWin.focus)
1405 {
1406 TermWin.focus = 0;
1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1415#ifdef USE_XIM
1416 if (Input_Context != NULL)
1417 XUnsetICFocus (Input_Context);
1418#endif
1419#ifdef CURSOR_BLINK
1420 if (options & Opt_cursorBlink)
1421 cursor_blink_ev.stop ();
1422 hidden_cursor = 0;
1423#endif
1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1431 }
1432 break;
1433
1434 case ConfigureNotify:
1435 if (ev.xconfigure.window == TermWin.parent[0])
1436 {
1437 int height, width;
1438
1439 do
1440 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1446
1447 if (szHint.width != width || szHint.height != height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448 { 1486 {
1449 seen_resize = 1; 1487 seen_resize = 1;
1450 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
1451 } 1497 }
1452 1498
1453#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
1454 if (options & Opt_transparent) 1502 if (option (Opt_transparent))
1455 check_our_parents (); 1503 bgPixmap.render ();
1456#endif 1504#endif
1457 } 1505 }
1458 break; 1506 break;
1459 1507
1460 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464 1513
1465 break; 1514 break;
1466 1515
1467 case SelectionClear: 1516 case SelectionClear:
1468 selection_clear (); 1517 selection_clear ();
… …
1475 1524
1476 case SelectionRequest: 1525 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1478 break; 1527 break;
1479 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
1480 case UnmapNotify: 1537 case UnmapNotify:
1481 TermWin.mapped = 0; 1538 mapped = 0;
1482#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1483 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1484#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1485 break; 1543 break;
1486 1544
1487 case MapNotify:
1488 TermWin.mapped = 1;
1489#ifdef TEXT_BLINK
1490 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1491#endif
1492 break;
1493
1494#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1495 case ReparentNotify: 1546 case ReparentNotify:
1496 rootwin_cb (ev); 1547 rootwin_cb (ev);
1497 break; 1548 break;
1498#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1499 1550
1500 case GraphicsExpose: 1551 case GraphicsExpose:
1501 case Expose: 1552 case Expose:
1502 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == vt)
1503 { 1554 {
1504 do 1555 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1559
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1561
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1514 1565
1515 scr_refresh (refresh_type); 1566 want_refresh = 1;
1516 } 1567 }
1517 else 1568 else
1518 { 1569 {
1519 XEvent unused_event; 1570 XEvent unused_event;
1520 1571
1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1573 ;
1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1575 ;
1525 1576
1526 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1527 { 1578 {
1528 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1529 scrollbar_show (0); 1580 scrollbar_show (0);
1530 } 1581 }
1531#ifdef MENUBAR
1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1533 menubar_expose ();
1534#endif
1535
1536#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0])
1538 XClearWindow (display->display, ev.xany.window);
1539#endif
1540 } 1582 }
1541 break; 1583 break;
1542 1584
1543 case MotionNotify: 1585 case MotionNotify:
1544#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1545 if (hidden_pointer) 1587 if (hidden_pointer)
1546 pointer_unblank (); 1588 pointer_unblank ();
1547#endif 1589#endif
1548#if MENUBAR
1549 if (isMenuBarWindow (ev.xany.window))
1550 {
1551 menubar_control (ev.xbutton);
1552 break;
1553 }
1554#endif
1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1556 break; 1591 break;
1557 1592
1558 if (ev.xany.window == TermWin.vt) 1593 if (ev.xany.window == vt)
1559 { 1594 {
1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1597 ; // nop
1560 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561 { 1599 {
1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1563 ; 1601 ;
1564 1602
1565 XQueryPointer (display->display, TermWin.vt, 1603 XQueryPointer (dpy, vt,
1566 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1567 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1568 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1569 &ev.xbutton.state); 1607 &ev.xbutton.state);
1570#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1582#endif 1620#endif
1583 selection_extend (ev.xbutton.x, ev.xbutton.y, 1621 selection_extend (ev.xbutton.x, ev.xbutton.y,
1584 ev.xbutton.state & Button3Mask ? 2 : 0); 1622 ev.xbutton.state & Button3Mask ? 2 : 0);
1585 1623
1586#ifdef SELECTION_SCROLLING 1624#ifdef SELECTION_SCROLLING
1587 if (ev.xbutton.y < TermWin.int_bwidth 1625 if (ev.xbutton.y < int_bwidth
1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1626 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1589 { 1627 {
1590 int dist; 1628 int dist;
1591 1629
1592 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1593 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
… …
1601 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
1602 selection_save_y = ev.xbutton.y; 1640 selection_save_y = ev.xbutton.y;
1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1641 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1604 1642
1605 /* calc number of lines to scroll */ 1643 /* calc number of lines to scroll */
1606 if (ev.xbutton.y < TermWin.int_bwidth) 1644 if (ev.xbutton.y < int_bwidth)
1607 { 1645 {
1608 scroll_selection_dir = UP; 1646 scroll_selection_dir = UP;
1609 dist = TermWin.int_bwidth - ev.xbutton.y; 1647 dist = int_bwidth - ev.xbutton.y;
1610 } 1648 }
1611 else 1649 else
1612 { 1650 {
1613 scroll_selection_dir = DN; 1651 scroll_selection_dir = DN;
1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1652 dist = ev.xbutton.y - (int_bwidth + height);
1615 } 1653 }
1616 1654
1617 scroll_selection_lines = Pixel2Height (dist) 1655 scroll_selection_lines = Pixel2Height (dist)
1618 / SELECTION_SCROLL_LINE_SPEEDUP 1656 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1; 1657 + 1;
1620 MIN_IT (scroll_selection_lines, 1658 min_it (scroll_selection_lines,
1621 SELECTION_SCROLL_MAX_LINES); 1659 SELECTION_SCROLL_MAX_LINES);
1622 } 1660 }
1623 else 1661 else
1624 { 1662 {
1625 /* we are within the text window, so we 1663 /* we are within the text window, so we
… …
1634#endif 1672#endif
1635 } 1673 }
1636 } 1674 }
1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638 { 1676 {
1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1640 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1641 ; 1679 ;
1642 1680
1643 XQueryPointer (display->display, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1644 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1645 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1647 &unused_mask); 1685 &unused_mask);
1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1649 scrollbar_size ()); 1687 scrollbar_size ());
1650 scr_refresh (refresh_type);
1651 refresh_limit = 0; 1688 want_refresh = 1;
1652 scrollbar_show (1); 1689 scrollbar_show (1);
1653 } 1690 }
1654 break; 1691 break;
1655 } 1692 }
1656}
1657 1693
1658#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
1659void 1818void
1660rxvt_term::rootwin_cb (XEvent &ev) 1819rxvt_term::rootwin_cb (XEvent &ev)
1661{ 1820{
1662 SET_R (this); 1821 make_current ();
1663 SET_LOCALE (locale);
1664 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
1665 switch (ev.type) 1828 switch (ev.type)
1666 { 1829 {
1667 case PropertyNotify: 1830 case PropertyNotify:
1668 /* 1831 /*
1669 * 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,
1670 * 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.
1671 */ 1834 */
1672 if (xa[XA_XROOTPMAPID] == 0)
1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1676 return; 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1677 1837 {
1678 /* FALLTHROUGH */ 1838 bgPixmap.set_root_pixmap ();
1679 case ReparentNotify: 1839 bgPixmap.render ();
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1840 }
1681 want_refresh = want_full_refresh = 1;
1682 break; 1841 break;
1683 } 1842 }
1843# endif
1684} 1844}
1685#endif 1845#endif
1686 1846
1687void 1847void
1688rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1689{ 1849{
1690 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1691 1851
1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1693 if (!bypass_keystate) 1854 if (!bypass_keystate)
1694 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695 1856
1696 /* 1857 /*
1697 * VT window processing of button press 1858 * VT window processing of button press
1698 */ 1859 */
1699 if (ev.window == TermWin.vt) 1860 if (ev.window == vt)
1700 { 1861 {
1862 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1863 return;
1864
1701#if ISO_14755 1865#if ISO_14755
1702 // 5.4 1866 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 { 1868 {
1705 iso14755_54 (ev.x, ev.y); 1869 iso14755_54 (ev.x, ev.y);
… …
1717#ifdef MOUSE_REPORT_DOUBLECLICK 1881#ifdef MOUSE_REPORT_DOUBLECLICK
1718 if (ev.button == MEvent.button && clickintime) 1882 if (ev.button == MEvent.button && clickintime)
1719 { 1883 {
1720 /* same button, within alloted time */ 1884 /* same button, within alloted time */
1721 MEvent.clicks++; 1885 MEvent.clicks++;
1886
1722 if (MEvent.clicks > 1) 1887 if (MEvent.clicks > 1)
1723 { 1888 {
1724 /* only report double clicks */ 1889 /* only report double clicks */
1725 MEvent.clicks = 2; 1890 MEvent.clicks = 2;
1726 mouse_report (ev); 1891 mouse_report (ev);
… …
1752 { 1917 {
1753 case Button1: 1918 case Button1:
1754 /* allow meta + click to select rectangular areas */ 1919 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */ 1920 /* should be done in screen.C */
1756#if ENABLE_FRILLS 1921#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask); 1922 selection.rect = !!(ev.state & ModMetaMask);
1758#else 1923#else
1759 selection.rect = false; 1924 selection.rect = false;
1760#endif 1925#endif
1761 1926
1762 /* allow shift+left click to extend selection */ 1927 /* allow shift+left click to extend selection */
1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1928 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1764 { 1929 {
1765 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1766 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1767 else 1932 else
1768 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
… …
1909 case Button3: 2074 case Button3:
1910 if (scrollBar.style != R_SB_XTERM) 2075 if (scrollBar.style != R_SB_XTERM)
1911 { 2076 {
1912 if (scrollbar_above_slider (ev.y)) 2077 if (scrollbar_above_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2078# ifdef RXVT_SCROLL_FULL
1914 scr_page (UP, TermWin.nrow - 1); 2079 scr_page (UP, nrow - 1);
1915# else 2080# else
1916 scr_page (UP, TermWin.nrow / 4); 2081 scr_page (UP, nrow / 4);
1917# endif 2082# endif
1918 else if (scrollbar_below_slider (ev.y)) 2083 else if (scrollbar_below_slider (ev.y))
1919# ifdef RXVT_SCROLL_FULL 2084# ifdef RXVT_SCROLL_FULL
1920 scr_page (DN, TermWin.nrow - 1); 2085 scr_page (DN, nrow - 1);
1921# else 2086# else
1922 scr_page (DN, TermWin.nrow / 4); 2087 scr_page (DN, nrow / 4);
1923# endif 2088# endif
1924 else 2089 else
1925 scrollBar.setMotion (); 2090 scrollBar.setMotion ();
1926 } 2091 }
1927 else 2092 else
1928 { 2093 {
1929 scr_page ((ev.button == Button1 ? DN : UP), 2094 scr_page ((ev.button == Button1 ? DN : UP),
1930 (TermWin.nrow 2095 (nrow
1931 * scrollbar_position (ev.y) 2096 * scrollbar_position (ev.y)
1932 / scrollbar_size ())); 2097 / scrollbar_size ()));
1933 } 2098 }
1934 2099
1935 break; 2100 break;
1936 } 2101 }
1937 } 2102 }
2103
1938 return; 2104 return;
1939 } 2105 }
1940#if MENUBAR
1941 /*
1942 * Menubar window processing of button press
1943 */
1944 if (isMenuBarWindow (ev.window))
1945 menubar_control (ev);
1946#endif
1947} 2106}
1948 2107
1949void 2108void
1950rxvt_term::button_release (XButtonEvent &ev) 2109rxvt_term::button_release (XButtonEvent &ev)
1951{ 2110{
… …
1957 2116
1958 if (scrollbar_isUpDn ()) 2117 if (scrollbar_isUpDn ())
1959 { 2118 {
1960 scrollBar.setIdle (); 2119 scrollBar.setIdle ();
1961 scrollbar_show (0); 2120 scrollbar_show (0);
1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1963 refresh_type &= ~SMOOTH_REFRESH;
1964#endif
1965 } 2121 }
1966 2122
1967#ifdef SELECTION_SCROLLING 2123#ifdef SELECTION_SCROLLING
1968 if (sel_scroll_ev.active) 2124 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop(); 2125 sel_scroll_ev.stop();
1970#endif 2126#endif
1971 2127
1972 if (ev.window == TermWin.vt) 2128 if (ev.window == vt)
1973 { 2129 {
2130 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2131 return;
2132
1974#if ISO_14755 2133#if ISO_14755
1975 // 5.4 2134 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2135 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return; 2136 return;
1978#endif 2137#endif
2138
1979 if (reportmode) 2139 if (reportmode)
1980 { 2140 {
1981 /* mouse report from vt window */ 2141 /* mouse report from vt window */
1982 /* don't report release of wheel "buttons" */ 2142 /* don't report release of wheel "buttons" */
1983 if (ev.button >= 4) 2143 if (ev.button >= 4)
… …
2013 { 2173 {
2014 case Button1: 2174 case Button1:
2015 case Button3: 2175 case Button3:
2016 selection_make (ev.time); 2176 selection_make (ev.time);
2017 break; 2177 break;
2178
2018 case Button2: 2179 case Button2:
2019 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);
2020 break; 2182 break;
2183
2021#ifdef MOUSE_WHEEL 2184#ifdef MOUSE_WHEEL
2022 case Button4: 2185 case Button4:
2023 case Button5: 2186 case Button5:
2024 { 2187 {
2025 int i; 2188 int i;
… …
2027 2190
2028 v = ev.button == Button4 ? UP : DN; 2191 v = ev.button == Button4 ? UP : DN;
2029 2192
2030 if (ev.state & ShiftMask) 2193 if (ev.state & ShiftMask)
2031 i = 1; 2194 i = 1;
2032 else if (options & Opt_mouseWheelScrollPage) 2195 else if (option (Opt_mouseWheelScrollPage))
2033 i = TermWin.nrow - 1; 2196 i = nrow - 1;
2034 else 2197 else
2035 i = 5; 2198 i = 5;
2036 2199
2037# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2038 if (ev.state & ControlMask) 2201 if (ev.state & ControlMask)
2039 { 2202 {
2040 mouse_slip_wheel_speed += v ? -1 : 1; 2203 mouse_slip_wheel_speed += v ? -1 : 1;
2041 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;
2042 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;
2043 2206
2044 if (slip_wheel_ev.at < NOW) 2207 if (slip_wheel_ev.at < NOW)
2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2208 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046 2209
2047 slip_wheel_ev.start (); 2210 slip_wheel_ev.start ();
2048 } 2211 }
2049 else 2212 else
2050 { 2213 {
2051# endif 2214# endif
2052# ifdef JUMP_MOUSE_WHEEL
2053 scr_page (v, i); 2215 scr_page (v, i);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1); 2216 scrollbar_show (1);
2056# else
2057 while (i--)
2058 {
2059 scr_page (v, 1);
2060 scr_refresh (SMOOTH_REFRESH);
2061 scrollbar_show (1);
2062 }
2063# endif
2064# ifdef MOUSE_SLIP_WHEELING 2217# ifdef MOUSE_SLIP_WHEELING
2065 } 2218 }
2066#endif 2219# endif
2067 } 2220 }
2068 break; 2221 break;
2069#endif 2222#endif
2070 } 2223 }
2071 } 2224 }
2072#ifdef MENUBAR
2073 else if (isMenuBarWindow (ev.window))
2074 menubar_control (ev);
2075#endif
2076} 2225}
2077
2078#ifdef TRANSPARENT
2079#if TINTING
2080/* taken from aterm-0.4.2 */
2081
2082typedef uint32_t RUINT32T;
2083
2084void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2085{
2086 int sh_r, sh_g, sh_b;
2087 RUINT32T mask_r, mask_g, mask_b;
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i;
2092
2093 Visual* visual = display->visual;
2094
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096
2097 /* for convenience */
2098 mask_r = visual->red_mask;
2099 mask_g = visual->green_mask;
2100 mask_b = visual->blue_mask;
2101
2102 /* boring lookup table pre-initialization */
2103 switch (srcImage->bits_per_pixel) {
2104 case 15:
2105 if ((mask_r != 0x7c00) ||
2106 (mask_g != 0x03e0) ||
2107 (mask_b != 0x001f))
2108 return;
2109 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2110 lookup_r = lookup;
2111 lookup_g = lookup+32;
2112 lookup_b = lookup+32+32;
2113 sh_r = 10;
2114 sh_g = 5;
2115 sh_b = 0;
2116 break;
2117 case 16:
2118 if ((mask_r != 0xf800) ||
2119 (mask_g != 0x07e0) ||
2120 (mask_b != 0x001f))
2121 return;
2122 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2123 lookup_r = lookup;
2124 lookup_g = lookup+32;
2125 lookup_b = lookup+32+64;
2126 sh_r = 11;
2127 sh_g = 5;
2128 sh_b = 0;
2129 break;
2130 case 24:
2131 if ((mask_r != 0xff0000) ||
2132 (mask_g != 0x00ff00) ||
2133 (mask_b != 0x0000ff))
2134 return;
2135 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2136 lookup_r = lookup;
2137 lookup_g = lookup+256;
2138 lookup_b = lookup+256+256;
2139 sh_r = 16;
2140 sh_g = 8;
2141 sh_b = 0;
2142 break;
2143 case 32:
2144 if ((mask_r != 0xff0000) ||
2145 (mask_g != 0x00ff00) ||
2146 (mask_b != 0x0000ff))
2147 return;
2148 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2149 lookup_r = lookup;
2150 lookup_g = lookup+256;
2151 lookup_b = lookup+256+256;
2152 sh_r = 16;
2153 sh_g = 8;
2154 sh_b = 0;
2155 break;
2156 default:
2157 return; /* we do not support this color depth */
2158 }
2159
2160 /* prepare limits for color transformation (each channel is handled separately) */
2161 if (shade < 0) {
2162 shade = -shade;
2163 if (shade < 0) shade = 0;
2164 if (shade > 100) shade = 100;
2165
2166 lower_lim_r = 65535-rm;
2167 lower_lim_g = 65535-gm;
2168 lower_lim_b = 65535-bm;
2169
2170 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2171 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2172 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2173
2174 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2175 } else {
2176 if (shade < 0) shade = 0;
2177 if (shade > 100) shade = 100;
2178
2179 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2180
2181 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2182 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2183 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2184 }
2185
2186 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2187 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2188 {
2189 unsigned int tmp;
2190
2191 tmp = lower_lim_r;
2192 lower_lim_r = lower_lim_b;
2193 lower_lim_b = tmp;
2194
2195 tmp = upper_lim_r;
2196 upper_lim_r = upper_lim_b;
2197 upper_lim_b = tmp;
2198 }
2199
2200 /* fill our lookup tables */
2201 for (i = 0; i <= mask_r>>sh_r; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2205 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2206 lookup_r[i] = (tmp/65535)<<sh_r;
2207 }
2208 for (i = 0; i <= mask_g>>sh_g; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2212 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2213 lookup_g[i] = (tmp/65535)<<sh_g;
2214 }
2215 for (i = 0; i <= mask_b>>sh_b; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2219 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2220 lookup_b[i] = (tmp/65535)<<sh_b;
2221 }
2222
2223 /* apply table to input image (replacing colors by newly calculated ones) */
2224 switch (srcImage->bits_per_pixel)
2225 {
2226 case 15:
2227 {
2228 unsigned short *p1, *pf, *p, *pl;
2229 p1 = (unsigned short *) srcImage->data;
2230 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2231 while (p1 < pf)
2232 {
2233 p = p1;
2234 pl = p1 + srcImage->width;
2235 for (; p < pl; p++)
2236 {
2237 *p = lookup_r[(*p & 0x7c00)>>10] |
2238 lookup_g[(*p & 0x03e0)>> 5] |
2239 lookup_b[(*p & 0x001f)];
2240 }
2241 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2242 }
2243 break;
2244 }
2245 case 16:
2246 {
2247 unsigned short *p1, *pf, *p, *pl;
2248 p1 = (unsigned short *) srcImage->data;
2249 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2250 while (p1 < pf)
2251 {
2252 p = p1;
2253 pl = p1 + srcImage->width;
2254 for (; p < pl; p++)
2255 {
2256 *p = lookup_r[(*p & 0xf800)>>11] |
2257 lookup_g[(*p & 0x07e0)>> 5] |
2258 lookup_b[(*p & 0x001f)];
2259 }
2260 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2261 }
2262 break;
2263 }
2264 case 24:
2265 {
2266 unsigned char *p1, *pf, *p, *pl;
2267 p1 = (unsigned char *) srcImage->data;
2268 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width * 3;
2273 for (; p < pl; p += 3)
2274 {
2275 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2276 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2277 p[2] = lookup_r[(p[2] & 0x0000ff)];
2278 }
2279 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2280 }
2281 break;
2282 }
2283 case 32:
2284 {
2285 RUINT32T *p1, *pf, *p, *pl;
2286 p1 = (RUINT32T *) srcImage->data;
2287 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2288
2289 while (p1 < pf)
2290 {
2291 p = p1;
2292 pl = p1 + srcImage->width;
2293 for (; p < pl; p++)
2294 {
2295 *p = lookup_r[(*p & 0xff0000)>>16] |
2296 lookup_g[(*p & 0x00ff00)>> 8] |
2297 lookup_b[(*p & 0x0000ff)] |
2298 (*p & ~0xffffff);
2299 }
2300 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2301 }
2302 break;
2303 }
2304 }
2305
2306 free (lookup);
2307}
2308#endif
2309
2310/*
2311 * Check our parents are still who we think they are.
2312 * Do transparency updates if required
2313 */
2314int
2315rxvt_term::check_our_parents ()
2316{
2317 int i, pchanged, aformat, have_pixmap, rootdepth;
2318 unsigned long nitems, bytes_after;
2319 Atom atype;
2320 unsigned char *prop = NULL;
2321 Window root, oldp, *list;
2322 Pixmap rootpixmap = None;
2323 XWindowAttributes wattr, wrootattr;
2324
2325 pchanged = 0;
2326
2327 if (!(options & Opt_transparent))
2328 return pchanged; /* Don't try any more */
2329
2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
2331 rootdepth = wrootattr.depth;
2332
2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2334
2335 if (rootdepth != wattr.depth)
2336 {
2337 if (am_transparent)
2338 {
2339 pchanged = 1;
2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2341 am_transparent = am_pixmap_trans = 0;
2342 }
2343
2344 return pchanged; /* Don't try any more */
2345 }
2346
2347 /* Get all X ops out of the queue so that our information is up-to-date. */
2348 XSync (display->display, False);
2349
2350 /*
2351 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame
2353 * windows for each client, so we have to take care about that.
2354 */
2355 i = (xa[XA_XROOTPMAPID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success);
2359
2360 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success);
2365
2366 if (!i || prop == NULL
2367#if TINTING
2368 || !rs[Rs_color + Color_tint]
2369#endif
2370 )
2371 have_pixmap = 0;
2372 else
2373 {
2374 have_pixmap = 1;
2375 rootpixmap = *(Pixmap *)prop;
2376 XFree (prop);
2377 }
2378
2379 if (have_pixmap)
2380 {
2381 /*
2382 * Copy display->root pixmap transparency
2383 */
2384 int sx, sy, nx, ny;
2385 unsigned int nw, nh;
2386 Window cr;
2387 XImage *image;
2388 GC gc;
2389 XGCValues gcvalue;
2390
2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2392 0, 0, &sx, &sy, &cr);
2393 nw = (unsigned int)szHint.width;
2394 nh = (unsigned int)szHint.height;
2395 nx = ny = 0;
2396
2397 if (sx < 0)
2398 {
2399 nw += sx;
2400 nx = -sx;
2401 sx = 0;
2402 }
2403
2404 if (sy < 0)
2405 {
2406 nh += sy;
2407 ny = -sy;
2408 sy = 0;
2409 }
2410
2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2415 allowedxerror = -1;
2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417
2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2419 /* XXX: may need a delay here? */
2420 allowedxerror = 0;
2421
2422 if (image == NULL)
2423 {
2424 if (am_transparent && am_pixmap_trans)
2425 {
2426 pchanged = 1;
2427 if (TermWin.pixmap != None)
2428 {
2429 XFreePixmap (display->display, TermWin.pixmap);
2430 TermWin.pixmap = None;
2431 }
2432 }
2433
2434 am_pixmap_trans = 0;
2435 }
2436 else
2437 {
2438 if (TermWin.pixmap != None)
2439 XFreePixmap (display->display, TermWin.pixmap);
2440
2441#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint))
2443 {
2444 unsigned short rm, gm, bm;
2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2446
2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2448
2449 ShadeXImage (display, image, shade, rm, gm, bm);
2450 }
2451#endif
2452
2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2454 szHint.width, szHint.height, image->depth);
2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2457 nx, ny, image->width, image->height);
2458 XFreeGC (display->display, gc);
2459 XDestroyImage (image);
2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]);
2462
2463 if (!am_transparent || !am_pixmap_trans)
2464 pchanged = 1;
2465
2466 am_transparent = am_pixmap_trans = 1;
2467 }
2468 }
2469
2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2473 {
2474 unsigned int n;
2475 /*
2476 * InheritPixmap transparency
2477 */
2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2479 {
2480 oldp = TermWin.parent[i];
2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2482 &TermWin.parent[i], &list, &n);
2483 XFree (list);
2484
2485 if (TermWin.parent[i] == display->root)
2486 {
2487 if (oldp != None)
2488 pchanged = 1;
2489
2490 break;
2491 }
2492
2493 if (oldp != TermWin.parent[i])
2494 pchanged = 1;
2495 }
2496
2497 n = 0;
2498
2499 if (pchanged)
2500 {
2501 for (; n < (unsigned int)i; n++)
2502 {
2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505 {
2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2507 break;
2508 }
2509 }
2510 }
2511
2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2513 {
2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2516 am_transparent = 0;
2517 /* XXX: also turn off Opt_transparent? */
2518 }
2519 else
2520 {
2521#if WAIT_FOR_WM
2522 /* wait (an arbitrary period) for the WM to do its thing
2523 * needed for fvwm2.2.2 (and before?) */
2524 sleep (1);
2525#endif
2526 for (n = 0; n < (unsigned int)i; n++)
2527 {
2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]);
2530 }
2531
2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2533 am_transparent = 1;
2534 }
2535
2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2537 TermWin.parent[i] = None;
2538 }
2539
2540 if (scrollBar.win)
2541 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle ();
2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2552 }
2553
2554 return pchanged;
2555}
2556#endif
2557 2226
2558/*}}} */ 2227/*}}} */
2559 2228
2560bool 2229bool
2561rxvt_term::cmd_parse () 2230rxvt_term::cmd_parse ()
2562{ 2231{
2563 bool flag = false; 2232 bool flag = false;
2564 unicode_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2565 unsigned char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2566 2235
2567 for (;;) 2236 for (;;)
2568 { 2237 {
2569 if (ch == NOCHAR) 2238 if (ch == NOCHAR)
2570 { 2239 {
2571 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2572 ch = next_char (); 2241 ch = next_char ();
2573 }
2574 2242
2575 if (ch == NOCHAR) // TODO: improve 2243 if (ch == NOCHAR)
2576 break; 2244 break;
2245 }
2577 2246
2578 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)
2579 { 2248 {
2580 if (!seen_input) 2249 if (!seen_input)
2581 { 2250 {
… …
2585 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong. 2255 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike 2256 // unfortunately other programs are even more buggy and dislike
2588 // 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
2589 // resized. 2258 // resized.
2590 if (seen_resize) 2259 if (seen_resize && cmd_pid)
2591 kill (-cmd_pid, SIGWINCH); 2260 kill (-cmd_pid, SIGWINCH);
2592 } 2261 }
2593 2262
2594 /* Read a text string from the input buffer */ 2263 /* Read a text string from the input buffer */
2595 unicode_t buf[UBUFSIZ]; 2264 wchar_t buf[UBUFSIZ];
2596 bool refreshnow = false; 2265 bool refreshnow = false;
2597 int nlines = 0; 2266 int nlines = 0;
2598 unicode_t *str = buf; 2267 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2599 2269
2600 for (;;) 2270 for (;;)
2601 { 2271 {
2602 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))
2603 break; 2273 break;
2604 2274
2605 *str++ = ch; 2275 *str++ = ch;
2606 2276
2607 if (ch == C0_LF) 2277 if (ch == C0_LF || str >= eol)
2608 { 2278 {
2279 if (ch == C0_LF)
2609 nlines++; 2280 nlines++;
2281
2610 refresh_count++; 2282 refresh_count++;
2611 2283
2612 if (!(options & Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2614 { 2285 {
2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2289 {
2615 refreshnow = true; 2290 refreshnow = true;
2616 ch = NOCHAR; 2291 ch = NOCHAR;
2617 break; 2292 break;
2293 }
2618 } 2294 }
2619 2295
2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2621 if (nlines >= TermWin.nrow - 1) 2297 if (nlines >= nrow - 1)
2622 { 2298 {
2299 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2300 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2623 scr_add_lines (buf, nlines, str - buf); 2301 scr_add_lines (buf, str - buf, nlines);
2302
2624 nlines = 0; 2303 nlines = 0;
2625 str = buf; 2304 str = buf;
2305 eol = str + min (ncol, UBUFSIZ);
2626 } 2306 }
2627 }
2628 2307
2629 if (str >= buf + UBUFSIZ) 2308 if (str >= eol)
2630 { 2309 {
2310 if (eol >= buf + UBUFSIZ)
2311 {
2631 ch = NOCHAR; 2312 ch = NOCHAR;
2632 break; 2313 break;
2314 }
2315 else
2316 eol = min (eol + ncol, buf + UBUFSIZ);
2317 }
2318
2633 } 2319 }
2634 2320
2635 seq_begin = cmdbuf_ptr; 2321 seq_begin = cmdbuf_ptr;
2636 ch = next_char (); 2322 ch = next_char ();
2637 } 2323 }
2638 2324
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2639 scr_add_lines (buf, nlines, str - buf); 2327 scr_add_lines (buf, str - buf, nlines);
2640 2328
2641 /* 2329 /*
2642 * 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
2643 * 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.
2644 * the number of pages between refreshes is refresh_limit, which 2332 * if skipScroll is enabled.
2645 * is incremented here because we must be doing flat-out scrolling.
2646 */ 2333 */
2647 if (refreshnow) 2334 if (refreshnow)
2648 { 2335 {
2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2650 refresh_limit++;
2651 else
2652 {
2653 flag = true; 2336 flag = true;
2654 scr_refresh (refresh_type); 2337 scr_refresh ();
2655 } 2338 want_refresh = 1;
2656 } 2339 }
2657 2340
2658 } 2341 }
2659 else 2342 else
2660 { 2343 {
… …
2674 } 2357 }
2675 2358
2676 return flag; 2359 return flag;
2677} 2360}
2678 2361
2679// read the next octet
2680unicode_t
2681rxvt_term::next_octet ()
2682{
2683 return cmdbuf_ptr < cmdbuf_endp
2684 ? *cmdbuf_ptr++
2685 : NOCHAR;
2686}
2687
2688// read the next character 2362// read the next character
2689unicode_t 2363wchar_t
2690rxvt_term::next_char () 2364rxvt_term::next_char () NOTHROW
2691{ 2365{
2692 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2693 { 2367 {
2694 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2695 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2696 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2697 2371
2698 wchar_t wc; 2372 wchar_t wc;
2699 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);
2700 2374
2701 if (len == (size_t)-2) 2375 if (len == (size_t)-2)
2702 { 2376 {
2703 // the mbstate stores incomplete sequences. didn't know this :/ 2377 // the mbstate stores incomplete sequences. didn't know this :/
2704 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2705 break; 2379 break;
2706 } 2380 }
2707 2381
2708 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2709 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
2710 2384
2711 // assume wchar == unicode 2385 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2713 return wc; 2387 return wc & UNICODE_MASK;
2714 } 2388 }
2715 2389
2716 return NOCHAR; 2390 return NOCHAR;
2717} 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;
2718 2403
2719/* rxvt_cmd_getc () - Return next input character */ 2404/* rxvt_cmd_getc () - Return next input character */
2720/* 2405/*
2721 * Return the next input character after first passing any keyboard input 2406 * Return the next input character after first passing any keyboard input
2722 * to the command. 2407 * to the command.
2723 */ 2408 */
2724unicode_t 2409wchar_t
2725rxvt_term::cmd_getc () 2410rxvt_term::cmd_getc () THROW ((class out_of_input))
2726{ 2411{
2727 unicode_t c = next_char (); 2412 wchar_t c = next_char ();
2728 2413
2729 if (c == NOCHAR) 2414 if (c == NOCHAR)
2730 throw out_of_input; 2415 throw out_of_input;
2731 2416
2732 return c; 2417 return c;
2733} 2418}
2734 2419
2735unicode_t 2420uint32_t
2736rxvt_term::cmd_get8 () 2421rxvt_term::cmd_get8 () THROW ((class out_of_input))
2737{ 2422{
2738 unicode_t c = next_octet (); 2423 uint32_t c = next_octet ();
2739 2424
2740 if (c == NOCHAR) 2425 if (c == NOCHAR)
2741 throw out_of_input; 2426 throw out_of_input;
2742 2427
2743 return c; 2428 return c;
… …
2807 { 2492 {
2808 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2809 break; /* done = 1 */ 2494 break; /* done = 1 */
2810 } 2495 }
2811 } 2496 }
2812 2497
2813 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2814 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2815 { 2500 {
2816 done = 1; 2501 done = 1;
2817 break; 2502 break;
… …
2843 case C0_ESC: 2528 case C0_ESC:
2844 process_escape_seq (); 2529 process_escape_seq ();
2845 break; 2530 break;
2846 case C0_ENQ: /* terminal Status */ 2531 case C0_ENQ: /* terminal Status */
2847 if (rs[Rs_answerbackstring]) 2532 if (rs[Rs_answerbackstring])
2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2533 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2850 else 2534 else
2851 tt_write ((unsigned char *)VT100_ANS, 2535 tt_write (VT100_ANS, strlen (VT100_ANS));
2852 (unsigned int)strlen (VT100_ANS));
2853 break; 2536 break;
2854 case C0_BEL: /* bell */ 2537 case C0_BEL: /* bell */
2855 scr_bell (); 2538 scr_bell ();
2856 break; 2539 break;
2857 case C0_BS: /* backspace */ 2540 case C0_BS: /* backspace */
… …
2881 process_dcs_seq (); 2564 process_dcs_seq ();
2882 break; 2565 break;
2883 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2884 process_csi_seq (); 2567 process_csi_seq ();
2885 break; 2568 break;
2886 case 0x9d: /* CSI */ 2569 case 0x9d: /* OSC */
2887 process_osc_seq (); 2570 process_osc_seq ();
2888 break; 2571 break;
2889#endif 2572#endif
2890 } 2573 }
2891} 2574}
… …
2981 scr_charset_set (2, (unsigned int)cmd_getc ()); 2664 scr_charset_set (2, (unsigned int)cmd_getc ());
2982 break; 2665 break;
2983 case '+': 2666 case '+':
2984 scr_charset_set (3, (unsigned int)cmd_getc ()); 2667 scr_charset_set (3, (unsigned int)cmd_getc ());
2985 break; 2668 break;
2986#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
2987 case '6': 2670 case '6':
2988 scr_backindex (); 2671 scr_backindex ();
2989 break; 2672 break;
2990#endif 2673#endif
2991 case '7': 2674 case '7':
2992 scr_cursor (SAVE); 2675 scr_cursor (SAVE);
2993 break; 2676 break;
2994 case '8': 2677 case '8':
2995 scr_cursor (RESTORE); 2678 scr_cursor (RESTORE);
2996 break; 2679 break;
2997#if ENABLE_FRILLS 2680#if !ENABLE_MINIMAL
2998 case '9': 2681 case '9':
2999 scr_forwardindex (); 2682 scr_forwardindex ();
3000 break; 2683 break;
3001#endif 2684#endif
3002 case '=': 2685 case '=':
… …
3012 break; 2695 break;
3013 2696
3014 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
3015 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
3016 { 2699 {
3017 unicode_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
3018 scr_add_lines (nlcr, 1, 2); 2701 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3019 } 2702 }
3020 break; 2703 break;
3021 2704
3022 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
3023 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
… …
3045 process_dcs_seq (); 2728 process_dcs_seq ();
3046 break; 2729 break;
3047 2730
3048 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2731 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3049 case C1_SCI: /* ESC Z */ 2732 case C1_SCI: /* ESC Z */
3050 tt_write ((const unsigned char *)ESCZ_ANSWER, 2733 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3051 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3052 break; /* steal obsolete ESC [ c */ 2734 break; /* steal obsolete ESC [ c */
3053 2735
3054 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2736 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3055 case C1_CSI: /* ESC [ */ 2737 case C1_CSI: /* ESC [ */
3056 process_csi_seq (); 2738 process_csi_seq ();
… …
3120 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3121 unsigned int nargs, p; 2803 unsigned int nargs, p;
3122 int n, ndef; 2804 int n, ndef;
3123 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS];
3124 2806
3125 for (nargs = ESC_ARGS; nargs > 0;) 2807 memset (arg, 0, sizeof (arg));
3126 arg[--nargs] = 0; 2808 nargs = 0;
3127 2809
3128 priv = 0; 2810 priv = 0;
3129 ch = cmd_getc (); 2811 ch = cmd_getc ();
3130 if (ch >= '<' && ch <= '?') 2812 if (ch >= '<' && ch <= '?')
3131 { /* '<' '=' '>' '?' */ 2813 { /* '<' '=' '>' '?' */
… …
3165 ndef = get_byte_array_bit (csi_defaults, i); 2847 ndef = get_byte_array_bit (csi_defaults, i);
3166 for (p = 0; p < nargs; p++) 2848 for (p = 0; p < nargs; p++)
3167 if (arg[p] == -1) 2849 if (arg[p] == -1)
3168 arg[p] = ndef; 2850 arg[p] = ndef;
3169 2851
3170#ifdef DEBUG_CMD
3171 fprintf (stderr, "CSI ");
3172 for (p = 0; p < nargs; p++)
3173 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3174 fprintf (stderr, "%c\n", ch);
3175#endif
3176
3177 /* 2852 /*
3178 * private mode handling 2853 * private mode handling
3179 */ 2854 */
3180 if (priv) 2855 if (priv)
3181 { 2856 {
3182 switch (priv) 2857 switch (priv)
3183 { 2858 {
3184 case '>': 2859 case '>':
3185 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 //
3186 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2869 tt_printf ("\033[>%d;94;0c", 'U');
2870 }
3187 break; 2871 break;
3188 case '?': 2872 case '?':
3189 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3191 break; 2875 break;
… …
3296 2980
3297 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2981 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3298 arg[0] = -arg[0]; 2982 arg[0] = -arg[0];
3299 /* FALLTHROUGH */ 2983 /* FALLTHROUGH */
3300 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2984 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2985 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3302 break; 2986 break;
3303 2987
3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2988 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3305 tt_write ((const unsigned char *)VT100_ANS, 2989 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3306 (unsigned int) (sizeof (VT100_ANS) - 1));
3307 break; 2990 break;
3308 2991
3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2992 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3310 process_sgr_mode (nargs, arg); 2993 process_sgr_mode (nargs, arg);
3311 break; 2994 break;
… …
3318 break; 3001 break;
3319 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
3320 scr_report_position (); 3003 scr_report_position ();
3321 break; 3004 break;
3322 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3323 if (options & Opt_insecure) 3006 if (option (Opt_insecure))
3324 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3325 break; 3008 break;
3326 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3328 break; 3011 break;
… …
3395 break; 3078 break;
3396 case CSI_75: 3079 case CSI_75:
3397 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3398 break; 3081 break;
3399 3082
3400#if ENABLE_FRILLS 3083#if !ENABLE_MINIMAL
3401 case CSI_74: 3084 case CSI_74:
3402 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
3403 break; 3086 break;
3404#endif 3087#endif
3405 3088
… …
3412 break; 3095 break;
3413 } 3096 }
3414} 3097}
3415/*}}} */ 3098/*}}} */
3416 3099
3417#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3418/* ARGSUSED */ 3101/* ARGSUSED */
3419void 3102void
3420rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421{ 3104{
3422 int x, y; 3105 int x, y;
3423 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
3424 Window wdummy; 3107 Window wdummy;
3108
3109 dLocal (Display *, dpy);
3425 3110
3426 if (nargs == 0) 3111 if (nargs == 0)
3427 return; 3112 return;
3428 3113
3429 switch (args[0]) 3114 switch (args[0])
3430 { 3115 {
3431 /* 3116 /*
3432 * commands 3117 * commands
3433 */ 3118 */
3434 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3435 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (dpy, parent[0]);
3436 break; 3121 break;
3437 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3438 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (dpy, parent[0], display->screen);
3439 DefaultScreen (display->display));
3440 break; 3124 break;
3441 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3442 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent[0], args[1], args[2]);
3443 break; 3127 break;
3444 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3445 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446 break; 3130 break;
3447 case 5: /* raise window */ 3131 case 5: /* raise window */
3448 XRaiseWindow (display->display, TermWin.parent[0]); 3132 XRaiseWindow (dpy, parent[0]);
3449 break; 3133 break;
3450 case 6: /* lower window */ 3134 case 6: /* lower window */
3451 XLowerWindow (display->display, TermWin.parent[0]); 3135 XLowerWindow (dpy, parent[0]);
3452 break; 3136 break;
3453 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3454 scr_touch (true); 3138 scr_touch (true);
3455 break; 3139 break;
3456 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
3457 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3141 set_widthheight ((unsigned int) (args[2] * fwidth),
3458 (unsigned int) (args[1] * TermWin.fheight)); 3142 (unsigned int) (args[1] * fheight));
3459 break; 3143 break;
3460 3144
3461 //case 9: NYI, TODO, restore maximized window or maximize window 3145 //case 9: NYI, TODO, restore maximized window or maximize window
3462 default: 3146 default:
3463 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
3464 set_widthheight ((unsigned int)TermWin.width, 3148 set_widthheight ((unsigned int)width,
3465 (unsigned int) (args[1] * TermWin.fheight)); 3149 (unsigned int) (args[1] * fheight));
3466 break; 3150 break;
3467
3468 3151
3469 /* 3152 /*
3470 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3471 */ 3154 */
3472 case 11: /* report window state */ 3155 case 11: /* report window state */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent[0], &wattr);
3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475 break; 3158 break;
3476 case 13: /* report window position */ 3159 case 13: /* report window position */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent[0], wattr.root,
3479 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3480 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3481 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3482 break; 3165 break;
3483 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486 break; 3169 break;
3487 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3489 break; 3172 break;
3490 case 19: /* report window size (chars) */ 3173 case 19: /* report window size (chars) */
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3492 break; 3175 break;
3493 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3494 { 3177 {
3495 char *s; 3178 char *s;
3496 XGetIconName (display->display, TermWin.parent[0], &s); 3179 XGetIconName (dpy, parent[0], &s);
3497 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 */
3498 XFree (s); 3181 XFree (s);
3499 } 3182 }
3500 break; 3183 break;
3501 case 21: /* report window title */ 3184 case 21: /* report window title */
3502 { 3185 {
3503 char *s; 3186 char *s;
3504 XFetchName (display->display, TermWin.parent[0], &s); 3187 XFetchName (dpy, parent[0], &s);
3505 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 */
3506 XFree (s); 3189 XFree (s);
3507 } 3190 }
3508 break; 3191 break;
3509 } 3192 }
3510} 3193}
… …
3513/*----------------------------------------------------------------------*/ 3196/*----------------------------------------------------------------------*/
3514/* 3197/*
3515 * get input up until STRING TERMINATOR (or BEL) 3198 * get input up until STRING TERMINATOR (or BEL)
3516 * ends_how is terminator used. returned input must be free()'d 3199 * ends_how is terminator used. returned input must be free()'d
3517 */ 3200 */
3518unsigned char * 3201char *
3519rxvt_term::get_to_st (unicode_t &ends_how) 3202rxvt_term::get_to_st (unicode_t &ends_how)
3520{ 3203{
3521 unicode_t ch; 3204 unicode_t ch;
3522 bool seen_esc = false; 3205 bool seen_esc = false;
3523 unsigned int n = 0; 3206 unsigned int n = 0;
… …
3537 seen_esc = true; 3220 seen_esc = true;
3538 continue; 3221 continue;
3539 } 3222 }
3540 else if (ch == C0_BEL || ch == CHAR_ST) 3223 else if (ch == C0_BEL || ch == CHAR_ST)
3541 break; 3224 break;
3225 else if (ch == C0_SYN)
3226 ch = cmd_get8 ();
3542 else if (ch < 0x20) 3227 else if (ch < 0x20)
3543 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
3544 3229
3545 seen_esc = false; 3230 seen_esc = false;
3546 3231
3547 if (n >= sizeof (string) - 1) 3232 if (n >= STRING_MAX - 1)
3548 // stop at some sane length 3233 // stop at some sane length
3549 return NULL; 3234 return NULL;
3550 3235
3551 if (ch == C0_SYN)
3552 string[n++] = cmd_get8 ();
3553 else
3554 string[n++] = ch; 3236 string[n++] = ch;
3555 } 3237 }
3556 3238
3557 string[n++] = '\0'; 3239 string[n++] = '\0';
3558 3240
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 3242
3561 return (unsigned char *)rxvt_wcstombs (string); 3243 return rxvt_wcstombs (string);
3562} 3244}
3563 3245
3564/*----------------------------------------------------------------------*/ 3246/*----------------------------------------------------------------------*/
3565/* 3247/*
3566 * 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)'
3567 */ 3249 */
3568void 3250void
3569rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3570{ 3252{
3571 unsigned char *s; 3253 char *s;
3572 unicode_t eh; 3254 unicode_t eh;
3573 3255
3574 /* 3256 /*
3575 * Not handled yet 3257 * Not handled yet
3576 */ 3258 */
… …
3595 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3596 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3597 3279
3598 if (ch == ';') 3280 if (ch == ';')
3599 { 3281 {
3600 unsigned char *s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3601 3283
3602 if (s) 3284 if (s)
3603 { 3285 {
3604 process_xterm_seq (arg, (char *)s, eh); 3286 process_xterm_seq (arg, s, eh);
3605 free (s); 3287 free (s);
3606 } 3288 }
3607 } 3289 }
3608} 3290}
3609 3291
3610void 3292void
3611rxvt_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)
3612{ 3294{
3613 if (str[0] == '?' && !str[1]) 3295 if (str[0] == '?' && !str[1])
3614 { 3296 {
3615 unsigned short r, g, b; 3297 rgba c;
3616 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
3617 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);
3618 } 3306 }
3619 else 3307 else
3620 set_window_color (color, str); 3308 set_window_color (color, str);
3621} 3309}
3622 3310
3623/* 3311/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625 * 0 = change iconName/title
3626 * 1 = change iconName
3627 * 2 = change title
3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
3631 * 12 = change text color
3632 * 13 = change mouse foreground color
3633 * 17 = change highlight character colour
3634 * 18 = change bold character color
3635 * 19 = change underlined character color
3636 * 46 = change logfile (not implemented)
3637 * 50 = change font
3638 *
3639 * rxvt extensions:
3640 * 20 = bg pixmap
3641 * 39 = change default fg color
3642 * 49 = change default bg color
3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
3647 */ 3313 */
3648void 3314void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3315rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3650{ 3316{
3651 int changed = 0;
3652 int color; 3317 int color;
3653 char *buf, *name; 3318 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3319 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3320 int saveop = op;
3656 3321
3322 dLocal (Display *, dpy);
3323
3657 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
3658 switch (op) 3329 switch (op)
3659 { 3330 {
3660 case XTerm_name: 3331 case XTerm_name:
3661 set_title (str); 3332 set_title (str);
3662 /* FALLTHROUGH */ 3333 /* FALLTHROUGH */
… …
3676 unsigned long bytes_after; 3347 unsigned long bytes_after;
3677 unsigned char *value = 0; 3348 unsigned char *value = 0;
3678 const char *str = ""; 3349 const char *str = "";
3679 3350
3680 if (prop 3351 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3352 && XGetWindowProperty (dpy, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3353 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3354 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3355 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3356 && actual_type != None
3686 && actual_format == 8) 3357 && actual_format == 8)
3687 str = (const char *)(value); 3358 str = (const char *)(value);
3688 3359
3689 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3360 tt_printf ("\033]%d;%s%c", op, str, resp);
3690 3361
3691 XFree (value); 3362 XFree (value);
3692 } 3363 }
3693 else 3364 else
3694 { 3365 {
… …
3698 { 3369 {
3699 *eq = 0; 3370 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1); 3371 set_utf8_property (display->atom (str), eq + 1);
3701 } 3372 }
3702 else 3373 else
3703 XDeleteProperty (display->display, TermWin.parent[0], 3374 XDeleteProperty (dpy, parent[0],
3704 display->atom (str)); 3375 display->atom (str));
3705 } 3376 }
3706 break; 3377 break;
3707 3378
3708 case XTerm_Color: 3379 case XTerm_Color:
… …
3710 { 3381 {
3711 if ((name = strchr (buf, ';')) == NULL) 3382 if ((name = strchr (buf, ';')) == NULL)
3712 break; 3383 break;
3713 3384
3714 *name++ = '\0'; 3385 *name++ = '\0';
3715 color = atoi (buf); 3386 color = atoi (buf) + minCOLOR;
3716 3387
3717 if (color < 0 || color >= TOTAL_COLORS) 3388 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3718 break; 3389 break;
3719 3390
3720 if ((buf = strchr (name, ';')) != NULL) 3391 if ((buf = strchr (name, ';')) != NULL)
3721 *buf++ = '\0'; 3392 *buf++ = '\0';
3722 3393
3723 if (name[0] == '?' && !name[1]) 3394 process_color_seq (op, color, name, resp);
3724 {
3725 unsigned short r, g, b;
3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3728 }
3729 else
3730 set_window_color (color + minCOLOR, name);
3731 } 3395 }
3732 break; 3396 break;
3733 case XTerm_Color00: 3397 case XTerm_Color00:
3734 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
3735 break; 3399 break;
3736 case XTerm_Color01: 3400 case XTerm_Color01:
3737 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3401 process_color_seq (op, Color_bg, str, resp);
3738 break; 3402 break;
3739#ifndef NO_CURSORCOLOR 3403#ifndef NO_CURSORCOLOR
3740 case XTerm_Color_cursor: 3404 case XTerm_Color_cursor:
3741 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3405 process_color_seq (op, Color_cursor, str, resp);
3742 break; 3406 break;
3743#endif 3407#endif
3744 case XTerm_Color_pointer_fg: 3408 case XTerm_Color_pointer_fg:
3745 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3409 process_color_seq (op, Color_pointer_fg, str, resp);
3746 break; 3410 break;
3747 case XTerm_Color_pointer_bg: 3411 case XTerm_Color_pointer_bg:
3748 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3412 process_color_seq (op, Color_pointer_bg, str, resp);
3749 break; 3413 break;
3750#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3751 case XTerm_Color_BD:
3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3757 case XTerm_Color_UL:
3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759 break;
3760 case XTerm_Color_RV: 3415 case XTerm_Color_RV:
3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3416 process_color_seq (op, Color_RV, str, resp);
3762 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;
3763#endif 3429#endif
3764#if TRANSPARENT && TINTING 3430#if ENABLE_TRANSPARENCY
3765 case XTerm_Color_tint: 3431 case URxvt_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3432 process_color_seq (op, Color_tint, str, resp);
3767 check_our_parents (); 3433 {
3768 if (am_transparent) 3434 bool changed = false;
3769 want_full_refresh = want_refresh = 1; 3435 if (ISSET_PIXCOLOR (Color_tint))
3770 break; 3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3771#endif 3437 else
3438 changed = bgPixmap.unset_tint ();
3439 if (changed)
3440 bgPixmap.render ();
3441 }
3772 3442
3443 break;
3444#endif
3445
3446#if XPM_BACKGROUND
3773 case XTerm_Pixmap: 3447 case Rxvt_Pixmap:
3774 if (*str != ';') 3448 if (!strcmp (str, "?"))
3775 { 3449 {
3776#if XPM_BACKGROUND 3450 char str[256];
3777 scale_pixmap (""); /* reset to default scaling */ 3451
3778 set_bgPixmap (str); /* change pixmap */ 3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3779#endif 3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3780 scr_touch (true); 3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3455 process_xterm_seq (XTerm_title, str, CHAR_ST);
3781 } 3456 }
3782 while ((str = strchr (str, ';')) != NULL) 3457 else
3783 { 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 {
3784 str++; 3473 str++;
3785#if XPM_BACKGROUND 3474 if (bgPixmap.set_geometry (str))
3786 changed += scale_pixmap (str); 3475 changed++;
3787#endif 3476 str = strchr (str, ';');
3788 3477 }
3478 if (changed)
3479 {
3480 bgPixmap.render ();
3481 scr_touch (true);
3482 }
3789 } 3483 }
3790 if (changed)
3791 {
3792#ifdef XPM_BACKGROUND
3793 resize_pixmap ();
3794#endif
3795 scr_touch (true);
3796 }
3797 break; 3484 break;
3485#endif
3798 3486
3799 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3800 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3801 break; 3489 break;
3802 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3803 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3804 break; 3492 break;
3805 3493
3806 case XTerm_logfile: 3494 case XTerm_logfile:
3807 // TODO, when secure mode? 3495 // TODO, when secure mode?
3808 break; 3496 break;
3809 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
3810 case XTerm_font: 3510 case XTerm_font:
3811 op = URxvt_font; 3511 op = URxvt_font;
3812 case URxvt_font: 3512 case URxvt_font:
3813#if ENABLE_STYLES 3513#if ENABLE_STYLES
3814 case URxvt_boldFont: 3514 case URxvt_boldFont:
3815 case URxvt_italicFont: 3515 case URxvt_italicFont:
3816 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3817#endif 3517#endif
3818 if (query) 3518 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3822 resp); 3522 resp);
3823 else 3523 else
3824 { 3524 {
3825 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3826 3526
… …
3828 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3829 set_fonts (); 3529 set_fonts ();
3830 } 3530 }
3831 break; 3531 break;
3832 3532
3833#if ENABLE_FRILLS 3533 case URxvt_version:
3834 case XTerm_locale:
3835 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)
3836 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);
3837 else 3545 else
3838 { 3546 {
3839 set_locale (str); 3547 set_locale (str);
3840# ifdef USE_XIM 3548 pty->set_utf8_mode (enc_utf8);
3841 im_cb (); 3549 init_xlocale ();
3842# endif
3843 } 3550 }
3844 break; 3551 break;
3845#endif
3846 3552
3847#ifdef MENUBAR 3553 case URxvt_view_up:
3848 case XTerm_Menu: 3554 case URxvt_view_down:
3849 if (options & Opt_insecure) 3555 {
3850 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
3851 break; 3564 break;
3852#endif 3565#endif
3853#if 0 3566
3854 case XTerm_dumpscreen: /* no error notices */ 3567#if ENABLE_PERL
3855 { 3568 case URxvt_perl:
3856 int fd; 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3857 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3570 ; // no responses yet
3858 {
3859 scr_dump (fd);
3860 close (fd);
3861 }
3862 }
3863 break; 3571 break;
3864#endif 3572#endif
3865 } 3573 }
3866} 3574}
3867/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
… …
3898 return state; 3606 return state;
3899} 3607}
3900 3608
3901/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
3902void 3610void
3903rxvt_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)
3904{ 3612{
3905 unsigned int i, j; 3613 unsigned int i, j;
3906 int state; 3614 int state;
3907 3615
3908 static const struct 3616 static const struct
3909 { 3617 {
3910 const int argval; 3618 const int argval;
3911 const unsigned long bit; 3619 const unsigned long bit;
3912 }
3913
3914 argtopriv[] = { 3620 } argtopriv[] = {
3915 { 1, PrivMode_aplCUR }, 3621 { 1, PrivMode_aplCUR },
3916 { 2, PrivMode_vt52 }, 3622 { 2, PrivMode_vt52 },
3917 { 3, PrivMode_132 }, 3623 { 3, PrivMode_132 },
3918 { 4, PrivMode_smoothScroll }, 3624 { 4, PrivMode_smoothScroll },
3919 { 5, PrivMode_rVideo }, 3625 { 5, PrivMode_rVideo },
3920 { 6, PrivMode_relOrigin }, 3626 { 6, PrivMode_relOrigin },
3921 { 7, PrivMode_Autowrap }, 3627 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode 3628 // 8, bi-directional support mode
3923 { 9, PrivMode_MouseX10 }, 3629 { 9, PrivMode_MouseX10 },
3924#ifdef menuBar_esc
3925 { menuBar_esc, PrivMode_menuBar },
3926#endif
3927 // 18, 19 printing-related 3630 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor },
3929#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3930 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3931#endif 3634#endif
… …
3976 } 3679 }
3977 3680
3978 /* extra handling for values with state unkept */ 3681 /* extra handling for values with state unkept */
3979 switch (arg[i]) 3682 switch (arg[i])
3980 { 3683 {
3684#if ENABLE_STYLES
3685 case 1021:
3686 set_option (Opt_intensityStyles, mode);
3687
3688 scr_touch (true);
3689 break;
3690#endif
3981 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3982 case 1049: 3692 case 1049:
3983 if (options & Opt_secondaryScreen) 3693 if (option (Opt_secondaryScreen))
3984 if (mode == 0) 3694 if (mode == 0)
3985 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
3986 else if (mode == 1) 3696 else if (mode == 1)
3987 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
3988 break; 3698 break;
… …
4000 */ 3710 */
4001 PrivMode (1, PrivMode_vt52); 3711 PrivMode (1, PrivMode_vt52);
4002 break; 3712 break;
4003 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
4004 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3715 set_widthheight (((state ? 132 : 80) * fwidth), height);
4006 break; 3716 break;
4007 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
4008 if (state)
4009 options &= ~Opt_jumpScroll;
4010 else
4011 options |= Opt_jumpScroll; 3718 set_option (Opt_jumpScroll, !state);
4012 break; 3719 break;
4013 case 5: /* reverse video */ 3720 case 5: /* reverse video */
4014 scr_rvideo_mode (state); 3721 scr_rvideo_mode (state);
4015 break; 3722 break;
4016 case 6: /* relative/absolute origins */ 3723 case 6: /* relative/absolute origins */
… …
4022 /* 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 */
4023 case 9: /* X10 mouse reporting */ 3730 case 9: /* X10 mouse reporting */
4024 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
4025 priv_modes &= ~PrivMode_MouseX11; 3732 priv_modes &= ~PrivMode_MouseX11;
4026 break; 3733 break;
4027#ifdef menuBar_esc
4028 case menuBar_esc:
4029#ifdef MENUBAR
4030 map_menuBar (state);
4031#endif
4032 break;
4033#endif
4034#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
4035 case scrollBar_esc: 3735 case scrollBar_esc:
4036 if (scrollbar_mapping (state)) 3736 if (scrollbar_mapping (state))
4037 { 3737 {
4038 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
… …
4057#if 0 3757#if 0
4058 case 1001: 3758 case 1001:
4059 break; /* X11 mouse highlighting */ 3759 break; /* X11 mouse highlighting */
4060#endif 3760#endif
4061 case 1010: /* scroll to bottom on TTY output inhibit */ 3761 case 1010: /* scroll to bottom on TTY output inhibit */
4062 if (state)
4063 options &= ~Opt_scrollTtyOutput;
4064 else
4065 options |= Opt_scrollTtyOutput; 3762 set_option (Opt_scrollTtyOutput, !state);
4066 break; 3763 break;
4067 case 1011: /* scroll to bottom on key press */ 3764 case 1011: /* scroll to bottom on key press */
4068 if (state)
4069 options |= Opt_scrollTtyKeypress; 3765 set_option (Opt_scrollTtyKeypress, state);
4070 else
4071 options &= ~Opt_scrollTtyKeypress;
4072 break; 3766 break;
4073 case 1047: /* secondary screen w/ clearing last */ 3767 case 1047: /* secondary screen w/ clearing last */
4074 if (options & Opt_secondaryScreen) 3768 if (option (Opt_secondaryScreen))
4075 if (current_screen != PRIMARY) 3769 if (current_screen != PRIMARY)
4076 scr_erase_screen (2); 3770 scr_erase_screen (2);
4077 scr_change_screen (state); 3771 scr_change_screen (state);
4078 break; 3772 break;
4079 case 1049: /* secondary screen w/ clearing first */ 3773 case 1049: /* secondary screen w/ clearing first */
4080 scr_change_screen (state); 3774 scr_change_screen (state);
4081 if (options & Opt_secondaryScreen) 3775 if (option (Opt_secondaryScreen))
4082 if (current_screen != PRIMARY) 3776 if (current_screen != PRIMARY)
4083 scr_erase_screen (2); 3777 scr_erase_screen (2);
4084 break; 3778 break;
4085 default: 3779 default:
4086 break; 3780 break;
… …
4214 scr_color (Color_bg, Color_bg); 3908 scr_color (Color_bg, Color_bg);
4215 break; 3909 break;
4216 3910
4217 //case 50: // not variable spacing 3911 //case 50: // not variable spacing
4218 3912
4219#ifndef NO_BRIGHTCOLOR 3913#if !ENABLE_MINIMAL
4220 case 90: 3914 case 90:
4221 case 91: /* set bright fg color */ 3915 case 91: /* set bright fg color */
4222 case 92: 3916 case 92:
4223 case 93: 3917 case 93:
4224 case 94: 3918 case 94:
… …
4236 case 106: 3930 case 106:
4237 case 107: 3931 case 107:
4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3932 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4239 break; 3933 break;
4240#endif 3934#endif
4241
4242 } 3935 }
4243 } 3936 }
4244} 3937}
4245/*}}} */ 3938/*}}} */
4246 3939
… …
4270 */ 3963 */
4271void 3964void
4272rxvt_term::tt_printf (const char *fmt,...) 3965rxvt_term::tt_printf (const char *fmt,...)
4273{ 3966{
4274 va_list arg_ptr; 3967 va_list arg_ptr;
4275 unsigned char buf[256]; 3968 char buf[256];
4276 3969
4277 va_start (arg_ptr, fmt); 3970 va_start (arg_ptr, fmt);
4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3971 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4279 va_end (arg_ptr); 3972 va_end (arg_ptr);
4280 tt_write (buf, strlen (buf)); 3973 tt_write (buf, strlen (buf));
… …
4282 3975
4283/* ---------------------------------------------------------------------- */ 3976/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 3977/* Write data to the pty as typed by the user, pasted with the mouse,
4285 * or generated by us in response to a query ESC sequence. 3978 * or generated by us in response to a query ESC sequence.
4286 */ 3979 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981
4287void 3982void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3983rxvt_term::tt_write (const char *data, unsigned int len)
4289{ 3984{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3986 return;
4291 3987
4292 if (len) 3988 if (pty->pty < 0)
3989 return;
3990
3991 if (v_buflen == 0)
3992 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994
3995 if ((unsigned int)written == len)
3996 return;
3997
3998 data += written;
3999 len -= written;
4293 { 4000 }
4001
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4003
4004 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len;
4006
4007 pty_ev.set (EVENT_READ | EVENT_WRITE);
4008}
4009
4010void rxvt_term::pty_write ()
4011{
4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4013
4014 if (written > 0)
4015 {
4016 v_buflen -= written;
4017
4294 if (v_buflen == 0) 4018 if (v_buflen == 0)
4295 { 4019 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4020 free (v_buffer);
4323 v_buffer = 0; 4021 v_buffer = 0;
4324 v_buflen = 0; 4022 v_buflen = 0;
4325 4023
4326 pty_ev.set (EVENT_READ); 4024 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4025 return;
4339 } 4026 }
4027
4028 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4029 }
4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4031 pty_ev.set (EVENT_READ);
4341} 4032}
4342 4033
4343/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4344 4035

Diff Legend

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