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

Diff Legend

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