ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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