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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

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

Diff Legend

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