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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.386 by ayin, Fri Dec 28 11:02:31 2007 UTC

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

Diff Legend

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