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

Diff Legend

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