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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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