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.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.394 by ayin, Sat Jan 19 15:00:49 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#include <wchar.h> 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h"
57#endif
58
54#include <signal.h> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
55 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) \
… …
788#undef FKEY 786#undef FKEY
789 default: 787 default:
790 newlen = 0; 788 newlen = 0;
791 break; 789 break;
792 } 790 }
791
793 if (newlen) 792 if (newlen)
794 len = strlen (kbuf); 793 len = strlen (kbuf);
795 } 794 }
796 795
797 /* 796 /*
… …
806 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
807 { 806 {
808 len = 1; 807 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
811 else 815 else
812 { 816 {
813#ifdef META8_OPTION 817#ifdef META8_OPTION
814 /* set 8-bit on */ 818 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 819 if (meta && (meta_char == 0x80))
816 { 820 {
817 unsigned char *ch; 821 char *ch;
818 822
819 for (ch = kbuf; ch < kbuf + len; ch++) 823 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 824 *ch |= 0x80;
821 825
822 meta = 0; 826 meta = 0;
… …
824#endif 828#endif
825 /* nil */ ; 829 /* nil */ ;
826 } 830 }
827 } 831 }
828 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
829 if (len <= 0) 836 if (len <= 0)
830 return; /* not mapped */ 837 return; /* not mapped */
831 838
832 if (options & Opt_scrollTtyKeypress) 839 if (option (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 840 if (view_start)
834 { 841 {
835 TermWin.view_start = 0; 842 view_start = 0;
836 want_refresh = 1; 843 want_refresh = 1;
837 } 844 }
838 845
839 /* 846 /*
840 * these modifications only affect the static keybuffer 847 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 862#ifdef META8_OPTION
856 && meta_char == C0_ESC 863 && meta_char == C0_ESC
857#endif 864#endif
858 ) 865 )
859 { 866 {
860 const unsigned char ch = C0_ESC; 867 const char ch = C0_ESC;
861 tt_write (&ch, 1); 868 tt_write (&ch, 1);
862 } 869 }
863 870
864#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */
866 unsigned char *p;
867 int i;
868
869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
870 for (i = 0, p = kbuf; i < len; i++, p++)
871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
872 fprintf (stderr, "'\n");
873#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 871 tt_write (kbuf, (unsigned int)len);
875} 872}
876/*}}} */
877 873
878#if (MENUBAR_MAX) 874void
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 875rxvt_term::key_release (XKeyEvent &ev)
880/* 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)
881unsigned int 952unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 954{
884 unsigned int n, s; 955 unsigned int n, s;
885 956
886 n = cmdbuf_ptr - cmdbuf_base; 957 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 977
907 cmd_parse (); 978 cmd_parse ();
908 979
909 return 0; 980 return 0;
910} 981}
911#endif /* MENUBAR_MAX */ 982#endif
912 983
913void 984void
914rxvt_term::flush () 985rxvt_term::flush ()
915{ 986{
916 flush_ev.stop (); 987 flush_ev.stop ();
917 988
918#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
919 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
920 { 991 {
921 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
922 scr_clear ();
923 scr_touch (false); 993 scr_touch (false);
924 } 994 }
925#endif 995#endif
926 996
927 if (want_refresh) 997 if (want_refresh)
928 { 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
929 scr_refresh (refresh_type); 1037 scr_refresh ();
930 scrollbar_show (1); 1038 scrollbar_show (1);
931#ifdef USE_XIM 1039#ifdef USE_XIM
932 IMSendSpot (); 1040 IMSendSpot ();
933#endif 1041#endif
934 } 1042 }
935 1043
936 display->flush (); 1044 display->flush ();
937} 1045}
938 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
939void 1048void
940rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
941{ 1050{
942 SET_R (this); 1051 if (want_refresh && !flush_ev.is_active ())
943 SET_LOCALE (locale); 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
944 1053
945 display->flush (); 1054 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949} 1055}
950 1056
951void 1057void
952rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
953{ 1059{
954 SET_R (this); 1060 make_current ();
955 SET_LOCALE (locale);
956 1061
957 refresh_limit = 1;
958 refresh_count = 0; 1062 refresh_count = 0;
959 flush (); 1063 flush ();
960} 1064}
961 1065
962#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
963void 1067void
964rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
965{ 1069{
966 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1071 want_refresh = 1;
968 1072 refresh_check ();
969 w.start (w.at + BLINK_INTERVAL);
970} 1073}
971#endif 1074#endif
972 1075
973#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
974void 1077void
975rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
976{ 1079{
977 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
978 { 1081 {
979 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
980 want_refresh = 1; 1083 want_refresh = 1;
981 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
982 } 1085 }
1086 else
1087 w.stop ();
983} 1088}
984#endif 1089#endif
985 1090
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void 1092void
988rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
989{ 1094{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
992 { 1097 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1098 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
996 } 1100 }
1101 else
1102 w.stop ();
997} 1103}
998#endif 1104#endif
999 1105
1000#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1001void 1107void
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1003{ 1109{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1111 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1113 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1010 } 1115 }
1116 else
1117 w.stop ();
1011} 1118}
1012#endif 1119#endif
1013 1120
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void 1122void
1016rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1017{ 1124{
1018 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1126 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1127 want_refresh = 1;
1024 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)
1025 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1026} 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;
1027#endif 1162#endif
1028 1163
1029bool 1164bool
1030rxvt_term::pty_fill () 1165rxvt_term::pty_fill ()
1031{ 1166{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1168
1034 if (CBUFSIZ == n) 1169 if (CBUFSIZ == n)
1035 { 1170 {
1036 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");
1037 n = 0; 1172 n = 0;
1038 } 1173 }
1039 1174
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1176 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1177 cmdbuf_endp = cmdbuf_ptr + n;
1043 1178
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1180
1046 if (n > 0) 1181 if (r > 0)
1047 { 1182 {
1048 cmdbuf_endp += n; 1183 cmdbuf_endp += r;
1049 return true; 1184 return true;
1050 } 1185 }
1051 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))
1052 destroy (); 1198 destroy ();
1053 1199 }
1200
1054 return false; 1201 return false;
1055} 1202}
1056 1203
1057void 1204void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1059{ 1206{
1060 SET_R (this); 1207 make_current ();
1061 SET_LOCALE (locale);
1062 1208
1063 if (revents & EVENT_WRITE) 1209 if (revents & ev::READ)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1211 while (pty_fill ())
1068 if (cmd_parse ()) 1212 if (cmd_parse ())
1069 break; 1213 break;
1214
1215 if (revents & ev::WRITE)
1216 pty_write ();
1217
1218 refresh_check ();
1070} 1219}
1071 1220
1072void 1221void
1073rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1074{ 1223{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1076 recolour_cursor (); 1225 recolour_cursor ();
1077 1226
1078#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1228 hidden_pointer = 0;
1080 1229
1081 if (options & Opt_pointerBlank) 1230 if (option (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1083#endif 1232#endif
1084} 1233}
1085 1234
1086#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1087void 1236void
1088rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1089{ 1238{
1090 if (! (options & Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1091 return; 1240 return;
1092 1241
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1094 XFlush (display->display); 1243 XFlush (dpy);
1095 1244
1096 hidden_pointer = 1; 1245 hidden_pointer = 1;
1097} 1246}
1098 1247
1099void 1248void
1100rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1101{ 1250{
1102 SET_R (this); 1251 make_current ();
1103 SET_LOCALE (locale);
1104 1252
1105 pointer_blank (); 1253 pointer_blank ();
1106} 1254}
1107#endif 1255#endif
1108 1256
1109void 1257void
1110rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1111{ 1259{
1112 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1113 int x, y; 1261 int x, y;
1262 int code = 32;
1114 1263
1115 x = ev.x; 1264 x = Pixel2Col (ev.x);
1116 y = ev.y; 1265 y = Pixel2Row (ev.y);
1117 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 }
1118 1274
1119 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1120 button_number = 3; 1276 button_number = 3;
1121 else 1277 else
1122 { 1278 {
… …
1168 x + 1, 1324 x + 1,
1169 y + 1); 1325 y + 1);
1170#endif 1326#endif
1171 1327
1172 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1173 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1174 (32 + x + 1), 1330 (32 + x + 1),
1175 (32 + y + 1)); 1331 (32 + y + 1));
1176} 1332}
1177
1178#ifdef USING_W11LIB
1179void
1180rxvt_W11_process_x_event (XEvent *ev)
1181{
1182 rxvt_t *r = rxvt_get_r ();
1183
1184 x_cb (*ev);
1185}
1186#endif
1187 1333
1188/*{{{ process an X event */ 1334/*{{{ process an X event */
1189void 1335void
1190rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1191{ 1337{
1192 SET_R (this); 1338 make_current ();
1193 SET_LOCALE (locale);
1194 1339
1195#if defined(CURSOR_BLINK) 1340 dLocal (Display *, dpy);
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1197 {
1198 if (hidden_cursor)
1199 {
1200 hidden_cursor = 0;
1201 want_refresh = 1;
1202 }
1203 1341
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1342 if (ev.xany.window == vt
1205 } 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1206#endif 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1345 return;
1207 1346
1208#if defined(POINTER_BLANK) 1347 // for XQueryPointer
1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1210 {
1211 if (ev.type == MotionNotify
1212 || ev.type == ButtonPress
1213 || ev.type == ButtonRelease)
1214 if (hidden_pointer)
1215 pointer_unblank ();
1216
1217 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank ();
1219 }
1220#endif
1221
1222 Window unused_root, unused_child; 1348 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1349 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1350 unsigned int unused_mask;
1225 1351
1226 switch (ev.type) 1352 switch (ev.type)
1227 { 1353 {
1228 case KeyPress: 1354 case KeyPress:
1229#if ISO_14755 1355 key_press (ev.xkey);
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1232 lookup_key (ev.xkey);
1233
1234 break; 1356 break;
1235 1357
1236 case KeyRelease: 1358 case KeyRelease:
1237 { 1359 key_release (ev.xkey);
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1297
1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1302 mouse_slip_wheel_speed = 0;
1303#endif
1304 break; 1360 break;
1305 }
1306 1361
1307 case ButtonPress: 1362 case ButtonPress:
1308 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1309 break; 1364 break;
1310 1365
… …
1312 button_release (ev.xbutton); 1367 button_release (ev.xbutton);
1313 break; 1368 break;
1314 1369
1315 case ClientMessage: 1370 case ClientMessage:
1316 if (ev.xclient.format == 32 1371 if (ev.xclient.format == 32
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1372 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1318 destroy ();
1319#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink))
1325 { 1373 {
1326 /* Get Dnd data */ 1374 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1327 Atom ActualType; 1375 {
1328 int ActualFormat; 1376 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1329 unsigned char *data; 1377 {
1330 unsigned long Size, RemainingBytes; 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1331 1379 {
1332 XGetWindowProperty (display->display, display->root, 1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1333 xa[XA_DNDSELECTION], 1381 destroy ();
1334 0L, 1000000L, 1382 }
1335 False, AnyPropertyType, 1383#if ENABLE_EWMH
1336 &ActualType, &ActualFormat, 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1337 &Size, &RemainingBytes, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1338 &data); 1387 &ev);
1339 XChangeProperty (display->display, display->root, 1388#endif
1340 XA_CUT_BUFFER0, XA_STRING, 1389 }
1341 8, PropModeReplace, 1390 }
1342 data, strlen (data)); 1391#if ENABLE_XEMBED
1343 XFree (data); 1392 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1393 {
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 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
1346 } 1400 }
1347#endif /* OFFIX_DND */
1348 break;
1349
1350 case MappingNotify:
1351 XRefreshKeyboardMapping (&ev.xmapping);
1352 break; 1401 break;
1353 1402
1354 /* 1403 /*
1355 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1356 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1375 break; 1424 break;
1376 } 1425 }
1377 break; 1426 break;
1378 1427
1379 case FocusIn: 1428 case FocusIn:
1380 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])
1381 { 1447 {
1382 TermWin.focus = 1; 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1383 want_refresh = 1;
1384#ifdef USE_XIM
1385 if (Input_Context != NULL)
1386 { 1449 ;
1387 IMSetStatusPosition ();
1388 XSetICFocus (Input_Context);
1389 }
1390#endif
1391#ifdef CURSOR_BLINK
1392 if (options & Opt_cursorBlink)
1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1401#endif
1402 1450
1403 }
1404 break;
1405
1406 case FocusOut:
1407 if (TermWin.focus)
1408 {
1409 TermWin.focus = 0;
1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1418#ifdef USE_XIM
1419 if (Input_Context != NULL)
1420 XUnsetICFocus (Input_Context);
1421#endif
1422#ifdef CURSOR_BLINK
1423 if (options & Opt_cursorBlink)
1424 cursor_blink_ev.stop ();
1425 hidden_cursor = 0;
1426#endif
1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1434 }
1435 break;
1436
1437 case ConfigureNotify:
1438 if (ev.xconfigure.window == TermWin.parent[0])
1439 {
1440 int height, width;
1441
1442 do
1443 { /* Wrap lots of configures into one */
1444 width = ev.xconfigure.width;
1445 height = ev.xconfigure.height;
1446 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447 }
1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1449
1450 if (szHint.width != width || szHint.height != height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1452 {
1452 seen_resize = 1; 1453 seen_resize = 1;
1453 resize_all_windows (width, height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1455 }
1455 1456 else
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent)
1458 { 1457 {
1459 check_our_parents (); 1458#ifdef HAVE_BG_PIXMAP
1460 if (am_transparent) 1459 if (bgPixmap.window_position_sensitive ())
1461 want_refresh = want_full_refresh = 1; 1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1462 } 1467 }
1463#endif 1468
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1470 }
1465 break; 1471 break;
1466 1472
1467 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471 1478
1472 break; 1479 break;
1473 1480
1474 case SelectionClear: 1481 case SelectionClear:
1475 selection_clear (); 1482 selection_clear ();
1476 break; 1483 break;
1477 1484
1478 case SelectionNotify: 1485 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1486 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1488 break;
1483 1489
1484 case SelectionRequest: 1490 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1486 break; 1492 break;
1487 1493
1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1511 mapped = 1;
1512#ifdef TEXT_BLINK
1513 text_blink_ev.start ();
1514#endif
1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 break;
1517
1488 case UnmapNotify: 1518 case UnmapNotify:
1489 TermWin.mapped = 0; 1519 mapped = 0;
1490#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1491 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1492#endif 1522#endif
1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 break; 1524 break;
1494
1495 case MapNotify:
1496 TermWin.mapped = 1;
1497#ifdef TEXT_BLINK
1498 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1499#endif
1500 break;
1501
1502#ifdef TRANSPARENT
1503 case ReparentNotify:
1504 rootwin_cb (ev);
1505 break;
1506#endif /* TRANSPARENT */
1507 1525
1508 case GraphicsExpose: 1526 case GraphicsExpose:
1509 case Expose: 1527 case Expose:
1510 if (ev.xany.window == TermWin.vt) 1528 if (ev.xany.window == vt)
1511 { 1529 {
1512 do 1530 do
1531 {
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1516 1536
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518 1538
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1522 1544
1523 scr_refresh (refresh_type); 1545 want_refresh = 1;
1524 } 1546 }
1525 else 1547 else
1526 { 1548 {
1527 XEvent unused_event; 1549 XEvent unused_event;
1528 1550
1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530 ; 1552 ;
1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1554 ;
1533 1555
1534 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1535 { 1557 {
1536 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1537 scrollbar_show (0); 1559 scrollbar_show (0);
1538 } 1560 }
1539#ifdef MENUBAR
1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1541 menubar_expose ();
1542#endif
1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1548 } 1561 }
1549 break; 1562 break;
1550 1563
1551 case MotionNotify: 1564 case MotionNotify:
1552#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1553 if (hidden_pointer) 1566 if (hidden_pointer)
1554 pointer_unblank (); 1567 pointer_unblank ();
1555#endif 1568#endif
1556#if MENUBAR 1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1557 if (isMenuBarWindow (ev.xany.window)) 1570 || priv_modes & PrivMode_MouseAnyEvent)
1558 {
1559 menubar_control (ev.xbutton); 1571 mouse_report (ev.xbutton);
1560 break;
1561 }
1562#endif
1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1564 break; 1573 break;
1565 1574
1566 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == vt)
1567 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop
1568 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1581 {
1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1583 ;
1572 1584
1573 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1589 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1590#endif 1602#endif
1591 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1592 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1593 1605
1594#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1595 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1597 { 1609 {
1598 int dist; 1610 int dist;
1599 1611
1600 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1602 */ 1614 */
1603 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1617
1606 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1608 */ 1620 */
1609 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1610 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1612 1624
1613 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1614 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1615 { 1627 {
1616 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1617 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1618 } 1630 }
1619 else 1631 else
1620 { 1632 {
1621 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1623 } 1635 }
1624 1636
1625 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1626 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1; 1639 + 1;
1628 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1629 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1630 } 1642 }
1631 else 1643 else
1632 { 1644 {
1633 /* we are within the text window, so we 1645 /* we are within the text window, so we
1634 * shouldn't be scrolling 1646 * shouldn't be scrolling
1635 */ 1647 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1638 } 1649 }
1639#endif 1650#endif
1640#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1641 } 1652 }
1642#endif 1653#endif
1643 } 1654 }
1644 } 1655 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1646 { 1657 {
1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1649 ; 1660 ;
1650 1661
1651 XQueryPointer (display->display, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1666 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1668 scrollbar_size ());
1658 scr_refresh (refresh_type);
1659 refresh_limit = 0; 1669 want_refresh = 1;
1660 scrollbar_show (1); 1670 scrollbar_show (1);
1661 } 1671 }
1662 break; 1672 break;
1663 } 1673 }
1664}
1665 1674
1666#if TRANSPARENT 1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again ();
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701
1702 refresh_check ();
1703}
1704
1705void
1706rxvt_term::focus_in ()
1707{
1708 if (!focus)
1709 {
1710 focus = 1;
1711 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM
1716 if (Input_Context != NULL)
1717 {
1718 IMSetPosition ();
1719 XSetICFocus (Input_Context);
1720 }
1721#endif
1722#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.again ();
1725#endif
1726#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade])
1728 {
1729 pix_colors = pix_colors_focused;
1730 scr_recolour ();
1731 }
1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1743 }
1744}
1745
1746void
1747rxvt_term::focus_out ()
1748{
1749 if (focus)
1750 {
1751 focus = 0;
1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1756#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf)
1758 {
1759 iso14755buf = 0;
1760# if ISO_14755
1761 scr_overlay_off ();
1762# endif
1763 }
1764#endif
1765#if USE_XIM
1766 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context);
1768#endif
1769#if CURSOR_BLINK
1770 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.stop ();
1772
1773 hidden_cursor = 0;
1774#endif
1775#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade])
1777 {
1778 pix_colors = pix_colors_unfocused;
1779 scr_recolour ();
1780 }
1781#endif
1782 }
1783}
1784
1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1667void 1799void
1668rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1669{ 1801{
1670 SET_R (this); 1802 make_current ();
1671 SET_LOCALE (locale);
1672 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1673 switch (ev.type) 1809 switch (ev.type)
1674 { 1810 {
1675 case PropertyNotify: 1811 case PropertyNotify:
1676 /* 1812 /*
1677 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1678 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1679 */ 1815 */
1680 if (xa[XA_XROOTPMAPID] == 0)
1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1684 return; 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1685 1822
1686 /* FALLTHROUGH */
1687 case ReparentNotify:
1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1689 want_refresh = want_full_refresh = 1;
1690 break; 1823 break;
1691 } 1824 }
1825# endif
1826
1827 refresh_check ();
1692} 1828}
1693#endif 1829#endif
1694 1830
1695void 1831void
1696rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
1697{ 1833{
1698 int reportmode = 0, clickintime; 1834 int reportmode = 0, clickintime;
1699 1835
1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1836 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1837
1701 if (!bypass_keystate) 1838 if (!bypass_keystate)
1702 reportmode = !! (priv_modes & PrivMode_mouse_report); 1839 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703 1840
1704 /* 1841 /*
1705 * VT window processing of button press 1842 * VT window processing of button press
1706 */ 1843 */
1707 if (ev.window == TermWin.vt) 1844 if (ev.window == vt)
1708 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1709#if ISO_14755 1849#if ISO_14755
1710 // 5.4 1850 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 { 1852 {
1713 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1725#ifdef MOUSE_REPORT_DOUBLECLICK 1865#ifdef MOUSE_REPORT_DOUBLECLICK
1726 if (ev.button == MEvent.button && clickintime) 1866 if (ev.button == MEvent.button && clickintime)
1727 { 1867 {
1728 /* same button, within alloted time */ 1868 /* same button, within alloted time */
1729 MEvent.clicks++; 1869 MEvent.clicks++;
1870
1730 if (MEvent.clicks > 1) 1871 if (MEvent.clicks > 1)
1731 { 1872 {
1732 /* only report double clicks */ 1873 /* only report double clicks */
1733 MEvent.clicks = 2; 1874 MEvent.clicks = 2;
1734 mouse_report (ev); 1875 mouse_report (ev);
… …
1746 mouse_report (ev); 1887 mouse_report (ev);
1747 } 1888 }
1748#else 1889#else
1749 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1750 mouse_report (ev); 1891 mouse_report (ev);
1751#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1752 1893
1753 } 1894 }
1754 else 1895 else
1755 { 1896 {
1756 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1760 { 1901 {
1761 case Button1: 1902 case Button1:
1762 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1764#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1766#else 1907#else
1767 selection.rect = false; 1908 selection.rect = false;
1768#endif 1909#endif
1769 1910
1770 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1772 { 1913 {
1773 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1774 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1775 else 1916 else
1776 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
… …
1804 } 1945 }
1805 1946
1806 /* 1947 /*
1807 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1808 */ 1949 */
1809 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1810 { 1951 {
1811 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1812 /* 1953 /*
1813 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1814 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1850 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1851 break; 1992 break;
1852 } 1993 }
1853 } 1994 }
1854 else 1995 else
1855#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1856 1997
1857 { 1998 {
1858 char upordown = 0; 1999 char upordown = 0;
1859 2000
1860 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1861 { 2002 {
1862 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1863 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
1869 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1870 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1871 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1872 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1873 } 2014 }
2015
1874 if (upordown) 2016 if (upordown)
1875 { 2017 {
1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1878#endif 2021#endif
1879 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
1880 { 2023 {
1881 if (upordown < 0) 2024 if (upordown < 0)
1882 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
1886 } 2029 }
1887 else 2030 else
1888 switch (ev.button) 2031 switch (ev.button)
1889 { 2032 {
1890 case Button2: 2033 case Button2:
1891 switch (scrollbar_align) 2034 switch (scrollBar.align)
1892 { 2035 {
1893 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
1894 csrO = 0; 2037 csrO = 0;
1895 break; 2038 break;
1896 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
1908 2051
1909 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
1910 break; 2053 break;
1911 2054
1912 case Button1: 2055 case Button1:
1913 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1914 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
1915 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
1916 2059
1917 case Button3: 2060 case Button3:
1918 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
1919 { 2062 {
1920 if (scrollbar_above_slider (ev.y)) 2063 if (scrollbar_above_slider (ev.y))
1921# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1922 scr_page (UP, TermWin.nrow - 1); 2065 scr_page (UP, nrow - 1);
1923# else 2066# else
1924 scr_page (UP, TermWin.nrow / 4); 2067 scr_page (UP, nrow / 4);
1925# endif 2068# endif
1926 else if (scrollbar_below_slider (ev.y)) 2069 else if (scrollbar_below_slider (ev.y))
1927# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1928 scr_page (DN, TermWin.nrow - 1); 2071 scr_page (DN, nrow - 1);
1929# else 2072# else
1930 scr_page (DN, TermWin.nrow / 4); 2073 scr_page (DN, nrow / 4);
1931# endif 2074# endif
1932 else 2075 else
1933 scrollBar.setMotion (); 2076 scrollBar.setMotion ();
1934 } 2077 }
1935 else 2078 else
1936 { 2079 {
1937 scr_page ((ev.button == Button1 ? DN : UP), 2080 scr_page ((ev.button == Button1 ? DN : UP),
1938 (TermWin.nrow 2081 (nrow
1939 * scrollbar_position (ev.y) 2082 * scrollbar_position (ev.y)
1940 / scrollbar_size ())); 2083 / scrollbar_size ()));
1941 } 2084 }
1942 2085
1943 break; 2086 break;
1944 } 2087 }
1945 } 2088 }
2089
1946 return; 2090 return;
1947 } 2091 }
1948#if MENUBAR
1949 /*
1950 * Menubar window processing of button press
1951 */
1952 if (isMenuBarWindow (ev.window))
1953 menubar_control (ev);
1954#endif
1955} 2092}
1956 2093
1957void 2094void
1958rxvt_term::button_release (XButtonEvent &ev) 2095rxvt_term::button_release (XButtonEvent &ev)
1959{ 2096{
… …
1965 2102
1966 if (scrollbar_isUpDn ()) 2103 if (scrollbar_isUpDn ())
1967 { 2104 {
1968 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
1969 scrollbar_show (0); 2106 scrollbar_show (0);
1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1971 refresh_type &= ~SMOOTH_REFRESH;
1972#endif
1973 } 2107 }
1974 2108
1975#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
1978#endif 2111#endif
1979 2112
1980 if (ev.window == TermWin.vt) 2113 if (ev.window == vt)
1981 { 2114 {
2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2116 return;
2117
1982#if ISO_14755 2118#if ISO_14755
1983 // 5.4 2119 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2120 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return; 2121 return;
1986#endif 2122#endif
2123
1987 if (reportmode) 2124 if (reportmode)
1988 { 2125 {
1989 /* mouse report from vt window */ 2126 /* mouse report from vt window */
1990 /* don't report release of wheel "buttons" */ 2127 /* don't report release of wheel "buttons" */
1991 if (ev.button >= 4) 2128 if (ev.button >= 4)
… …
2002 mouse_report (ev); 2139 mouse_report (ev);
2003 } 2140 }
2004#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2005 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2006 mouse_report (ev); 2143 mouse_report (ev);
2007#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2008 return; 2145 return;
2009 } 2146 }
2010 2147
2011 /* 2148 /*
2012 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2021 { 2158 {
2022 case Button1: 2159 case Button1:
2023 case Button3: 2160 case Button3:
2024 selection_make (ev.time); 2161 selection_make (ev.time);
2025 break; 2162 break;
2163
2026 case Button2: 2164 case Button2:
2027 selection_request (ev.time, ev.x, ev.y); 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2028 break; 2167 break;
2168
2029#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2030 case Button4: 2170 case Button4:
2031 case Button5: 2171 case Button5:
2032 { 2172 {
2033 int i; 2173 int i;
… …
2035 2175
2036 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2037 2177
2038 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2039 i = 1; 2179 i = 1;
2040 else if (options & Opt_mouseWheelScrollPage) 2180 else if (option (Opt_mouseWheelScrollPage))
2041 i = TermWin.nrow - 1; 2181 i = nrow - 1;
2042 else 2182 else
2043 i = 5; 2183 i = 5;
2044 2184
2045# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
2046 if (ev.state & ControlMask) 2186 if (ev.state & ControlMask)
2047 { 2187 {
2048 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2051 2191
2052 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2054
2055 slip_wheel_ev.start ();
2056 } 2194 }
2057 else 2195 else
2196# endif
2058 { 2197 {
2059# endif
2060# ifdef JUMP_MOUSE_WHEEL
2061 scr_page (v, i); 2198 scr_page (v, i);
2062 scr_refresh (SMOOTH_REFRESH);
2063 scrollbar_show (1); 2199 scrollbar_show (1);
2064# else
2065 while (i--)
2066 {
2067 scr_page (v, 1);
2068 scr_refresh (SMOOTH_REFRESH);
2069 scrollbar_show (1);
2070 }
2071# endif
2072# ifdef MOUSE_SLIP_WHEELING
2073 } 2200 }
2074#endif
2075 } 2201 }
2076 break; 2202 break;
2077#endif 2203#endif
2078 } 2204 }
2079 } 2205 }
2080#ifdef MENUBAR
2081 else if (isMenuBarWindow (ev.window))
2082 menubar_control (ev);
2083#endif
2084} 2206}
2085
2086#ifdef TRANSPARENT
2087#if TINTING
2088/* taken from aterm-0.4.2 */
2089
2090typedef uint32_t RUINT32T;
2091
2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2093{
2094 int sh_r, sh_g, sh_b;
2095 RUINT32T mask_r, mask_g, mask_b;
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
2100
2101 Visual* visual = display->visual;
2102
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104
2105 /* for convenience */
2106 mask_r = visual->red_mask;
2107 mask_g = visual->green_mask;
2108 mask_b = visual->blue_mask;
2109
2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2183 } else {
2184 if (shade < 0) shade = 0;
2185 if (shade > 100) shade = 100;
2186
2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2188
2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2192 }
2193
2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2196 {
2197 unsigned int tmp;
2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2250 }
2251 break;
2252 }
2253 case 16:
2254 {
2255 unsigned short *p1, *pf, *p, *pl;
2256 p1 = (unsigned short *) srcImage->data;
2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2258 while (p1 < pf)
2259 {
2260 p = p1;
2261 pl = p1 + srcImage->width;
2262 for (; p < pl; p++)
2263 {
2264 *p = lookup_r[(*p & 0xf800)>>11] |
2265 lookup_g[(*p & 0x07e0)>> 5] |
2266 lookup_b[(*p & 0x001f)];
2267 }
2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2288 }
2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2296
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xff0000)>>16] |
2304 lookup_g[(*p & 0x00ff00)>> 8] |
2305 lookup_b[(*p & 0x0000ff)] |
2306 (*p & ~0xffffff);
2307 }
2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2309 }
2310 break;
2311 }
2312 }
2313
2314 free (lookup);
2315}
2316#endif
2317
2318/*
2319 * Check our parents are still who we think they are.
2320 * Do transparency updates if required
2321 */
2322int
2323rxvt_term::check_our_parents ()
2324{
2325 int i, pchanged, aformat, have_pixmap, rootdepth;
2326 unsigned long nitems, bytes_after;
2327 Atom atype;
2328 unsigned char *prop = NULL;
2329 Window root, oldp, *list;
2330 Pixmap rootpixmap = None;
2331 XWindowAttributes wattr, wrootattr;
2332
2333 pchanged = 0;
2334
2335 if (!(options & Opt_transparent))
2336 return pchanged; /* Don't try any more */
2337
2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
2339 rootdepth = wrootattr.depth;
2340
2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2342
2343 if (rootdepth != wattr.depth)
2344 {
2345 if (am_transparent)
2346 {
2347 pchanged = 1;
2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2349 am_transparent = am_pixmap_trans = 0;
2350 }
2351
2352 return pchanged; /* Don't try any more */
2353 }
2354
2355 /* Get all X ops out of the queue so that our information is up-to-date. */
2356 XSync (display->display, False);
2357
2358 /*
2359 * Make the frame window set by the window manager have
2360 * the root background. Some window managers put multiple nested frame
2361 * windows for each client, so we have to take care about that.
2362 */
2363 i = (xa[XA_XROOTPMAPID]
2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366 &nitems, &bytes_after, &prop) == Success);
2367
2368 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success);
2373
2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
2379 have_pixmap = 0;
2380 else
2381 {
2382 have_pixmap = 1;
2383 rootpixmap = *(Pixmap *)prop;
2384 XFree (prop);
2385 }
2386
2387 if (have_pixmap)
2388 {
2389 /*
2390 * Copy display->root pixmap transparency
2391 */
2392 int sx, sy, nx, ny;
2393 unsigned int nw, nh;
2394 Window cr;
2395 XImage *image;
2396 GC gc;
2397 XGCValues gcvalue;
2398
2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2400 0, 0, &sx, &sy, &cr);
2401 nw = (unsigned int)szHint.width;
2402 nh = (unsigned int)szHint.height;
2403 nx = ny = 0;
2404
2405 if (sx < 0)
2406 {
2407 nw += sx;
2408 nx = -sx;
2409 sx = 0;
2410 }
2411
2412 if (sy < 0)
2413 {
2414 nh += sy;
2415 ny = -sy;
2416 sy = 0;
2417 }
2418
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2421 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */
2426 allowedxerror = 0;
2427
2428 if (image == NULL)
2429 {
2430 if (am_transparent && am_pixmap_trans)
2431 {
2432 pchanged = 1;
2433 if (TermWin.pixmap != None)
2434 {
2435 XFreePixmap (display->display, TermWin.pixmap);
2436 TermWin.pixmap = None;
2437 }
2438 }
2439
2440 am_pixmap_trans = 0;
2441 }
2442 else
2443 {
2444 if (TermWin.pixmap != None)
2445 XFreePixmap (display->display, TermWin.pixmap);
2446
2447#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint))
2449 {
2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2452
2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2454
2455 ShadeXImage (display, image, shade, rm, gm, bm);
2456 }
2457#endif
2458
2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2460 szHint.width, szHint.height, image->depth);
2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2463 nx, ny, image->width, image->height);
2464 XFreeGC (display->display, gc);
2465 XDestroyImage (image);
2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2467 XClearWindow (display->display, TermWin.parent[0]);
2468
2469 if (!am_transparent || !am_pixmap_trans)
2470 pchanged = 1;
2471
2472 am_transparent = am_pixmap_trans = 1;
2473 }
2474 }
2475
2476 if (!am_pixmap_trans)
2477 {
2478 unsigned int n;
2479 /*
2480 * InheritPixmap transparency
2481 */
2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2483 {
2484 oldp = TermWin.parent[i];
2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2486 &TermWin.parent[i], &list, &n);
2487 XFree (list);
2488
2489 if (TermWin.parent[i] == display->root)
2490 {
2491 if (oldp != None)
2492 pchanged = 1;
2493
2494 break;
2495 }
2496
2497 if (oldp != TermWin.parent[i])
2498 pchanged = 1;
2499 }
2500
2501 n = 0;
2502
2503 if (pchanged)
2504 {
2505 for (; n < (unsigned int)i; n++)
2506 {
2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2509 {
2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2511 break;
2512 }
2513 }
2514 }
2515
2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2517 {
2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2520 am_transparent = 0;
2521 /* XXX: also turn off Opt_transparent? */
2522 }
2523 else
2524 {
2525#if WAIT_FOR_WM
2526 /* wait (an arbitrary period) for the WM to do its thing
2527 * needed for fvwm2.2.2 (and before?) */
2528 sleep (1);
2529#endif
2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2535
2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2537 am_transparent = 1;
2538 }
2539
2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2541 TermWin.parent[i] = None;
2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2549 }
2550
2551 return pchanged;
2552}
2553#endif
2554 2207
2555/*}}} */ 2208/*}}} */
2556 2209
2557bool 2210bool
2558rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2559{ 2212{
2560 bool flag = false; 2213 bool flag = false;
2561 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2562 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2563 2216
2564 for (;;) 2217 for (;;)
2565 { 2218 {
2566 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
2567 { 2220 {
2568 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2569 ch = next_char (); 2222 ch = next_char ();
2570 }
2571 2223
2572 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2573 break; 2225 break;
2226 }
2574 2227
2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 { 2229 {
2577 if (!seen_input) 2230 if (!seen_input)
2578 { 2231 {
… …
2582 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong. 2236 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike 2237 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being 2238 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized. 2239 // resized.
2587 if (seen_resize) 2240 if (seen_resize && cmd_pid)
2588 kill (-cmd_pid, SIGWINCH); 2241 kill (-cmd_pid, SIGWINCH);
2589 } 2242 }
2590 2243
2591 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2593 bool refreshnow = false; 2246 bool refreshnow = false;
2594 int nlines = 0; 2247 int nlines = 0;
2595 unicode_t *str = buf; 2248 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2596 2250
2597 for (;;) 2251 for (;;)
2598 { 2252 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break; 2254 break;
2601 2255
2602 *str++ = ch; 2256 *str++ = ch;
2603 2257
2604 if (ch == C0_LF) 2258 if (ch == C0_LF || str >= eol)
2605 { 2259 {
2260 if (ch == C0_LF)
2606 nlines++; 2261 nlines++;
2262
2607 refresh_count++; 2263 refresh_count++;
2608 2264
2609 if (!(options & Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2611 { 2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2612 refreshnow = true; 2271 refreshnow = true;
2613 ch = NOCHAR; 2272 ch = NOCHAR;
2614 break; 2273 break;
2274 }
2615 } 2275 }
2616 2276
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2618 if (nlines >= TermWin.nrow - 1) 2278 if (nlines >= nrow - 1)
2619 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2620 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2283
2621 nlines = 0; 2284 nlines = 0;
2622 str = buf; 2285 str = buf;
2286 eol = str + min (ncol, UBUFSIZ);
2623 } 2287 }
2624 }
2625 2288
2626 if (str >= buf + UBUFSIZ) 2289 if (str >= eol)
2627 { 2290 {
2291 if (eol >= buf + UBUFSIZ)
2292 {
2628 ch = NOCHAR; 2293 ch = NOCHAR;
2629 break; 2294 break;
2295 }
2296 else
2297 eol = min (eol + ncol, buf + UBUFSIZ);
2298 }
2299
2630 } 2300 }
2631 2301
2632 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2633 ch = next_char (); 2303 ch = next_char ();
2634 } 2304 }
2635 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2636 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2637 2309
2638 /* 2310 /*
2639 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2640 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2641 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2642 * is incremented here because we must be doing flat-out scrolling.
2643 */ 2314 */
2644 if (refreshnow) 2315 if (refreshnow)
2645 { 2316 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++;
2648 else
2649 {
2650 flag = true; 2317 flag = true;
2651 scr_refresh (refresh_type); 2318 scr_refresh ();
2652 } 2319 want_refresh = 1;
2653 } 2320 }
2654 2321
2655 } 2322 }
2656 else 2323 else
2657 { 2324 {
… …
2671 } 2338 }
2672 2339
2673 return flag; 2340 return flag;
2674} 2341}
2675 2342
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2685// read the next character 2343// read the next character
2686unicode_t 2344wchar_t
2687rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2688{ 2346{
2689 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2690 { 2348 {
2691 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2692 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2693 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2694 2352
2695 wchar_t wc; 2353 wchar_t wc;
2696 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2697 2355
2698 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2699 { 2357 {
2700 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2701 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2702 break; 2360 break;
2703 } 2361 }
2704 2362
2705 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707 2365
2708 // assume wchar == unicode 2366 // assume wchar == unicode
2709 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2710 return wc; 2368 return wc & UNICODE_MASK;
2711 } 2369 }
2712 2370
2713 return NOCHAR; 2371 return NOCHAR;
2714} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2715 2384
2716/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2717/* 2386/*
2718 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2719 * to the command. 2388 * to the command.
2720 */ 2389 */
2721unicode_t 2390wchar_t
2722rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2723{ 2392{
2724 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2725 2394
2726 if (c == NOCHAR) 2395 if (c == NOCHAR)
2727 throw out_of_input; 2396 throw out_of_input;
2728 2397
2729 return c; 2398 return c;
2730} 2399}
2731 2400
2732unicode_t 2401uint32_t
2733rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2734{ 2403{
2735 unicode_t c = next_octet (); 2404 uint32_t c = next_octet ();
2736 2405
2737 if (c == NOCHAR) 2406 if (c == NOCHAR)
2738 throw out_of_input; 2407 throw out_of_input;
2739 2408
2740 return c; 2409 return c;
… …
2804 { 2473 {
2805 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2806 break; /* done = 1 */ 2475 break; /* done = 1 */
2807 } 2476 }
2808 } 2477 }
2809 2478
2810 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2811 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2812 { 2481 {
2813 done = 1; 2482 done = 1;
2814 break; 2483 break;
… …
2816 } 2485 }
2817 } 2486 }
2818 2487
2819 pclose_printer (fd); 2488 pclose_printer (fd);
2820} 2489}
2821#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2822/*}}} */ 2491/*}}} */
2823 2492
2824/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2825enum { 2494enum {
2826 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
2840 case C0_ESC: 2509 case C0_ESC:
2841 process_escape_seq (); 2510 process_escape_seq ();
2842 break; 2511 break;
2843 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2844 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2847 else 2515 else
2848 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2849 (unsigned int)strlen (VT100_ANS));
2850 break; 2517 break;
2851 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2852 scr_bell (); 2519 scr_bell ();
2853 break; 2520 break;
2854 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
2878 process_dcs_seq (); 2545 process_dcs_seq ();
2879 break; 2546 break;
2880 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2881 process_csi_seq (); 2548 process_csi_seq ();
2882 break; 2549 break;
2883 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2884 process_osc_seq (); 2551 process_osc_seq ();
2885 break; 2552 break;
2886#endif 2553#endif
2887 } 2554 }
2888} 2555}
… …
2978 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
2979 break; 2646 break;
2980 case '+': 2647 case '+':
2981 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
2982 break; 2649 break;
2983#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
2984 case '6': 2651 case '6':
2985 scr_backindex (); 2652 scr_backindex ();
2986 break; 2653 break;
2987#endif 2654#endif
2988 case '7': 2655 case '7':
2989 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
2990 break; 2657 break;
2991 case '8': 2658 case '8':
2992 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
2993 break; 2660 break;
2994#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
2995 case '9': 2662 case '9':
2996 scr_forwardindex (); 2663 scr_forwardindex ();
2997 break; 2664 break;
2998#endif 2665#endif
2999 case '=': 2666 case '=':
… …
3009 break; 2676 break;
3010 2677
3011 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
3012 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
3013 { 2680 {
3014 unicode_t nlcr[] = { C0_LF, C0_CR }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
3015 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3016 } 2683 }
3017 break; 2684 break;
3018 2685
3019 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
3020 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
3042 process_dcs_seq (); 2709 process_dcs_seq ();
3043 break; 2710 break;
3044 2711
3045 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3046 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
3047 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3048 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3049 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
3050 2716
3051 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3052 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
3053 process_csi_seq (); 2719 process_csi_seq ();
… …
3115rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3116{ 2782{
3117 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3118 unsigned int nargs, p; 2784 unsigned int nargs, p;
3119 int n, ndef; 2785 int n, ndef;
3120 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3121 2787
3122 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3123 arg[--nargs] = 0;
3124 2789
3125 priv = 0; 2790 priv = 0;
3126 ch = cmd_getc (); 2791 ch = cmd_getc ();
3127 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3128 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3129 priv = ch; 2795 priv = ch;
3130 ch = cmd_getc (); 2796 ch = cmd_getc ();
3131 } 2797 }
3132 2798
3133 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3162 ndef = get_byte_array_bit (csi_defaults, i); 2828 ndef = get_byte_array_bit (csi_defaults, i);
3163 for (p = 0; p < nargs; p++) 2829 for (p = 0; p < nargs; p++)
3164 if (arg[p] == -1) 2830 if (arg[p] == -1)
3165 arg[p] = ndef; 2831 arg[p] = ndef;
3166 2832
3167#ifdef DEBUG_CMD
3168 fprintf (stderr, "CSI ");
3169 for (p = 0; p < nargs; p++)
3170 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3171 fprintf (stderr, "%c\n", ch);
3172#endif
3173
3174 /* 2833 /*
3175 * private mode handling 2834 * private mode handling
3176 */ 2835 */
3177 if (priv) 2836 if (priv)
3178 { 2837 {
3179 switch (priv) 2838 switch (priv)
3180 { 2839 {
3181 case '>': 2840 case '>':
3182 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
2842 {
2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2845 //
2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2848 // versions.
2849 //
3183 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2850 tt_printf ("\033[>%d;95;0c", 'U');
2851 }
3184 break; 2852 break;
3185 case '?': 2853 case '?':
3186 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3187 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
3188 break; 2856 break;
… …
3293 2961
3294 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2962 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3295 arg[0] = -arg[0]; 2963 arg[0] = -arg[0];
3296 /* FALLTHROUGH */ 2964 /* FALLTHROUGH */
3297 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2965 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2966 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3299 break; 2967 break;
3300 2968
3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2969 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3302 tt_write ((const unsigned char *)VT100_ANS, 2970 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3303 (unsigned int) (sizeof (VT100_ANS) - 1));
3304 break; 2971 break;
3305 2972
3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2973 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3307 process_sgr_mode (nargs, arg); 2974 process_sgr_mode (nargs, arg);
3308 break; 2975 break;
… …
3315 break; 2982 break;
3316 case 6: /* CPR requested */ 2983 case 6: /* CPR requested */
3317 scr_report_position (); 2984 scr_report_position ();
3318 break; 2985 break;
3319 case 7: /* unofficial extension */ 2986 case 7: /* unofficial extension */
3320 if (options & Opt_insecure) 2987 if (option (Opt_insecure))
3321 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2988 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3322 break; 2989 break;
3323 case 8: /* unofficial extension */ 2990 case 8: /* unofficial extension */
3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2991 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3325 break; 2992 break;
… …
3392 break; 3059 break;
3393 case CSI_75: 3060 case CSI_75:
3394 scr_cursor (RESTORE); 3061 scr_cursor (RESTORE);
3395 break; 3062 break;
3396 3063
3397#if ENABLE_FRILLS 3064#if !ENABLE_MINIMAL
3398 case CSI_74: 3065 case CSI_74:
3399 process_window_ops (arg, nargs); 3066 process_window_ops (arg, nargs);
3400 break; 3067 break;
3401#endif 3068#endif
3402 3069
… …
3409 break; 3076 break;
3410 } 3077 }
3411} 3078}
3412/*}}} */ 3079/*}}} */
3413 3080
3414#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3415/* ARGSUSED */ 3082/* ARGSUSED */
3416void 3083void
3417rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3084rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418{ 3085{
3419 int x, y; 3086 int x, y;
3420 XWindowAttributes wattr; 3087 XWindowAttributes wattr;
3421 Window wdummy; 3088 Window wdummy;
3089
3090 dLocal (Display *, dpy);
3422 3091
3423 if (nargs == 0) 3092 if (nargs == 0)
3424 return; 3093 return;
3425 3094
3426 switch (args[0]) 3095 switch (args[0])
3427 { 3096 {
3428 /* 3097 /*
3429 * commands 3098 * commands
3430 */ 3099 */
3431 case 1: /* deiconify window */ 3100 case 1: /* deiconify window */
3432 XMapWindow (display->display, TermWin.parent[0]); 3101 XMapWindow (dpy, parent[0]);
3433 break; 3102 break;
3434 case 2: /* iconify window */ 3103 case 2: /* iconify window */
3435 XIconifyWindow (display->display, TermWin.parent[0], 3104 XIconifyWindow (dpy, parent[0], display->screen);
3436 DefaultScreen (display->display));
3437 break; 3105 break;
3438 case 3: /* set position (pixels) */ 3106 case 3: /* set position (pixels) */
3439 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3107 XMoveWindow (dpy, parent[0], args[1], args[2]);
3440 break; 3108 break;
3441 case 4: /* set size (pixels) */ 3109 case 4: /* set size (pixels) */
3442 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443 break; 3111 break;
3444 case 5: /* raise window */ 3112 case 5: /* raise window */
3445 XRaiseWindow (display->display, TermWin.parent[0]); 3113 XRaiseWindow (dpy, parent[0]);
3446 break; 3114 break;
3447 case 6: /* lower window */ 3115 case 6: /* lower window */
3448 XLowerWindow (display->display, TermWin.parent[0]); 3116 XLowerWindow (dpy, parent[0]);
3449 break; 3117 break;
3450 case 7: /* refresh window */ 3118 case 7: /* refresh window */
3451 scr_touch (true); 3119 scr_touch (true);
3452 break; 3120 break;
3453 case 8: /* set size (chars) */ 3121 case 8: /* set size (chars) */
3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3122 set_widthheight ((unsigned int) (args[2] * fwidth),
3455 (unsigned int) (args[1] * TermWin.fheight)); 3123 (unsigned int) (args[1] * fheight));
3456 break; 3124 break;
3457 3125
3458 //case 9: NYI, TODO, restore maximized window or maximize window 3126 //case 9: NYI, TODO, restore maximized window or maximize window
3459 default: 3127 default:
3460 if (args[0] >= 24) /* set height (chars) */ 3128 if (args[0] >= 24) /* set height (chars) */
3461 set_widthheight ((unsigned int)TermWin.width, 3129 set_widthheight ((unsigned int)width,
3462 (unsigned int) (args[1] * TermWin.fheight)); 3130 (unsigned int) (args[1] * fheight));
3463 break; 3131 break;
3464
3465 3132
3466 /* 3133 /*
3467 * reports - some output format copied from XTerm 3134 * reports - some output format copied from XTerm
3468 */ 3135 */
3469 case 11: /* report window state */ 3136 case 11: /* report window state */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472 break; 3139 break;
3473 case 13: /* report window position */ 3140 case 13: /* report window position */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3141 XGetWindowAttributes (dpy, parent[0], &wattr);
3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3142 XTranslateCoordinates (dpy, parent[0], wattr.root,
3476 -wattr.border_width, -wattr.border_width, 3143 -wattr.border_width, -wattr.border_width,
3477 &x, &y, &wdummy); 3144 &x, &y, &wdummy);
3478 tt_printf ("\033[3;%d;%dt", x, y); 3145 tt_printf ("\033[3;%d;%dt", x, y);
3479 break; 3146 break;
3480 case 14: /* report window size (pixels) */ 3147 case 14: /* report window size (pixels) */
3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483 break; 3150 break;
3484 case 18: /* report text area size (chars) */ 3151 case 18: /* report text area size (chars) */
3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3152 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3486 break; 3153 break;
3487 case 19: /* report window size (chars) */ 3154 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3155 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3489 break; 3156 break;
3490 case 20: /* report icon label */ 3157 case 20: /* report icon label */
3491 { 3158 {
3492 char *s; 3159 char *s;
3493 XGetIconName (display->display, TermWin.parent[0], &s); 3160 XGetIconName (dpy, parent[0], &s);
3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s); 3162 XFree (s);
3496 } 3163 }
3497 break; 3164 break;
3498 case 21: /* report window title */ 3165 case 21: /* report window title */
3499 { 3166 {
3500 char *s; 3167 char *s;
3501 XFetchName (display->display, TermWin.parent[0], &s); 3168 XFetchName (dpy, parent[0], &s);
3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s); 3170 XFree (s);
3504 } 3171 }
3505 break; 3172 break;
3506 } 3173 }
3507} 3174}
… …
3510/*----------------------------------------------------------------------*/ 3177/*----------------------------------------------------------------------*/
3511/* 3178/*
3512 * get input up until STRING TERMINATOR (or BEL) 3179 * get input up until STRING TERMINATOR (or BEL)
3513 * ends_how is terminator used. returned input must be free()'d 3180 * ends_how is terminator used. returned input must be free()'d
3514 */ 3181 */
3515unsigned char * 3182char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3183rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3184{
3518 unicode_t seen_esc = 0, ch; 3185 unicode_t ch;
3186 bool seen_esc = false;
3519 unsigned int n = 0; 3187 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3188 wchar_t string[STRING_MAX];
3522 3189
3523 while ((ch = cmd_getc ()) != NOCHAR) 3190 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3191 {
3525 if (seen_esc) 3192 if (seen_esc)
3526 { 3193 {
… …
3529 else 3196 else
3530 return NULL; 3197 return NULL;
3531 } 3198 }
3532 else if (ch == C0_ESC) 3199 else if (ch == C0_ESC)
3533 { 3200 {
3534 seen_esc = 1; 3201 seen_esc = true;
3535 continue; 3202 continue;
3536 } 3203 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3204 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3205 break;
3206 else if (ch == C0_SYN)
3207 ch = cmd_get8 ();
3539 else if (ch < 0x20) 3208 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3209 return NULL; /* other control character - exit */
3541 3210
3542 seen_esc = 0; 3211 seen_esc = false;
3543 3212
3544 if (n >= sizeof (string) - 1) 3213 if (n >= STRING_MAX - 1)
3545 // stop at some sane length 3214 // stop at some sane length
3546 return NULL; 3215 return NULL;
3547 3216
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
3551 string[n++] = ch; 3217 string[n++] = ch;
3552 } 3218 }
3553 3219
3554 string[n++] = '\0'; 3220 string[n++] = '\0';
3555 3221
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3222 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3223
3561 return s; 3224 return rxvt_wcstombs (string);
3562} 3225}
3563 3226
3564/*----------------------------------------------------------------------*/ 3227/*----------------------------------------------------------------------*/
3565/* 3228/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3567 */ 3230 */
3568void 3231void
3569rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3570{ 3233{
3571 unsigned char *s; 3234 char *s;
3572 unicode_t eh; 3235 unicode_t eh;
3573 3236
3574 /* 3237 /*
3575 * Not handled yet 3238 * Not handled yet
3576 */ 3239 */
… …
3595 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3596 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3597 3260
3598 if (ch == ';') 3261 if (ch == ';')
3599 { 3262 {
3600 unsigned char *s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3601 3264
3602 if (s) 3265 if (s)
3603 { 3266 {
3604 process_xterm_seq (arg, (char *)s, eh); 3267 process_xterm_seq (arg, s, eh);
3605 free (s); 3268 free (s);
3606 } 3269 }
3607 } 3270 }
3608} 3271}
3609 3272
3610void 3273void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3274rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3612{ 3275{
3613 if (str[0] == '?' && !str[1]) 3276 if (str[0] == '?' && !str[1])
3614 { 3277 {
3615 unsigned short r, g, b; 3278 rgba c;
3616 pix_colors_focused[color].get (display, r, g, b); 3279 pix_colors_focused[color].get (c);
3280
3281#if XFT
3282 if (c.a != rgba::MAX_CC)
3283 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3284 else
3285#endif
3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3286 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3618 } 3287 }
3619 else 3288 else
3620 set_window_color (color, str); 3289 set_window_color (color, str);
3621} 3290}
3622 3291
3623/* 3292/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3293 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625 * 0 = change iconName/title
3626 * 1 = change iconName
3627 * 2 = change title
3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
3631 * 12 = change text color
3632 * 13 = change mouse foreground color
3633 * 17 = change highlight character colour
3634 * 18 = change bold character color
3635 * 19 = change underlined character color
3636 * 46 = change logfile (not implemented)
3637 * 50 = change font
3638 *
3639 * rxvt extensions:
3640 * 20 = bg pixmap
3641 * 39 = change default fg color
3642 * 49 = change default bg color
3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
3647 */ 3294 */
3648void 3295void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3296rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3650{ 3297{
3651 int changed = 0;
3652 int color; 3298 int color;
3653 char *buf, *name; 3299 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3300 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3301 int saveop = op;
3656 3302
3303 dLocal (Display *, dpy);
3304
3657 assert (str != NULL); 3305 assert (str != NULL);
3306
3307 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3308 return;
3309
3658 switch (op) 3310 switch (op)
3659 { 3311 {
3660 case XTerm_name: 3312 case XTerm_name:
3661 set_title (str); 3313 set_title (str);
3662 /* FALLTHROUGH */ 3314 /* FALLTHROUGH */
… …
3667 set_title (str); 3319 set_title (str);
3668 break; 3320 break;
3669 case XTerm_property: 3321 case XTerm_property:
3670 if (str[0] == '?') 3322 if (str[0] == '?')
3671 { 3323 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3324 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3325 Atom actual_type;
3674 int actual_format; 3326 int actual_format;
3675 unsigned long nitems; 3327 unsigned long nitems;
3676 unsigned long bytes_after; 3328 unsigned long bytes_after;
3677 unsigned char *value = 0; 3329 unsigned char *value = 0;
3678 const char *str = ""; 3330 const char *str = "";
3679 3331
3680 if (prop 3332 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3333 && XGetWindowProperty (dpy, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3334 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3335 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3336 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3337 && actual_type != None
3686 && actual_format == 8) 3338 && actual_format == 8)
3687 str = (const char *)(value); 3339 str = (const char *)(value);
3688 3340
3689 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3341 tt_printf ("\033]%d;%s%c", op, str, resp);
3690 3342
3691 XFree (value); 3343 XFree (value);
3692 } 3344 }
3693 else 3345 else
3694 { 3346 {
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3347 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3348
3697 if (eq) 3349 if (eq)
3698 { 3350 {
3699 *eq = 0; 3351 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3352 set_utf8_property (display->atom (str), eq + 1);
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 } 3353 }
3705 else 3354 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3355 XDeleteProperty (dpy, parent[0],
3707 display->atom (str)); 3356 display->atom (str));
3708 } 3357 }
3709 break; 3358 break;
3710 3359
3711 case XTerm_Color: 3360 case XTerm_Color:
… …
3713 { 3362 {
3714 if ((name = strchr (buf, ';')) == NULL) 3363 if ((name = strchr (buf, ';')) == NULL)
3715 break; 3364 break;
3716 3365
3717 *name++ = '\0'; 3366 *name++ = '\0';
3718 color = atoi (buf); 3367 color = atoi (buf) + minCOLOR;
3719 3368
3720 if (color < 0 || color >= TOTAL_COLORS) 3369 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3721 break; 3370 break;
3722 3371
3723 if ((buf = strchr (name, ';')) != NULL) 3372 if ((buf = strchr (name, ';')) != NULL)
3724 *buf++ = '\0'; 3373 *buf++ = '\0';
3725 3374
3726 if (name[0] == '?' && !name[1]) 3375 process_color_seq (op, color, name, resp);
3727 {
3728 unsigned short r, g, b;
3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3731 }
3732 else
3733 set_window_color (color + minCOLOR, name);
3734 } 3376 }
3735 break; 3377 break;
3378 case Rxvt_restoreFG:
3736 case XTerm_Color00: 3379 case XTerm_Color00:
3737 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3380 process_color_seq (op, Color_fg, str, resp);
3738 break; 3381 break;
3382 case Rxvt_restoreBG:
3739 case XTerm_Color01: 3383 case XTerm_Color01:
3740 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3384 process_color_seq (op, Color_bg, str, resp);
3741 break; 3385 break;
3742#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
3743 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
3744 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3388 process_color_seq (op, Color_cursor, str, resp);
3745 break; 3389 break;
3746#endif 3390#endif
3747 case XTerm_Color_pointer_fg: 3391 case XTerm_Color_pointer_fg:
3748 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3392 process_color_seq (op, Color_pointer_fg, str, resp);
3749 break; 3393 break;
3750 case XTerm_Color_pointer_bg: 3394 case XTerm_Color_pointer_bg:
3751 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3395 process_color_seq (op, Color_pointer_bg, str, resp);
3752 break; 3396 break;
3753#ifndef NO_BOLD_UNDERLINE_REVERSE 3397#ifndef NO_BOLD_UNDERLINE_REVERSE
3754 case XTerm_Color_BD:
3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759 break;
3760 case XTerm_Color_UL:
3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762 break;
3763 case XTerm_Color_RV: 3398 case XTerm_Color_RV:
3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3399 process_color_seq (op, Color_RV, str, resp);
3765 break; 3400 break;
3401 case Rxvt_Color_BD:
3402 case URxvt_Color_BD:
3403 process_color_seq (op, Color_BD, str, resp);
3404 break;
3405 case Rxvt_Color_UL:
3406 case URxvt_Color_UL:
3407 process_color_seq (op, Color_UL, str, resp);
3408 break;
3409 case URxvt_Color_IT:
3410 process_color_seq (op, Color_IT, str, resp);
3411 break;
3766#endif 3412#endif
3767#if TRANSPARENT && TINTING 3413#if ENABLE_TRANSPARENCY
3768 case XTerm_Color_tint: 3414 case URxvt_Color_tint:
3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3770 check_our_parents (); 3416 {
3771 if (am_transparent) 3417 bool changed = false;
3772 want_full_refresh = want_refresh = 1;
3773 break;
3774#endif
3775 3418
3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423
3424 if (changed)
3425 update_background ();
3426 }
3427
3428 break;
3429#endif
3430
3431#if BG_IMAGE_FROM_FILE
3776 case XTerm_Pixmap: 3432 case Rxvt_Pixmap:
3777 if (*str != ';') 3433 if (!strcmp (str, "?"))
3778 { 3434 {
3779#if XPM_BACKGROUND 3435 char str[256];
3780 scale_pixmap (""); /* reset to default scaling */ 3436
3781 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3782#endif 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3783 scr_touch (true); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3784 } 3441 }
3785 while ((str = strchr (str, ';')) != NULL) 3442 else
3786 { 3443 {
3444 int changed = 0;
3445
3446 if (*str != ';')
3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3787 str++; 3459 str++;
3788#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3789 changed += scale_pixmap (str); 3461 changed++;
3790#endif 3462 str = strchr (str, ';');
3463 }
3791 3464
3465 if (changed)
3466 update_background ();
3792 } 3467 }
3793 if (changed)
3794 {
3795#ifdef XPM_BACKGROUND
3796 resize_pixmap ();
3797#endif
3798 scr_touch (true);
3799 }
3800 break; 3468 break;
3801 3469#endif
3802 case XTerm_restoreFG:
3803 set_window_color (Color_fg, str);
3804 break;
3805 case XTerm_restoreBG:
3806 set_window_color (Color_bg, str);
3807 break;
3808 3470
3809 case XTerm_logfile: 3471 case XTerm_logfile:
3810 // TODO, when secure mode? 3472 // TODO, when secure mode?
3811 break; 3473 break;
3812 3474
3475#if 0
3476 case Rxvt_dumpscreen: /* no error notices */
3477 {
3478 int fd;
3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3480 {
3481 scr_dump (fd);
3482 close (fd);
3483 }
3484 }
3485 break;
3486#endif
3813 case XTerm_font: 3487 case XTerm_font:
3814 op = URxvt_font; 3488 op = URxvt_font;
3815 case URxvt_font: 3489 case URxvt_font:
3816#if ENABLE_STYLES 3490#if ENABLE_STYLES
3817 case URxvt_boldFont: 3491 case URxvt_boldFont:
3818 case URxvt_italicFont: 3492 case URxvt_italicFont:
3819 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3820#endif 3494#endif
3821 if (query) 3495 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3825 resp); 3499 resp);
3826 else 3500 else
3827 { 3501 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829 3503
… …
3831 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3832 set_fonts (); 3506 set_fonts ();
3833 } 3507 }
3834 break; 3508 break;
3835 3509
3836#if ENABLE_FRILLS 3510 case URxvt_version:
3837 case XTerm_locale:
3838 if (query) 3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3519 case URxvt_locale:
3520 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3840 else 3522 else
3841 { 3523 {
3842 set_locale (str); 3524 set_locale (str);
3843# ifdef USE_XIM 3525 pty->set_utf8_mode (enc_utf8);
3844 im_cb (); 3526 init_xlocale ();
3845# endif
3846 } 3527 }
3847 break; 3528 break;
3848#endif
3849 3529
3850#ifdef MENUBAR 3530 case URxvt_view_up:
3851 case XTerm_Menu: 3531 case URxvt_view_down:
3852 if (options & Opt_insecure) 3532 {
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3533 int lines = atoi (str);
3534
3535 if (lines)
3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3537 else
3538 scr_erase_savelines ();
3539 }
3540
3854 break; 3541 break;
3855#endif 3542#endif
3856#if 0 3543
3857 case XTerm_dumpscreen: /* no error notices */ 3544#if ENABLE_PERL
3858 { 3545 case URxvt_perl:
3859 int fd; 3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3547 ; // no responses yet
3861 {
3862 scr_dump (fd);
3863 close (fd);
3864 }
3865 }
3866 break; 3548 break;
3867#endif 3549#endif
3868 } 3550 }
3869} 3551}
3870/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
… …
3901 return state; 3583 return state;
3902} 3584}
3903 3585
3904/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3905void 3587void
3906rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3907{ 3589{
3908 unsigned int i, j; 3590 unsigned int i, j;
3909 int state; 3591 int state;
3910 3592
3911 static const struct 3593 static const struct
3912 { 3594 {
3913 const int argval; 3595 const int argval;
3914 const unsigned long bit; 3596 const unsigned long bit;
3915 }
3916
3917 argtopriv[] = { 3597 } argtopriv[] = {
3918 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
3919 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
3920 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
3921 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
3922 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
3923 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
3924 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode 3605 // 8, bi-directional support mode
3926 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
3927#ifdef menuBar_esc
3928 { menuBar_esc, PrivMode_menuBar },
3929#endif
3930 // 18, 19 printing-related 3607 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor },
3932#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3933 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3934#endif 3611#endif
… …
3941 { 66, PrivMode_aplKP }, 3618 { 66, PrivMode_aplKP },
3942#ifndef NO_BACKSPACE_KEY 3619#ifndef NO_BACKSPACE_KEY
3943 { 67, PrivMode_BackSpace }, 3620 { 67, PrivMode_BackSpace },
3944#endif 3621#endif
3945 { 1000, PrivMode_MouseX11 }, 3622 { 1000, PrivMode_MouseX11 },
3946 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3623 { 1002, PrivMode_MouseBtnEvent },
3947 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3624 { 1003, PrivMode_MouseAnyEvent },
3948 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3949 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3950 { 1011, PrivMode_Keypress }, // rxvt extension 3626 { 1011, PrivMode_Keypress }, // rxvt extension
3951 // 1035 enable modifiers for alt, numlock NYI 3627 // 1035 enable modifiers for alt, numlock NYI
3952 // 1036 send ESC for meta keys NYI 3628 // 1036 send ESC for meta keys NYI
3953 // 1037 send DEL for keypad delete NYI 3629 // 1037 send DEL for keypad delete NYI
… …
3979 } 3655 }
3980 3656
3981 /* extra handling for values with state unkept */ 3657 /* extra handling for values with state unkept */
3982 switch (arg[i]) 3658 switch (arg[i])
3983 { 3659 {
3660#if ENABLE_STYLES
3661 case 1021:
3662 set_option (Opt_intensityStyles, mode);
3663
3664 scr_touch (true);
3665 break;
3666#endif
3984 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3985 case 1049: 3668 case 1049:
3986 if (options & Opt_secondaryScreen) 3669 if (option (Opt_secondaryScreen))
3987 if (mode == 0) 3670 if (mode == 0)
3988 scr_cursor (RESTORE); 3671 scr_cursor (RESTORE);
3989 else if (mode == 1) 3672 else if (mode == 1)
3990 scr_cursor (SAVE); 3673 scr_cursor (SAVE);
3991 break; 3674 break;
… …
4003 */ 3686 */
4004 PrivMode (1, PrivMode_vt52); 3687 PrivMode (1, PrivMode_vt52);
4005 break; 3688 break;
4006 case 3: /* 80/132 */ 3689 case 3: /* 80/132 */
4007 if (priv_modes & PrivMode_132OK) 3690 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3694 }
4009 break; 3695 break;
4010 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4011 if (state)
4012 options &= ~Opt_jumpScroll;
4013 else
4014 options |= Opt_jumpScroll; 3697 set_option (Opt_jumpScroll, !state);
4015 break; 3698 break;
4016 case 5: /* reverse video */ 3699 case 5: /* reverse video */
4017 scr_rvideo_mode (state); 3700 scr_rvideo_mode (state);
4018 break; 3701 break;
4019 case 6: /* relative/absolute origins */ 3702 case 6: /* relative/absolute origins */
… …
4023 scr_autowrap (state); 3706 scr_autowrap (state);
4024 break; 3707 break;
4025 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
4026 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4027 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4028 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4029 break; 3712 break;
4030#ifdef menuBar_esc
4031 case menuBar_esc:
4032#ifdef MENUBAR
4033 map_menuBar (state);
4034#endif
4035 break;
4036#endif
4037#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
4038 case scrollBar_esc: 3714 case scrollBar_esc:
4039 if (scrollbar_mapping (state)) 3715 if (scrollbar_mapping (state))
4040 { 3716 {
4041 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
… …
4053 break; 3729 break;
4054 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4055 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4056 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4057 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4058 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4059 break; 3735 break;
4060#if 0
4061 case 1001: 3736 case 1002:
4062 break; /* X11 mouse highlighting */ 3737 case 1003:
4063#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746 vt_select_input ();
3747 break;
4064 case 1010: /* scroll to bottom on TTY output inhibit */ 3748 case 1010: /* scroll to bottom on TTY output inhibit */
4065 if (state)
4066 options &= ~Opt_scrollTtyOutput;
4067 else
4068 options |= Opt_scrollTtyOutput; 3749 set_option (Opt_scrollTtyOutput, !state);
4069 break; 3750 break;
4070 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
4071 if (state)
4072 options |= Opt_scrollTtyKeypress; 3752 set_option (Opt_scrollTtyKeypress, state);
4073 else
4074 options &= ~Opt_scrollTtyKeypress;
4075 break; 3753 break;
4076 case 1047: /* secondary screen w/ clearing last */ 3754 case 1047: /* secondary screen w/ clearing last */
4077 if (options & Opt_secondaryScreen) 3755 if (option (Opt_secondaryScreen))
4078 if (current_screen != PRIMARY) 3756 if (current_screen != PRIMARY)
4079 scr_erase_screen (2); 3757 scr_erase_screen (2);
4080 scr_change_screen (state); 3758 scr_change_screen (state);
4081 break; 3759 break;
4082 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state); 3761 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen) 3762 if (option (Opt_secondaryScreen))
4085 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4086 scr_erase_screen (2); 3764 scr_erase_screen (2);
4087 break; 3765 break;
4088 default: 3766 default:
4089 break; 3767 break;
… …
4217 scr_color (Color_bg, Color_bg); 3895 scr_color (Color_bg, Color_bg);
4218 break; 3896 break;
4219 3897
4220 //case 50: // not variable spacing 3898 //case 50: // not variable spacing
4221 3899
4222#ifndef NO_BRIGHTCOLOR 3900#if !ENABLE_MINIMAL
4223 case 90: 3901 case 90:
4224 case 91: /* set bright fg color */ 3902 case 91: /* set bright fg color */
4225 case 92: 3903 case 92:
4226 case 93: 3904 case 93:
4227 case 94: 3905 case 94:
… …
4239 case 106: 3917 case 106:
4240 case 107: 3918 case 107:
4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3919 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4242 break; 3920 break;
4243#endif 3921#endif
4244
4245 } 3922 }
4246 } 3923 }
4247} 3924}
4248/*}}} */ 3925/*}}} */
4249 3926
… …
4252rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
4253{ 3930{
4254 unicode_t ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
4255 3932
4256 if (cmd == 'Q') 3933 if (cmd == 'Q')
3934 {
4257 { /* query graphics */ 3935 /* query graphics */
4258 tt_printf ("\033G0\012"); /* no graphics */ 3936 tt_printf ("\033G0\012"); /* no graphics */
4259 return; 3937 return;
4260 } 3938 }
4261 /* swallow other graphics sequences until terminating ':' */ 3939 /* swallow other graphics sequences until terminating ':' */
4262 do 3940 do
… …
4273 */ 3951 */
4274void 3952void
4275rxvt_term::tt_printf (const char *fmt,...) 3953rxvt_term::tt_printf (const char *fmt,...)
4276{ 3954{
4277 va_list arg_ptr; 3955 va_list arg_ptr;
4278 unsigned char buf[256]; 3956 char buf[256];
4279 3957
4280 va_start (arg_ptr, fmt); 3958 va_start (arg_ptr, fmt);
4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3959 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4282 va_end (arg_ptr); 3960 va_end (arg_ptr);
4283 tt_write (buf, strlen (buf)); 3961 tt_write (buf, strlen (buf));
… …
4285 3963
4286/* ---------------------------------------------------------------------- */ 3964/* ---------------------------------------------------------------------- */
4287/* Write data to the pty as typed by the user, pasted with the mouse, 3965/* Write data to the pty as typed by the user, pasted with the mouse,
4288 * or generated by us in response to a query ESC sequence. 3966 * or generated by us in response to a query ESC sequence.
4289 */ 3967 */
3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3969
4290void 3970void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3971rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 3972{
4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3974 return;
4294 3975
4295 if (len) 3976 if (pty->pty < 0)
3977 return;
3978
3979 if (v_buflen == 0)
3980 {
3981 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3982
3983 if ((unsigned int)written == len)
3984 return;
3985
3986 data += written;
3987 len -= written;
4296 { 3988 }
3989
3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3991
3992 memcpy (v_buffer + v_buflen, data, len);
3993 v_buflen += len;
3994
3995 pty_ev.set (ev::READ | ev::WRITE);
3996}
3997
3998void rxvt_term::pty_write ()
3999{
4000 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4001
4002 if (written > 0)
4003 {
4004 v_buflen -= written;
4005
4297 if (v_buflen == 0) 4006 if (v_buflen == 0)
4298 { 4007 {
4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301 if ((unsigned int)written == len)
4302 return;
4303
4304 data += written;
4305 len -= written;
4306 }
4307
4308
4309 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311 memcpy (v_buffer + v_buflen, data, len);
4312 v_buflen += len;
4313 }
4314
4315 for (;;)
4316 {
4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319 if (written > 0)
4320 {
4321 v_buflen -= written;
4322
4323 if (v_buflen == 0)
4324 {
4325 free (v_buffer); 4008 free (v_buffer);
4326 v_buffer = 0; 4009 v_buffer = 0;
4327 v_buflen = 0;
4328 4010
4329 pty_ev.set (EVENT_READ); 4011 pty_ev.set (ev::READ);
4330 return;
4331 }
4332
4333 memmove (v_buffer, v_buffer + written, v_buflen);
4334 }
4335 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336 // original code just ignores this...
4337 destroy ();
4338 else
4339 {
4340 pty_ev.set (EVENT_READ | EVENT_WRITE);
4341 return; 4012 return;
4342 } 4013 }
4014
4015 memmove (v_buffer, v_buffer + written, v_buflen);
4343 } 4016 }
4017 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4018 pty_ev.set (ev::READ);
4344} 4019}
4345 4020
4346/*----------------------- end-of-file (C source) -----------------------*/ 4021/*----------------------- end-of-file (C source) -----------------------*/
4347 4022

Diff Legend

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