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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC

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

Diff Legend

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