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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC

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

Diff Legend

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