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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

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

Diff Legend

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