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

Diff Legend

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