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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.319 by ayin, Fri Feb 16 21:46:05 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>
7 * - original version 7 * - original version
… …
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
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
63void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
64rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
65{ 305{
66 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
67 unsigned int newlen; 307 unsigned int newlen;
68 KeySym keysym; 308 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 309 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
74 316
75 /* 317 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
78 * 320 *
79 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
80 */ 322 */
81 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
84 326
85 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
86 { 328 {
87 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 338 Status status_return;
97 339
98#if 0 340#if 0
99#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
103 else 345 else
104#endif 346#endif
105#endif 347#endif
106 { 348 {
… …
108 350
109 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
113 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
116 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 361 SET_LOCALE (locale);
118 362
119 if (status_return == XLookupChars 363 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
142 } 386 }
143 else 387 else
144#endif 388#endif
145 { 389 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
148 } 392 }
149 393
150 if (valid_keysym) 394 if (valid_keysym)
151 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
152 if (TermWin.saveLines) 401 if (saveLines)
153 { 402 {
154#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 404 if (!ctrl && !meta)
156 {
157#else 405#else
158 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
159 { 408 {
160#endif
161 int lnsppg; 409 int lnsppg;
162 410
163#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 413#else
166 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
167#endif 415#endif
168 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
169 { 417 {
170 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
171 return; 419 return;
… …
199 scr_move_to (0, 1); 447 scr_move_to (0, 1);
200 return; 448 return;
201 } 449 }
202 else if (keysym == XK_End) 450 else if (keysym == XK_End)
203 { 451 {
204 scr_move_to (1, 0); 452 scr_move_to (1, 1);
205 return; 453 return;
206 } 454 }
207 } 455 }
208#endif 456#endif
209 } 457 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 463 {
216 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
218 } 466 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 468 {
221 switch (keysym) 469 switch (keysym)
222 { 470 {
223 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
226 return; 474 return;
475#if TODO
227 /* rxvt extras */ 476 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 478 change_font (FONT_UP);
230 return; 479 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 481 change_font (FONT_DN);
233 return; 482 return;
483#endif
234 } 484 }
235 } 485 }
236 } 486 }
237#ifdef PRINTPIPE 487
238 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
239 { 489 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
241 return;
242 } 491 {
243#endif 492 int hv;
244 493
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
246 { 495 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 497 {
250 unsigned int l; 498 commit_iso14755 ();
251 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
252 500# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 502# endif
261 ) 503 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 504 }
266 505 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 506 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51;
509# if ISO_14755
510 iso14755_51 (iso14755buf & ISO_14755_MASK);
511# endif
268 return; 512 return;
269 } 513 }
270 else 514 else
515 {
516# if ENABLE_OVERLAY
517 scr_overlay_off ();
271#endif 518# endif
519 iso14755buf = 0;
520 }
521 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED))
525 {
526 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif
531 }
532#endif
533
534#ifdef PRINTPIPE
535 if (keysym == XK_Print)
536 {
537 scr_printscreen (ctrl | shft);
538 return;
539 }
540#endif
541
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 {
272 { 544 {
273 newlen = 1; 545 newlen = 1;
274 switch (keysym) 546 switch (keysym)
275 { 547 {
276#ifndef NO_BACKSPACE_KEY 548#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 549 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 550 if (priv_modes & PrivMode_HaveBackSpace)
279 { 551 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 553 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 554 kbuf[1] = '\0';
283 } 555 }
284 else 556 else
285 STRCPY (kbuf, key_backspace); 557 strcpy (kbuf, key_backspace);
286 break; 558 break;
287#endif 559#endif
288#ifndef NO_DELETE_KEY 560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
289 case XK_Delete: 571 case XK_Delete:
290 STRCPY (kbuf, key_delete); 572 strcpy (kbuf, key_delete);
291 break; 573 break;
292#endif 574#endif
293 case XK_Tab: 575 case XK_Tab:
294 if (shft) 576 if (shft)
295 STRCPY (kbuf, "\033[Z"); 577 strcpy (kbuf, "\033[Z");
296 else 578 else
297 { 579 {
298#ifdef CTRL_TAB_MAKES_META 580#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 581 if (ctrl)
300 meta = 1; 582 meta = 1;
… …
306 newlen = 0; 588 newlen = 0;
307 } 589 }
308 break; 590 break;
309 591
310#ifdef XK_KP_Left 592#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 593 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 594 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 595 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 596 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 598 {
317 STRCPY (kbuf, "\033OZ"); 599 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 601 break;
320 } 602 }
321 else 603 else
322 /* translate to std. cursor key */ 604 /* translate to std. cursor key */
… …
325#endif 607#endif
326 case XK_Up: /* "\033[A" */ 608 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 609 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 610 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 611 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 612 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 613 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 614 /* do Shift first */
333 if (shft) 615 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 617 else if (ctrl)
336 { 618 {
337 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 620 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 621 }
340 else if (PrivateModes & PrivMode_aplCUR) 622 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 623 kbuf[1] = 'O';
342 break; 624 break;
343 625
344#ifndef UNSHIFTED_SCROLLKEYS 626#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 627# ifdef XK_KP_Prior
346 case XK_KP_Prior: 628 case XK_KP_Prior:
347 /* allow shift to override */ 629 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 631 {
350 STRCPY (kbuf, "\033Oy"); 632 strcpy (kbuf, "\033Oy");
351 break; 633 break;
352 } 634 }
353 /* FALLTHROUGH */ 635 /* FALLTHROUGH */
354# endif 636# endif
355 case XK_Prior: 637 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 638 strcpy (kbuf, "\033[5~");
357 break; 639 break;
358# ifdef XK_KP_Next 640# ifdef XK_KP_Next
359 case XK_KP_Next: 641 case XK_KP_Next:
360 /* allow shift to override */ 642 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 644 {
363 STRCPY (kbuf, "\033Os"); 645 strcpy (kbuf, "\033Os");
364 break; 646 break;
365 } 647 }
366 /* FALLTHROUGH */ 648 /* FALLTHROUGH */
367# endif 649# endif
368 case XK_Next: 650 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 651 strcpy (kbuf, "\033[6~");
370 break; 652 break;
371#endif 653#endif
372 case XK_KP_Enter: 654 case XK_KP_Enter:
373 /* allow shift to override */ 655 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 657 {
376 STRCPY (kbuf, "\033OM"); 658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
377 } 670 }
378 else 671 else
379 { 672 {
380 kbuf[0] = '\r'; 673 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 674 kbuf[1] = '\0';
382 } 675 }
383 break; 676 break;
384 677
385#ifdef XK_KP_Begin 678#ifdef XK_KP_Begin
386 case XK_KP_Begin: 679 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 680 strcpy (kbuf, "\033Ou");
388 break; 681 break;
389 682
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 683#endif
398 case XK_KP_F1: /* "\033OP" */ 684 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 685 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 686 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 687 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 688 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 689 kbuf[2] += (keysym - XK_KP_F1);
404 break; 690 break;
405 691
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 692 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 693 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 704 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 705 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 706 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 707 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 708 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 710 {
425 STRCPY (kbuf, "\033Oj"); 711 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 712 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 713 }
428 else 714 else
429 { 715 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
432 } 718 }
433 break; 719 break;
434 720
435 case XK_Find: 721 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 722 strcpy (kbuf, "\033[1~");
437 break; 723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
438 case XK_Insert: 735 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 736 strcpy (kbuf, "\033[2~");
440 break; 737 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 738#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 739 case DXK_Remove:
443 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
444#endif 741#endif
445 case XK_Execute: 742 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 743 strcpy (kbuf, "\033[3~");
447 break; 744 break;
448 case XK_Select: 745 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 746 strcpy (kbuf, "\033[4~");
450 break; 747 break;
451#ifdef XK_KP_End 748#ifdef XK_KP_End
452 case XK_KP_End: 749 case XK_KP_End:
453 /* allow shift to override */ 750 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 752 {
456 STRCPY (kbuf, "\033Oq"); 753 strcpy (kbuf, "\033Oq");
457 break; 754 break;
458 } 755 }
459 /* FALLTHROUGH */ 756 /* FALLTHROUGH */
460#endif 757#endif
461 case XK_End: 758 case XK_End:
462 STRCPY (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
463 break; 760 break;
464#ifdef XK_KP_Home 761#ifdef XK_KP_Home
465 case XK_KP_Home: 762 case XK_KP_Home:
466 /* allow shift to override */ 763 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 765 {
469 STRCPY (kbuf, "\033Ow"); 766 strcpy (kbuf, "\033Ow");
470 break; 767 break;
471 } 768 }
472 /* FALLTHROUGH */ 769 /* FALLTHROUGH */
473#endif 770#endif
474 case XK_Home: 771 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 772 strcpy (kbuf, KS_HOME);
476 break; 773 break;
477 774
478#define FKEY(n, fkey) \ 775#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 777
… …
532#undef FKEY 829#undef FKEY
533 default: 830 default:
534 newlen = 0; 831 newlen = 0;
535 break; 832 break;
536 } 833 }
834
537 if (newlen) 835 if (newlen)
538 len = STRLEN (kbuf); 836 len = strlen (kbuf);
539 } 837 }
540 838
541 /* 839 /*
542 * Pass meta for all function keys, if 'meta' option set 840 * Pass meta for all function keys, if 'meta' option set
543 */ 841 */
… …
550 else if (ctrl && keysym == XK_minus) 848 else if (ctrl && keysym == XK_minus)
551 { 849 {
552 len = 1; 850 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
555 else 858 else
556 { 859 {
557#ifdef META8_OPTION 860#ifdef META8_OPTION
558 /* set 8-bit on */ 861 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
560 { 863 {
561 unsigned char *ch; 864 char *ch;
562 865
563 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 867 *ch |= 0x80;
565 868
566 meta = 0; 869 meta = 0;
… …
568#endif 871#endif
569 /* nil */ ; 872 /* nil */ ;
570 } 873 }
571 } 874 }
572 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
573 if (len <= 0) 879 if (len <= 0)
574 return; /* not mapped */ 880 return; /* not mapped */
575 881
576 if (Options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 883 if (view_start)
578 { 884 {
579 TermWin.view_start = 0; 885 view_start = 0;
580 want_refresh = 1; 886 want_refresh = 1;
581 } 887 }
582 888
583 /* 889 /*
584 * these modifications only affect the static keybuffer 890 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 905#ifdef META8_OPTION
600 && meta_char == C0_ESC 906 && meta_char == C0_ESC
601#endif 907#endif
602 ) 908 )
603 { 909 {
604 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
605 tt_write (&ch, 1); 911 tt_write (&ch, 1);
606 } 912 }
607 913
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
619} 915}
620/*}}} */
621 916
622#if (MENUBAR_MAX) 917void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 918rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
994#if defined (KEYSYM_RESOURCE)
625unsigned int 995unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 997{
628 unsigned int n, s; 998 unsigned int n, s;
629 999
630 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1002
633 if (n > 0 && s < count) 1003 if (n > 0 && s < count)
634 { 1004 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1005 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1007 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1008 cmdbuf_endp -= n;
639 s += n; 1009 s += n;
640 } 1010 }
… …
650 1020
651 cmd_parse (); 1021 cmd_parse ();
652 1022
653 return 0; 1023 return 0;
654} 1024}
655#endif /* MENUBAR_MAX */ 1025#endif
656 1026
657void 1027void
658rxvt_term::flush () 1028rxvt_term::flush ()
659{ 1029{
1030 flush_ev.stop ();
1031
660#ifdef TRANSPARENT 1032#ifdef TRANSPARENT
661 if (want_full_refresh) 1033 if (want_full_refresh)
662 { 1034 {
663 want_full_refresh = 0; 1035 want_full_refresh = 0;
664 scr_clear (); 1036 scr_clear ();
665 scr_touch (false); 1037 scr_touch (false);
666 want_refresh = 1;
667 } 1038 }
668#endif 1039#endif
669 1040
670 if (want_refresh) 1041 if (want_refresh)
671 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
672 scr_refresh (refresh_type); 1081 scr_refresh ();
673 scrollbar_show (1); 1082 scrollbar_show (1);
674#ifdef USE_XIM 1083#ifdef USE_XIM
675 IMSendSpot (); 1084 IMSendSpot ();
676#endif 1085#endif
677
678 } 1086 }
679 1087
680 display->flush (); 1088 display->flush ();
681} 1089}
682 1090
683void 1091void
684rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
685{ 1093{
686 SET_R (this); 1094 make_current ();
687 SET_LOCALE (locale);
688 1095
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0;
689 flush (); 1109 flush ();
690} 1110}
691 1111
692#ifdef CURSOR_BLINK 1112#ifdef CURSOR_BLINK
693void 1113void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1115{
696 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1117 want_refresh = 1;
698 1118
699 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1120}
701#endif 1121#endif
702 1122
703#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
704void 1124void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1131 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1132 }
713} 1133}
714#endif 1134#endif
715 1135
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void
1138rxvt_term::cont_scroll_cb (time_watcher &w)
1139{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1142 {
1143 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1145 }
1146}
1147#endif
1148
1149#ifdef SELECTION_SCROLLING
1150void
1151rxvt_term::sel_scroll_cb (time_watcher &w)
1152{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1158 }
1159}
1160#endif
1161
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void
1164rxvt_term::slip_wheel_cb (time_watcher &w)
1165{
1166 if (mouse_slip_wheel_speed == 0
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1175 }
1176}
1177#endif
1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
716bool 1204bool
717rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
718{ 1206{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1208
1209 if (CBUFSIZ == n)
1210 {
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1212 n = 0;
1213 }
720 1214
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
724 1218
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1220
727 if (n > 0) 1221 if (r > 0)
728 { 1222 {
729 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
730 return true; 1224 return true;
731 } 1225 }
732 else if (n < 0 && errno != EAGAIN) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1227 {
1228#if LINUX_YIELD_HACK
1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1231#endif
1232 }
1233 else
1234 {
1235 pty_ev.stop ();
1236
1237 if (!OPTION (Opt_hold))
733 destroy (); 1238 destroy ();
1239 }
734 1240
735 return false; 1241 return false;
736} 1242}
737 1243
738void 1244void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1246{
741 SET_R (this); 1247 make_current ();
742 SET_LOCALE (locale); 1248
1249 if (revents & EVENT_READ)
1250 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ())
1252 if (cmd_parse ())
1253 break;
743 1254
744 if (revents & EVENT_WRITE) 1255 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1256 pty_write ();
746 else if (revents & EVENT_READ) 1257}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1258
760 if (cmd_parse ()) 1259void
761 break; 1260rxvt_term::pointer_unblank ()
762 } 1261{
763 } 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1263 recolour_cursor ();
1264
1265#ifdef POINTER_BLANK
1266 hidden_pointer = 0;
1267
1268 if (OPTION (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif
764} 1271}
765 1272
766#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
767void 1274void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
781{ 1276{
782 if (! (Options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
783 return; 1278 return;
784 1279
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1281 XFlush (dpy);
787 1282
788 hidden_pointer = 1; 1283 hidden_pointer = 1;
789} 1284}
790 1285
791void 1286void
792rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
793{ 1288{
794 SET_R (this); 1289 make_current ();
795 SET_LOCALE (locale);
796 1290
797 pointer_blank (); 1291 pointer_blank ();
798} 1292}
799#endif 1293#endif
800 1294
… …
807 x = ev.x; 1301 x = ev.x;
808 y = ev.y; 1302 y = ev.y;
809 pixel_position (&x, &y); 1303 pixel_position (&x, &y);
810 1304
811 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1306 button_number = 3;
814 }
815 else 1307 else
816 { 1308 {
817 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1311 if (button_number >= 3)
820 button_number += (64 - 3); 1312 button_number += (64 - 3);
821 } 1313 }
822 1314
823 if (PrivateModes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
824 { 1316 {
825 /* 1317 /*
826 * do not report ButtonRelease 1318 * do not report ButtonRelease
827 * no state info allowed 1319 * no state info allowed
828 */ 1320 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1335 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1336 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1337#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1338 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1339#endif
848
849 } 1340 }
850 1341
851#ifdef DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1344 if (key_state & 16)
854 fputc ('C', stderr); 1345 fputc ('C', stderr);
855 if (key_state & 4) 1346 if (key_state & 4)
856 fputc ('S', stderr); 1347 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1351 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1353 button_number,
863 x + 1, 1354 x + 1,
864 y + 1); 1355 y + 1);
865#else 1356#endif
1357
866 tt_printf ("\033[M%c%c%c", 1358 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
868 (32 + x + 1), 1360 (32 + x + 1),
869 (32 + y + 1)); 1361 (32 + y + 1));
870#endif
871} 1362}
872
873#ifdef USING_W11LIB
874void
875rxvt_W11_process_x_event (XEvent *ev)
876{
877 rxvt_t *r = rxvt_get_r ();
878
879 x_cb (*ev);
880}
881#endif
882 1363
883/*{{{ process an X event */ 1364/*{{{ process an X event */
884void 1365void
885rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
886{ 1367{
887 SET_R (this); 1368 make_current ();
888 SET_LOCALE (locale);
889 1369
890#if defined(CURSOR_BLINK) 1370 dLocal (Display *, dpy);
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1371
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1372 if (ev.xany.window == vt
900 } 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1375 return;
920#endif
921 1376
1377 // for XQueryPointer
922 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1380 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1381
975 switch (ev.type) 1382 switch (ev.type)
976 { 1383 {
977 case KeyPress: 1384 case KeyPress:
978 lookup_key (ev.xkey); 1385 key_press (ev.xkey);
979 break; 1386 break;
980 1387
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1388 case KeyRelease:
983 { 1389 key_release (ev.xkey);
984 if (! (ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0;
986 else
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1390 break;
995 }
996#endif
997 1391
998 case ButtonPress: 1392 case ButtonPress:
999 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1000 break; 1394 break;
1001 1395
… …
1003 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1004 break; 1398 break;
1005 1399
1006 case ClientMessage: 1400 case ClientMessage:
1007 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1403 {
1017 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1405 {
1019 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1407 {
1021 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1409 {
1023 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1411 destroy ();
1025 0L, 1000000L, 1412 }
1026 False, AnyPropertyType, 1413#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1417 &ev);
1030 XChangeProperty (display->display, display->root, 1418#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1419 }
1032 8, PropModeReplace, 1420 }
1033 data, STRLEN (data)); 1421#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1036 } 1430 }
1037#endif /* OFFIX_DND */
1038 break; 1431 break;
1039 1432
1040 case MappingNotify: 1433 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1435 break;
1043 1436
1044 /* 1437 /*
1045 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1065 break; 1458 break;
1066 } 1459 }
1067 break; 1460 break;
1068 1461
1069 case FocusIn: 1462 case FocusIn:
1070 if (!TermWin.focus) 1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1469 focus_out ();
1470 break;
1471
1472 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0])
1071 { 1474 {
1072 TermWin.focus = 1; 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1476 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1477
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 {
1480 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 }
1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1083 } 1490 }
1084 break; 1491 break;
1085 1492
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1493 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1106 { 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1107 int height, width; 1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1498
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 }
1138 break; 1499 break;
1139 1500
1140 case SelectionClear: 1501 case SelectionClear:
1141 selection_clear (); 1502 selection_clear ();
1142 break; 1503 break;
1143 1504
1144 case SelectionNotify: 1505 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1506 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1508 break;
1149 1509
1150 case SelectionRequest: 1510 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1152 break; 1512 break;
1153 1513
1514 case MapNotify:
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break;
1521
1154 case UnmapNotify: 1522 case UnmapNotify:
1155 TermWin.mapped = 0; 1523 mapped = 0;
1156#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1158#endif 1526#endif
1159 break; 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break; 1528 break;
1167 1529
1168#ifdef TRANSPARENT 1530#ifdef TRANSPARENT
1169 case ReparentNotify: 1531 case ReparentNotify:
1170 rootwin_cb (ev); 1532 rootwin_cb (ev);
1171 break; 1533 break;
1172#endif /* TRANSPARENT */ 1534#endif /* TRANSPARENT */
1173 1535
1174 case GraphicsExpose: 1536 case GraphicsExpose:
1175 case Expose: 1537 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1538 if (ev.xany.window == vt)
1177 { 1539 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1540 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1544
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1550
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1551 want_refresh = 1;
1189 } 1552 }
1190 else 1553 else
1191 { 1554 {
1192 XEvent unused_event; 1555 XEvent unused_event;
1193 1556
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1558 ;
1196 &unused_event)) ; 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1560 ;
1198 GraphicsExpose, 1561
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1201 { 1563 {
1202 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1203 scrollbar_show (0); 1565 scrollbar_show (0);
1204 } 1566 }
1205#ifdef MENUBAR 1567
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1568#ifdef TRANSPARENT
1207 menubar_expose (); 1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1208#endif 1571#endif
1209 } 1572 }
1210 break; 1573 break;
1211 1574
1212 case MotionNotify: 1575 case MotionNotify:
1213#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1577 if (hidden_pointer)
1215 pointer_unblank (); 1578 pointer_unblank ();
1216#endif 1579#endif
1217#if MENUBAR 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1581 break;
1582
1583 if (ev.xany.window == vt)
1219 { 1584 {
1220 menubar_control (ev.xbutton); 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1587 ; // nop
1223#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break;
1226
1227 if (ev.xany.window == TermWin.vt)
1228 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1589 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1591 ;
1233 1592
1234 XQueryPointer (display->display, TermWin.vt, 1593 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1596 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1597 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1599 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1600 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1601 {
1243#endif 1602#endif
1603#if ISO_14755
1604 // 5.4
1605 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1606 {
1607 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1608 break;
1609 }
1610#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1611 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1612 ev.xbutton.state & Button3Mask ? 2 : 0);
1613
1246#ifdef SELECTION_SCROLLING 1614#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1615 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1616 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1617 {
1250 int dist; 1618 int dist;
1251
1252 pending_scroll_selection=1;
1253 1619
1254 /* don't clobber the current delay if we are 1620 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1621 * already in the middle of scrolling.
1256 */ 1622 */
1257 if (scroll_selection_delay<=0) 1623 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1625
1260 /* save the event params so we can highlight 1626 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1627 * the selection in the pending-scroll loop
1262 */ 1628 */
1263 selection_save_x=ev.xbutton.x; 1629 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1630 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1631 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1632
1268 /* calc number of lines to scroll */ 1633 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1634 if (ev.xbutton.y < int_bwidth)
1270 { 1635 {
1271 scroll_selection_dir = UP; 1636 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1637 dist = int_bwidth - ev.xbutton.y;
1273 } 1638 }
1274 else 1639 else
1275 { 1640 {
1276 scroll_selection_dir = DN; 1641 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1642 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1643 }
1644
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1645 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1646 / SELECTION_SCROLL_LINE_SPEEDUP
1647 + 1;
1282 MIN_IT (scroll_selection_lines, 1648 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1649 SELECTION_SCROLL_MAX_LINES);
1284 } 1650 }
1285 else 1651 else
1286 { 1652 {
1287 /* we are within the text window, so we 1653 /* we are within the text window, so we
1288 * shouldn't be scrolling 1654 * shouldn't be scrolling
1289 */ 1655 */
1290 pending_scroll_selection = 0; 1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop();
1291 } 1658 }
1292#endif 1659#endif
1293#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1294
1295 } 1661 }
1296#endif 1662#endif
1297
1298 } 1663 }
1299 } 1664 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1666 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1304 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1675 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1677 scrollbar_size ());
1311 scr_refresh (refresh_type); 1678 want_refresh = 1;
1312 refresh_limit = 0; 1679 refresh_limit = 0;
1313 scrollbar_show (1); 1680 scrollbar_show (1);
1314 } 1681 }
1315 break; 1682 break;
1316 } 1683 }
1317}
1318 1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ENABLE_OVERLAY
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1319void 1796void
1320rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1798{
1322 SET_R (this); 1799 make_current ();
1323 SET_LOCALE (locale);
1324 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1325 switch (ev.type) 1806 switch (ev.type)
1326 { 1807 {
1327 case PropertyNotify: 1808 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1809 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1340 */ 1812 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1815 return;
1346 }
1347 1816
1348 /* FALLTHROUGH */ 1817 /* FALLTHROUGH */
1349 case ReparentNotify: 1818 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1353 break; 1821 break;
1822 }
1354#endif 1823# endif
1355 }
1356} 1824}
1825#endif
1357 1826
1358void 1827void
1359rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1360{ 1829{
1361 int reportmode = 0, clickintime; 1830 int reportmode = 0, clickintime;
1362 1831
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1832 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1833
1364 if (!bypass_keystate) 1834 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836
1366 /* 1837 /*
1367 * VT window processing of button press 1838 * VT window processing of button press
1368 */ 1839 */
1369 if (ev.window == TermWin.vt) 1840 if (ev.window == vt)
1370 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1372 if (reportmode) 1856 if (reportmode)
1373 { 1857 {
1374 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1379 { 1863 {
1380 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1381 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1382 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1383 { 1868 {
1384 /* only report double clicks */ 1869 /* only report double clicks */
1385 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1386 mouse_report (ev); 1871 mouse_report (ev);
… …
1405 } 1890 }
1406 else 1891 else
1407 { 1892 {
1408 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1410 switch (ev.button) 1896 switch (ev.button)
1411 { 1897 {
1412 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1413 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1909 {
1416 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1418 else 1912 else
1419 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1928 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1437 else 1931 else
1438 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1439 MEvent.button = Button3; 1934 MEvent.button = Button3;
1440 break; 1935 break;
1441 } 1936 }
1442 } 1937 }
1938
1443 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1444 return; 1940 return;
1445 } 1941 }
1446 1942
1447 /* 1943 /*
… …
1513 upordown = 1; /* down */ 2009 upordown = 1; /* down */
1514 } 2010 }
1515 if (upordown) 2011 if (upordown)
1516 { 2012 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2015#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2016 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2017 {
1522 if (upordown < 0) 2018 if (upordown < 0)
1523 scrollBar.setUp (); 2019 scrollBar.setUp ();
… …
1539 break; 2035 break;
1540 case R_SB_ALIGN_BOTTOM: 2036 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2037 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2038 break;
1543 } 2039 }
2040
1544 if (scrollBar.style == R_SB_XTERM 2041 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2042 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2043 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2045
1549 scrollBar.setMotion (); 2046 scrollBar.setMotion ();
1550 break; 2047 break;
1551 2048
1552 case Button1: 2049 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2050 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2054 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1559 { 2056 {
1560 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1563# else 2060# else
1564 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1565# endif 2062# endif
1566 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1569# else 2066# else
1570 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1571# endif 2068# endif
1572 else 2069 else
1573 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1574 } 2071 }
1575 else 2072 else
1576 { 2073 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2075 (nrow
1579 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2077 / scrollbar_size ()));
1581 } 2078 }
2079
1582 break; 2080 break;
1583 } 2081 }
1584 } 2082 }
2083
1585 return; 2084 return;
1586 } 2085 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2086}
1595 2087
1596void 2088void
1597rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1598{ 2090{
1599 int reportmode = 0; 2091 int reportmode = 0;
1600 2092
1601 csrO = 0; /* reset csr Offset */ 2093 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2094 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2095 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2096
1605 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1606 { 2098 {
1607 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1608 scrollbar_show (0); 2100 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2101 }
2102
1614#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop();
1616#endif 2106#endif
2107
1617 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1618 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2113#if ISO_14755
2114 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return;
2117#endif
2118
1619 if (reportmode) 2119 if (reportmode)
1620 { 2120 {
1621 /* mouse report from vt window */ 2121 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2123 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2137 MEvent.button = AnyButton;
1638 mouse_report (ev); 2138 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2139#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2140 return;
1641 } 2141 }
2142
1642 /* 2143 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2144 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2145 * when overriding mouse reporting
1645 */ 2146 */
1646 if (PrivateModes & PrivMode_mouse_report 2147 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2148 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2149 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2150 selection_extend (ev.x, ev.y, 0);
1650 2151
1651 switch (ev.button) 2152 switch (ev.button)
1652 { 2153 {
1653 case Button1: 2154 case Button1:
1654 case Button3: 2155 case Button3:
1655 selection_make (ev.time); 2156 selection_make (ev.time);
1656 break; 2157 break;
2158
1657 case Button2: 2159 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2162 break;
2163
1660#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
1661 case Button4: 2165 case Button4:
1662 case Button5: 2166 case Button5:
1663 { 2167 {
1664 int i; 2168 int i;
1665 page_dirn v; 2169 page_dirn v;
1666 2170
1667 v = (ev.button == Button4) ? UP : DN; 2171 v = ev.button == Button4 ? UP : DN;
2172
1668 if (ev.state & ShiftMask) 2173 if (ev.state & ShiftMask)
1669 i = 1; 2174 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2175 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2176 i = nrow - 1;
1672 else 2177 else
1673 i = 5; 2178 i = 5;
2179
1674# ifdef MOUSE_SLIP_WHEELING 2180# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2181 if (ev.state & ControlMask)
1676 { 2182 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2183 mouse_slip_wheel_speed += v ? -1 : 1;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186
2187 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2189
2190 slip_wheel_ev.start ();
2191 }
2192 else
2193 {
2194# endif
2195 scr_page (v, i);
2196 scrollbar_show (1);
2197# ifdef MOUSE_SLIP_WHEELING
1679 } 2198 }
1680# endif 2199# endif
1681# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1);
1691 }
1692# endif
1693
1694 } 2200 }
1695 break; 2201 break;
1696#endif 2202#endif
1697
1698 } 2203 }
1699 } 2204 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704} 2205}
1705
1706 2206
1707#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
1708/* 2439/*
1709 * Check our parents are still who we think they are. 2440 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2441 * Do transparency updates if required
1711 */ 2442 */
1712int 2443int
1713rxvt_term::check_our_parents () 2444rxvt_term::check_our_parents ()
1714{ 2445{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2446 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2447 unsigned long nitems, bytes_after;
1717 Atom atype; 2448 Atom atype;
1718 unsigned char *prop = NULL; 2449 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2450 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
1722 2453
1723 pchanged = 0; 2454 pchanged = 0;
1724 2455
1725 if (! (Options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
1727 2458
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
1730 2461
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
1732 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
1733 { 2465 {
1734 if (am_transparent) 2466 if (am_transparent)
1735 { 2467 {
1736 pchanged = 1; 2468 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
1740 } 2471 }
2472
1741 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
1742 } 2474 }
1743 2475
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2477 XSync (dpy, False);
1746 2478
1747 /* 2479 /*
1748 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
1751 */ 2483 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2484 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2487 &nitems, &bytes_after, &prop) == Success);
2488
1756 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
1757 have_pixmap = 0; 2500 have_pixmap = 0;
1758 else 2501 else
1759 { 2502 {
1760 have_pixmap = 1; 2503 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2504 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2505 XFree (prop);
1763 } 2506 }
2507
1764 if (have_pixmap) 2508 if (have_pixmap)
1765 { 2509 {
1766 /* 2510 /*
1767 * Copy display->root pixmap transparency 2511 * Copy display->root pixmap transparency
1768 */ 2512 */
… …
1771 Window cr; 2515 Window cr;
1772 XImage *image; 2516 XImage *image;
1773 GC gc; 2517 GC gc;
1774 XGCValues gcvalue; 2518 XGCValues gcvalue;
1775 2519
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2524 nx = ny = 0;
1781 2525
1782 if (sx < 0) 2526 if (sx < 0)
… …
1791 nh += sy; 2535 nh += sy;
1792 ny = -sy; 2536 ny = -sy;
1793 sy = 0; 2537 sy = 0;
1794 } 2538 }
1795 2539
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
1798 allowedxerror = -1; 2544 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2546
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2549 allowedxerror = 0;
2550
1804 if (image == NULL) 2551 if (image == NULL)
1805 { 2552 {
1806 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
1807 { 2554 {
1808 pchanged = 1; 2555 pchanged = 1;
1809 if (TermWin.pixmap != None) 2556 if (pixmap != None)
1810 { 2557 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (dpy, pixmap);
1812 TermWin.pixmap = None; 2559 pixmap = None;
1813 } 2560 }
1814 } 2561 }
2562
1815 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
1816 } 2564 }
1817 else 2565 else
1818 { 2566 {
1819 if (TermWin.pixmap != None) 2567 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (dpy, pixmap);
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2569
1822 (unsigned int)szHint.width, 2570#if TINTING
1823 (unsigned int)szHint.height, 2571 if (ISSET_PIXCOLOR (Color_tint))
1824 (unsigned int)image->depth); 2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2585 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2586 XFreeGC (dpy, gc);
1830 XDestroyImage (image); 2587 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
1832 TermWin.pixmap); 2589 XClearWindow (dpy, parent[0]);
2590
1833 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2592 pchanged = 1;
2593
1835 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
1836 } 2595 }
1837 } 2596 }
1838 2597
1839 if (!am_pixmap_trans) 2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
1840 { 2601 {
1841 unsigned int n; 2602 unsigned int n;
1842 /* 2603 /*
1843 * InheritPixmap transparency 2604 * InheritPixmap transparency
1844 */ 2605 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2607 {
1849 oldp = TermWin.parent[i]; 2608 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
1851 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2610 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2611
1854 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
1855 { 2613 {
1856 if (oldp != None) 2614 if (oldp != None)
1857 pchanged = 1; 2615 pchanged = 1;
2616
1858 break; 2617 break;
1859 } 2618 }
2619
1860 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
1861 pchanged = 1; 2621 pchanged = 1;
1862 } 2622 }
1863 2623
1864 n = 0; 2624 n = 0;
1865 2625
1866 if (pchanged) 2626 if (pchanged)
1867 {
1868 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
1869 { 2628 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2630
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2632 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2634 break;
1876 } 2635 }
1877 } 2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
1878 } 2639 {
1879 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
1880 if (n > (int) (sizeof (TermWin.parent) 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1881 / sizeof (TermWin.parent[0])))
1882 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0],
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2642 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
1890 } 2644 }
1891 else 2645 else
1892 { 2646 {
1893 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1);
1903# endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2648 {
1907 ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2650 XClearWindow (dpy, parent[n]);
1909 ParentRelative); 2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1910 am_transparent = 1; 2654 am_transparent = 1;
1911 } 2655 }
1912 2656
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
1915 } 2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
1916 return pchanged; 2675 return pchanged;
1917} 2676}
1918#endif 2677#endif
1919 2678
1920/*}}} */ 2679/*}}} */
1921 2680
1922bool 2681bool
1923rxvt_term::cmd_parse () 2682rxvt_term::cmd_parse ()
1924{ 2683{
1925 bool flag = false; 2684 bool flag = false;
1926 unicode_t ch = NOCHAR; 2685 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2686 char *seq_begin; // remember start of esc-sequence here
1928 2687
1929 for (;;) 2688 for (;;)
1930 { 2689 {
1931 if (ch == NOCHAR) 2690 if (ch == NOCHAR)
1932 { 2691 {
1933 seq_begin = cmdbuf_ptr; 2692 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2693 ch = next_char ();
1935 }
1936 2694
1937 if (ch == NOCHAR) // TODO: improve 2695 if (ch == NOCHAR)
1938 break; 2696 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2697 }
2698
2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2700 {
2701 if (!seen_input)
2702 {
2703 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs
2707 // then sometimes get the size wrong.
2708 // unfortunately other programs are even more buggy and dislike
2709 // being sent SIGWINCH, so only do it when we were in fact being
2710 // resized.
2711 if (seen_resize && cmd_pid)
2712 kill (-cmd_pid, SIGWINCH);
2713 }
2714
1942 /* Read a text string from the input buffer */ 2715 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2716 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2717 bool refreshnow = false;
1945 int nlines = 0; 2718 int nlines = 0;
1946 unicode_t *str = buf; 2719 wchar_t *str = buf;
1947 2720 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2721
1950 for (;;) 2722 for (;;)
1951 { 2723 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2725 break;
1957 2726
1958 *str++ = ch; 2727 *str++ = ch;
1959 2728
1960 if (ch == '\n') 2729 if (ch == C0_LF || str >= eol)
1961 { 2730 {
2731 if (ch == C0_LF)
1962 nlines++; 2732 nlines++;
2733
1963 refresh_count++; 2734 refresh_count++;
1964 2735
1965 if (! (Options & Opt_jumpScroll) 2736 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2737 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2738 {
1968 refreshnow = true; 2739 refreshnow = true;
1969 flag = true; 2740 refresh_count = 0;
1970 ch = NOCHAR; 2741 ch = NOCHAR;
1971 break; 2742 break;
1972 } 2743 }
1973 2744
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2746 if (nlines >= nrow - 1)
1976 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1977 scr_add_lines (buf, nlines, str - buf); 2750 scr_add_lines (buf, str - buf, nlines);
2751
1978 nlines = 0; 2752 nlines = 0;
1979 str = buf; 2753 str = buf;
2754 eol = str + min (ncol, UBUFSIZ);
1980 } 2755 }
2756
2757 if (str >= eol)
2758 {
2759 if (eol >= buf + UBUFSIZ)
2760 {
2761 ch = NOCHAR;
2762 break;
2763 }
2764 else
2765 eol = min (eol + ncol, buf + UBUFSIZ);
2766 }
2767
1981 } 2768 }
1982 2769
1983 if (str >= buf + UBUFSIZ) 2770 seq_begin = cmdbuf_ptr;
1984 { 2771 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2772 }
1989 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2776 scr_add_lines (buf, str - buf, nlines);
1991 2777
1992 /* 2778 /*
1993 * If there have been a lot of new lines, then update the screen 2779 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2780 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2781 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2782 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2783 */
2001 if (refreshnow) 2784 if (refreshnow)
2002 { 2785 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2787 refresh_limit++;
2005 2788 else
2789 {
2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2006 scr_refresh (refresh_type); 2792 scr_refresh ();
2793 want_refresh = 1;
2794 }
2007 } 2795 }
2008 2796
2009 } 2797 }
2010 else 2798 else
2011 { 2799 {
… …
2026 2814
2027 return flag; 2815 return flag;
2028} 2816}
2029 2817
2030// read the next character 2818// read the next character
2031unicode_t 2819wchar_t
2032rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2033{ 2821{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2823 {
2036 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2826 return *cmdbuf_ptr++;
2039 2827
2040 wchar_t wc; 2828 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2830
2043 if (len == (size_t)-2) 2831 if (len == (size_t)-2)
2044 { 2832 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2833 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2834 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2835 break;
2048 } 2836 }
2049 2837
2050 if (len == (size_t)-1) 2838 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2840
2053 // assume wchar == unicode 2841 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2842 cmdbuf_ptr += len;
2055 return wc; 2843 return wc & UNICODE_MASK;
2056 } 2844 }
2057 2845
2058 return NOCHAR; 2846 return NOCHAR;
2059} 2847}
2848
2849// read the next octet
2850uint32_t
2851rxvt_term::next_octet () NOTHROW
2852{
2853 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR;
2856}
2857
2858static class out_of_input out_of_input;
2060 2859
2061/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2062/* 2861/*
2063 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2064 * to the command. 2863 * to the command.
2065 */ 2864 */
2066unicode_t 2865wchar_t
2067rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2867{
2069 unicode_t c = next_char (); 2868 wchar_t c = next_char ();
2869
2870 if (c == NOCHAR)
2871 throw out_of_input;
2872
2873 return c;
2874}
2875
2876uint32_t
2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2878{
2879 uint32_t c = next_octet ();
2070 2880
2071 if (c == NOCHAR) 2881 if (c == NOCHAR)
2072 throw out_of_input; 2882 throw out_of_input;
2073 2883
2074 return c; 2884 return c;
… …
2156/*}}} */ 2966/*}}} */
2157 2967
2158/* *INDENT-OFF* */ 2968/* *INDENT-OFF* */
2159enum { 2969enum {
2160 C1_40 = 0x40, 2970 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2971 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2972 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2973 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2974 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2975};
2166/* *INDENT-ON* */ 2976/* *INDENT-ON* */
2167 2977
2168/*{{{ process non-printing single characters */ 2978/*{{{ process non-printing single characters */
2169void 2979void
… …
2174 case C0_ESC: 2984 case C0_ESC:
2175 process_escape_seq (); 2985 process_escape_seq ();
2176 break; 2986 break;
2177 case C0_ENQ: /* terminal Status */ 2987 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2988 if (rs[Rs_answerbackstring])
2179 tt_write ( 2989 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2990 else
2183 tt_write ((unsigned char *)VT100_ANS, 2991 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2992 break;
2186 case C0_BEL: /* bell */ 2993 case C0_BEL: /* bell */
2187 scr_bell (); 2994 scr_bell ();
2188 break; 2995 break;
2189 case C0_BS: /* backspace */ 2996 case C0_BS: /* backspace */
… …
2205 break; 3012 break;
2206 case C0_SI: /* shift in - acs */ 3013 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3014 scr_charset_choose (0);
2208 break; 3015 break;
2209 3016
3017#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3018 // 8-bit controls
2211 case 0x90: /* DCS */ 3019 case 0x90: /* DCS */
2212 process_dcs_seq (); 3020 process_dcs_seq ();
2213 break; 3021 break;
2214 case 0x9b: /* CSI */ 3022 case 0x9b: /* CSI */
2215 process_csi_seq (); 3023 process_csi_seq ();
2216 break; 3024 break;
2217 case 0x9d: /* CSI */ 3025 case 0x9d: /* CSI */
2218 process_osc_seq (); 3026 process_osc_seq ();
2219 break; 3027 break;
3028#endif
2220 } 3029 }
2221} 3030}
2222/*}}} */ 3031/*}}} */
2223 3032
2224 3033
… …
2286void 3095void
2287rxvt_term::process_escape_seq () 3096rxvt_term::process_escape_seq ()
2288{ 3097{
2289 unicode_t ch = cmd_getc (); 3098 unicode_t ch = cmd_getc ();
2290 3099
2291 if (PrivateModes & PrivMode_vt52) 3100 if (priv_modes & PrivMode_vt52)
2292 { 3101 {
2293 process_escape_vt52 (ch); 3102 process_escape_vt52 (ch);
2294 return; 3103 return;
2295 } 3104 }
2296 3105
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3121 break;
2313 case '+': 3122 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3124 break;
2316#ifndef NO_FRILLS 3125#if !ENABLE_MINIMAL
2317 case '6': 3126 case '6':
2318 scr_backindex (); 3127 scr_backindex ();
2319 break; 3128 break;
2320#endif 3129#endif
2321 case '7': 3130 case '7':
2322 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
2323 break; 3132 break;
2324 case '8': 3133 case '8':
2325 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
2326 break; 3135 break;
2327#ifndef NO_FRILLS 3136#if !ENABLE_MINIMAL
2328 case '9': 3137 case '9':
2329 scr_forwardindex (); 3138 scr_forwardindex ();
2330 break; 3139 break;
2331#endif 3140#endif
2332 case '=': 3141 case '=':
… …
2342 break; 3151 break;
2343 3152
2344 /* 8.3.87: NEXT LINE */ 3153 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3154 case C1_NEL: /* ESC E */
2346 { 3155 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3156 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3158 }
2350 break; 3159 break;
2351 3160
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3161 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3162 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3172 case C1_RI: /* ESC M */
2364 scr_index (DN); 3173 scr_index (DN);
2365 break; 3174 break;
2366 3175
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3176 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3177 /*case C1_SS2: scr_single_shift (2); break; */
2369 3178
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3179 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3180 /*case C1_SS3: scr_single_shift (3); break; */
2372 3181
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3182 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3183 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3184 process_dcs_seq ();
2376 break; 3185 break;
2377 3186
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3188 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3190 break; /* steal obsolete ESC [ c */
2383 3191
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3193 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3194 process_csi_seq ();
… …
2391 process_osc_seq (); 3199 process_osc_seq ();
2392 break; 3200 break;
2393 3201
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3202 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3203 case 'c':
3204 mbstate.reset ();
2396 scr_poweron (); 3205 scr_poweron ();
2397 scrollbar_show (1); 3206 scrollbar_show (1);
2398 break; 3207 break;
2399 3208
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3209 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3221
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3222/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3223/* *INDENT-OFF* */
2415enum { 3224enum {
2416 CSI_ICH = 0x40, 3225 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3226 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3227 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3228 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3229 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3230 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3231 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3246 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3247 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3248 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3249 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3250 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3251 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3252 };
2444/* *INDENT-ON* */ 3253/* *INDENT-ON* */
2445 3254
2446void 3255void
2447rxvt_term::process_csi_seq () 3256rxvt_term::process_csi_seq ()
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 3305 if (arg[p] == -1)
2497 arg[p] = ndef; 3306 arg[p] = ndef;
2498 3307
2499#ifdef DEBUG_CMD
2500 fprintf (stderr, "CSI ");
2501 for (p = 0; p < nargs; p++)
2502 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2503 fprintf (stderr, "%c\n", ch);
2504#endif
2505
2506 /* 3308 /*
2507 * private mode handling 3309 * private mode handling
2508 */ 3310 */
2509 if (priv) 3311 if (priv)
2510 { 3312 {
2511 switch (priv) 3313 switch (priv)
2512 { 3314 {
2513 case '>': 3315 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
2516 break; 3327 break;
2517 case '?': 3328 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3331 break;
… …
2625 3436
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3437 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3438 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3439 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3440 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3441 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3442 break;
2632 3443
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3444 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3445 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3446 break;
2637 3447
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3448 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3449 process_sgr_mode (nargs, arg);
2640 break; 3450 break;
… …
2646 tt_printf ("\033[0n"); 3456 tt_printf ("\033[0n");
2647 break; 3457 break;
2648 case 6: /* CPR requested */ 3458 case 6: /* CPR requested */
2649 scr_report_position (); 3459 scr_report_position ();
2650 break; 3460 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3461 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3463 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3464 break;
2655#endif
2656 case 8: /* unofficial extension */ 3465 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3467 break;
2659 } 3468 }
2660 break; 3469 break;
2661 3470
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3471 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3504 break;
2696 3505
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3506 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3507 if (arg[0] == 4)
2699 scr_insert_mode (0); 3508 scr_insert_mode (0);
3509 else if (arg[0] == 20)
3510 priv_modes &= ~PrivMode_LFNL;
2700 break; 3511 break;
2701 3512
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3513 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3514 if (arg[0] == 4)
2704 scr_insert_mode (1); 3515 scr_insert_mode (1);
3516 else if (arg[0] == 20)
3517 priv_modes |= PrivMode_LFNL;
2705 break; 3518 break;
2706 3519
2707 /* 3520 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3521 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3522 */
… …
2721 break; 3534 break;
2722 case CSI_75: 3535 case CSI_75:
2723 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
2724 break; 3537 break;
2725 3538
2726#ifndef NO_FRILLS 3539#if !ENABLE_MINIMAL
2727 case CSI_74: 3540 case CSI_74:
2728 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
2729 break; 3542 break;
2730#endif 3543#endif
2731 3544
… …
2738 break; 3551 break;
2739 } 3552 }
2740} 3553}
2741/*}}} */ 3554/*}}} */
2742 3555
2743#ifndef NO_FRILLS 3556#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3557/* ARGSUSED */
2745void 3558void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3560{
2748 int x, y; 3561 int x, y;
2749 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
2750 Window wdummy; 3563 Window wdummy;
3564
3565 dLocal (Display *, dpy);
2751 3566
2752 if (nargs == 0) 3567 if (nargs == 0)
2753 return; 3568 return;
2754 3569
2755 switch (args[0]) 3570 switch (args[0])
2756 { 3571 {
2757 /* 3572 /*
2758 * commands 3573 * commands
2759 */ 3574 */
2760 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (dpy, parent[0]);
2762 break; 3577 break;
2763 case 2: /* iconify window */ 3578 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3580 break;
2767 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3583 break;
2770 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3586 break;
2773 case 5: /* raise window */ 3587 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
2775 break; 3589 break;
2776 case 6: /* lower window */ 3590 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (dpy, parent[0]);
2778 break; 3592 break;
2779 case 7: /* refresh window */ 3593 case 7: /* refresh window */
2780 scr_touch (true); 3594 scr_touch (true);
2781 break; 3595 break;
2782 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
2785 break; 3599 break;
2786 3600
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3602 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
2792 break; 3606 break;
2793
2794 3607
2795 /* 3608 /*
2796 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
2797 */ 3610 */
2798 case 11: /* report window state */ 3611 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3614 break;
2802 case 13: /* report window position */ 3615 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3621 break;
2809 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3625 break;
2813 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3628 break;
2816 case 19: /* report window size (chars) */ 3629 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3631 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3633 {
3634 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s);
3638 }
2823 break; 3639 break;
2824 case 21: /* report window title */ 3640 case 21: /* report window title */
3641 {
3642 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s);
3646 }
2827 break; 3647 break;
2828#endif
2829 } 3648 }
2830} 3649}
2831#endif 3650#endif
2832 3651
2833/*----------------------------------------------------------------------*/ 3652/*----------------------------------------------------------------------*/
2834/* 3653/*
2835 * get input up until STRING TERMINATOR (or BEL) 3654 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3655 * ends_how is terminator used. returned input must be free()'d
2837 */ 3656 */
2838unsigned char * 3657char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3658rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3659{
2841 int seen_esc = 0; /* seen escape? */ 3660 unicode_t ch;
3661 bool seen_esc = false;
2842 unsigned int n = 0; 3662 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3663 wchar_t string[STRING_MAX];
2846 3664
2847 while ((ch = cmd_getc ())) 3665 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3666 {
2849 if (ch == C0_BEL 3667 if (seen_esc)
2850 || ch == CHAR_ST 3668 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3669 if (ch == 0x5c) /* 7bit ST */
2852 break; 3670 break;
2853 3671 else
3672 return NULL;
3673 }
2854 if (ch == C0_ESC) 3674 else if (ch == C0_ESC)
2855 { 3675 {
2856 seen_esc = 1; 3676 seen_esc = true;
2857 continue; 3677 continue;
2858 } 3678 }
3679 else if (ch == C0_BEL || ch == CHAR_ST)
3680 break;
2859 else if (ch == '\t') 3681 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3682 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3683 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
2863 3685
2864 if (n < sizeof (string) - 1) 3686 seen_esc = false;
3687
3688 if (n >= STRING_MAX - 1)
3689 // stop at some sane length
3690 return NULL;
3691
2865 string[n++] = ch; 3692 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3693 }
2869 3694
2870 string[n++] = '\0'; 3695 string[n++] = '\0';
2871 3696
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3698
2877 return s; 3699 return rxvt_wcstombs (string);
2878} 3700}
2879 3701
2880/*----------------------------------------------------------------------*/ 3702/*----------------------------------------------------------------------*/
2881/* 3703/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3705 */
2884void 3706void
2885rxvt_term::process_dcs_seq () 3707rxvt_term::process_dcs_seq ()
2886{ 3708{
2887 unsigned char *s; 3709 char *s;
2888 unicode_t eh; 3710 unicode_t eh;
2889 3711
2890 /* 3712 /*
2891 * Not handled yet 3713 * Not handled yet
2892 */ 3714 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3733 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3734 arg = arg * 10 + (ch - '0');
2913 3735
2914 if (ch == ';') 3736 if (ch == ';')
2915 { 3737 {
2916 unsigned char *s = get_to_st (eh); 3738 char *s = get_to_st (eh);
2917 3739
2918 if (s) 3740 if (s)
2919 { 3741 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3742 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3743 free (s);
2934 } 3744 }
2935 } 3745 }
2936} 3746}
3747
3748void
3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3750{
3751 if (str[0] == '?' && !str[1])
3752 {
3753 rgba c;
3754 pix_colors_focused[color].get (c);
3755
3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762 }
3763 else
3764 set_window_color (color, str);
3765}
3766
2937/* 3767/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3769 */
2960void 3770void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3772{
2963 int changed = 0;
2964 int color; 3773 int color;
2965 char *buf, *name; 3774 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1];
3776 int saveop = op;
3777
3778 dLocal (Display *, dpy);
2966 3779
2967 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
2968 switch (op) 3785 switch (op)
2969 { 3786 {
2970 case XTerm_name: 3787 case XTerm_name:
2971 set_title (str); 3788 set_title (str);
2972 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3791 set_icon_name (str);
2975 break; 3792 break;
2976 case XTerm_title: 3793 case XTerm_title:
2977 set_title (str); 3794 set_title (str);
2978 break; 3795 break;
3796 case XTerm_property:
3797 if (str[0] == '?')
3798 {
3799 Atom prop = display->atom (str + 1);
3800 Atom actual_type;
3801 int actual_format;
3802 unsigned long nitems;
3803 unsigned long bytes_after;
3804 unsigned char *value = 0;
3805 const char *str = "";
3806
3807 if (prop
3808 && XGetWindowProperty (dpy, parent[0],
3809 prop, 0, 1<<16, 0, AnyPropertyType,
3810 &actual_type, &actual_format,
3811 &nitems, &bytes_after, &value) == Success
3812 && actual_type != None
3813 && actual_format == 8)
3814 str = (const char *)(value);
3815
3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3817
3818 XFree (value);
3819 }
3820 else
3821 {
3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3823
3824 if (eq)
3825 {
3826 *eq = 0;
3827 set_utf8_property (display->atom (str), eq + 1);
3828 }
3829 else
3830 XDeleteProperty (dpy, parent[0],
3831 display->atom (str));
3832 }
3833 break;
3834
2979 case XTerm_Color: 3835 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3836 for (buf = (char *)str; buf && *buf;)
2981 { 3837 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3838 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3839 break;
2984 3840
2985 *name++ = '\0'; 3841 *name++ = '\0';
2986 color = atoi (buf); 3842 color = atoi (buf) + minCOLOR;
2987 3843
2988 if (color < 0 || color >= TOTAL_COLORS) 3844 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3845 break;
2990 3846
2991 if ((buf = STRCHR (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3848 *buf++ = '\0';
2993 3849
2994 set_window_color (color + minCOLOR, name); 3850 process_color_seq (op, color, name, resp);
2995 } 3851 }
3852 break;
3853 case XTerm_Color00:
3854 process_color_seq (op, Color_fg, str, resp);
3855 break;
3856 case XTerm_Color01:
3857 process_color_seq (op, Color_bg, str, resp);
2996 break; 3858 break;
2997#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3861 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3862 break;
3001#endif 3863#endif
3002 case XTerm_Color_pointer: 3864 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break;
3867 case XTerm_Color_pointer_bg:
3868 process_color_seq (op, Color_pointer_bg, str, resp);
3004 break; 3869 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str);
3008 break;
3009 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str);
3011 break;
3012 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3872 process_color_seq (op, Color_RV, str, resp);
3014 break; 3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3881 break;
3882 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp);
3884 break;
3015#endif 3885#endif
3886#if TRANSPARENT && TINTING
3887 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp);
3016 3889
3017 case XTerm_Menu: 3890 check_our_parents ();
3891
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894
3895 break;
3896#endif
3897
3898 case Rxvt_Pixmap:
3018 /* 3899 {
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap:
3024 if (*str != ';') 3900 if (*str != ';')
3025 { 3901 {
3026#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3905 scr_touch (true);
3906#endif
3031 } 3907 }
3908
3909 int changed = 0;
3910
3032 while ((str = STRCHR (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3033 { 3912 {
3034 str++; 3913 str++;
3035#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3037#endif 3916#endif
3038
3039 } 3917 }
3918
3040 if (changed) 3919 if (changed)
3041 { 3920 {
3042#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3922 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3923 scr_touch (true);
3924#endif
3046 } 3925 }
3926 }
3047 break; 3927 break;
3048 3928
3049 case XTerm_restoreFG: 3929 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3051 break; 3931 break;
3052 case XTerm_restoreBG: 3932 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3933 set_window_color (Color_bg, str);
3054 break; 3934 break;
3935
3055 case XTerm_logfile: 3936 case XTerm_logfile:
3056 // TODO, when secure mode? 3937 // TODO, when secure mode?
3057 break; 3938 break;
3058 case XTerm_font: 3939
3059 change_font (str);
3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
3080#if 0 3940#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3082 { 3942 {
3083 int fd; 3943 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3945 {
3086 scr_dump (fd); 3946 scr_dump (fd);
3087 close (fd); 3947 close (fd);
3088 } 3948 }
3089 } 3949 }
3950 break;
3951#endif
3952 case XTerm_font:
3953 op = URxvt_font;
3954 case URxvt_font:
3955#if ENABLE_STYLES
3956 case URxvt_boldFont:
3957 case URxvt_italicFont:
3958 case URxvt_boldItalicFont:
3959#endif
3960 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp);
3965 else
3966 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)];
3968
3969 res = strdup (str);
3970 allocated.push_back ((void *)res);
3971 set_fonts ();
3972 }
3973 break;
3974
3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3984 case URxvt_locale:
3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3987 else
3988 {
3989 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale ();
3992 }
3993 break;
3994
3995 case URxvt_view_up:
3996 case URxvt_view_down:
3997 {
3998 int lines = atoi (str);
3999
4000 if (lines)
4001 scr_page (op == URxvt_view_up ? UP : DN, lines);
4002 else
4003 scr_erase_savelines ();
4004 }
4005
4006 break;
4007#endif
4008
4009#if ENABLE_PERL
4010 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4012 ; // no responses yet
3090 break; 4013 break;
3091#endif 4014#endif
3092 } 4015 }
3093} 4016}
3094/*----------------------------------------------------------------------*/ 4017/*----------------------------------------------------------------------*/
… …
3108{ 4031{
3109 int state; 4032 int state;
3110 4033
3111 if (mode == 's') 4034 if (mode == 's')
3112 { 4035 {
3113 SavedModes |= (PrivateModes & bit); 4036 SavedModes |= (priv_modes & bit);
3114 return -1; 4037 return -1;
3115 } 4038 }
3116 else 4039 else
3117 { 4040 {
3118 if (mode == 'r') 4041 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4043 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4044 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4045 PrivMode (state, bit);
3123 } 4046 }
3124 4047
3125 return state; 4048 return state;
3126} 4049}
3127 4050
3128/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
3129void 4052void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 4054{
3132 unsigned int i, j; 4055 unsigned int i, j;
3133 int state; 4056 int state;
3134 4057
3135 static const struct 4058 static const struct
… …
3144 { 3, PrivMode_132 }, 4067 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4068 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
4072 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4074 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 4075 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4078#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4079 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4080 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4081 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4082 // 45 margin bell NYI
3163 // 46 start logging 4083 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4095 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4096 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4097 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4098 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4099 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4100 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4101 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4102 };
3183 4103
3184 if (nargs == 0) 4104 if (nargs == 0)
3185 return; 4105 return;
… …
3203 } 4123 }
3204 4124
3205 /* extra handling for values with state unkept */ 4125 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4126 switch (arg[i])
3207 { 4127 {
4128#if ENABLE_STYLES
4129 case 1021:
4130 set_option (Opt_intensityStyles, mode);
4131
4132 scr_touch (true);
4133 break;
4134#endif
3208 case 1048: /* alternative cursor save */ 4135 case 1048: /* alternative cursor save */
3209 case 1049: 4136 case 1049:
4137 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4138 if (mode == 0)
3211 scr_cursor (RESTORE); 4139 scr_cursor (RESTORE);
3212 else if (mode == 1) 4140 else if (mode == 1)
3213 scr_cursor (SAVE); 4141 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4142 break;
3215 } 4143 }
3216 4144
3217 if (state >= 0) 4145 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4146 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4147 switch (arg[i])
… …
3225 * within VT52 mode 4153 * within VT52 mode
3226 */ 4154 */
3227 PrivMode (1, PrivMode_vt52); 4155 PrivMode (1, PrivMode_vt52);
3228 break; 4156 break;
3229 case 3: /* 80/132 */ 4157 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4158 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4159 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4160 break;
3233 case 4: /* smooth scrolling */ 4161 case 4: /* smooth scrolling */
3234 if (state) 4162 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 4163 break;
3239 case 5: /* reverse video */ 4164 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4165 scr_rvideo_mode (state);
3241 break; 4166 break;
3242 case 6: /* relative/absolute origins */ 4167 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4168 scr_relative_origin (state);
3244 break; 4169 break;
3245 case 7: /* autowrap */ 4170 case 7: /* autowrap */
3246 scr_autowrap (state); 4171 scr_autowrap (state);
3247 break; 4172 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4177 break;
3253#ifdef menuBar_esc
3254 case menuBar_esc:
3255#ifdef MENUBAR
3256 map_menuBar (state);
3257#endif
3258 break;
3259#endif
3260#ifdef scrollBar_esc 4178#ifdef scrollBar_esc
3261 case scrollBar_esc: 4179 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
3263 { 4181 {
3264 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
… …
3267 break; 4185 break;
3268#endif 4186#endif
3269 case 25: /* visible/invisible cursor */ 4187 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4188 scr_cursor_visible (state);
3271 break; 4189 break;
3272 /* case 35: - shift keys */ 4190 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4191 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4192 case 47: /* secondary screen */
3275 scr_change_screen (state); 4193 scr_change_screen (state);
3276 break; 4194 break;
3277 /* case 66: - application key pad */ 4195 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4196 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4197 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4198 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4199 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4200 break;
3283#if 0 4201#if 0
3284 case 1001: 4202 case 1001:
3285 break; /* X11 mouse highlighting */ 4203 break; /* X11 mouse highlighting */
3286#endif 4204#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4205 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 4206 set_option (Opt_scrollTtyOutput, !state);
3292 break; 4207 break;
3293 case 1011: /* scroll to bottom on key press */ 4208 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4209 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 4210 break;
3299 case 1047: /* secondary screen w/ clearing */ 4211 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4212 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4214 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4215 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4216 break;
4217 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY)
4221 scr_erase_screen (2);
4222 break;
3306 default: 4223 default:
3307 break; 4224 break;
3308 } 4225 }
3309 } 4226 }
3310} 4227}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4250 rendset = 0, rendstyle = ~RS_None;
3334 break; 4251 break;
3335 case 1: 4252 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4253 rendset = 1, rendstyle = RS_Bold;
3337 break; 4254 break;
4255 //case 2: // low intensity
4256 case 3:
4257 rendset = 1, rendstyle = RS_Italic;
4258 break;
3338 case 4: 4259 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4260 rendset = 1, rendstyle = RS_Uline;
3340 break; 4261 break;
3341 case 5: 4262 case 5: // slowly blinking
4263 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4264 rendset = 1, rendstyle = RS_Blink;
3343 break; 4265 break;
4266 //case 6: // scoansi light background
3344 case 7: 4267 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4268 rendset = 1, rendstyle = RS_RVid;
3346 break; 4269 break;
3347 case 8: 4270 case 8:
3348 // invisible. NYI 4271 // invisible. NYI
3349 break; 4272 break;
3350 case 22: 4273 //case 9: // crossed out
4274 //case 10: // scoansi acs off, primary font
4275 //case 11: // scoansi acs on, first alt font
4276 //case 12: // scoansi acs on, |0x80, second alt font
4277 //...
4278 //case 19: // ninth alt font
4279 //case 20: // gothic
4280 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4281 rendset = 0, rendstyle = RS_Bold;
4282 break;
4283 case 22: // normal intensity
4284 rendset = 0, rendstyle = RS_Bold;
4285 break;
4286 case 23: // disable italic
4287 rendset = 0, rendstyle = RS_Italic;
3352 break; 4288 break;
3353 case 24: 4289 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4290 rendset = 0, rendstyle = RS_Uline;
3355 break; 4291 break;
3356 case 25: 4292 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4293 rendset = 0, rendstyle = RS_Blink;
3358 break; 4294 break;
4295 case 26: // variable spacing (iso 8613)
4296 rendset = 0, rendstyle = RS_Blink;
4297 break;
3359 case 27: 4298 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4299 rendset = 0, rendstyle = RS_RVid;
3361 break; 4300 break;
3362 case 28:
3363 // visible. NYI 4301 //case 28: // visible. NYI
3364 break; 4302 //case 29: // not crossed-out
3365 } 4303 }
3366 4304
3367 if (rendset != -1) 4305 if (rendset != -1)
3368 { 4306 {
3369 scr_rendition (rendset, rendstyle); 4307 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4318 case 35:
3381 case 36: 4319 case 36:
3382 case 37: 4320 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4321 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4322 break;
3385#ifdef TTY_256COLOR 4323 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4324 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4325 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4326 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4327 i += 2;
3391 } 4328 }
3392 break; 4329 break;
3393#endif
3394 case 39: /* default fg */ 4330 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4331 scr_color (Color_fg, Color_fg);
3396 break; 4332 break;
3397 4333
3398 case 40: 4334 case 40:
… …
3403 case 45: 4339 case 45:
3404 case 46: 4340 case 46:
3405 case 47: 4341 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4343 break;
3408#ifdef TTY_256COLOR 4344 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4345 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4346 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4347 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4348 i += 2;
3414 } 4349 }
3415 break; 4350 break;
3416#endif
3417 case 49: /* default bg */ 4351 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
3419 break; 4353 break;
3420 4354
3421#ifndef NO_BRIGHTCOLOR 4355 //case 50: // not variable spacing
4356
4357#if !ENABLE_MINIMAL
3422 case 90: 4358 case 90:
3423 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
3424 case 92: 4360 case 92:
3425 case 93: 4361 case 93:
3426 case 94: 4362 case 94:
3427 case 95: 4363 case 95:
3428 case 96: 4364 case 96:
3429 case 97: 4365 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4367 break;
3433 case 100: 4368 case 100:
3434 case 101: /* set bright bg color */ 4369 case 101: /* set bright bg color */
3435 case 102: 4370 case 102:
3436 case 103: 4371 case 103:
3437 case 104: 4372 case 104:
3438 case 105: 4373 case 105:
3439 case 106: 4374 case 106:
3440 case 107: 4375 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4376 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4377 break;
3444#endif 4378#endif
3445
3446 } 4379 }
3447 } 4380 }
3448} 4381}
3449/*}}} */ 4382/*}}} */
3450 4383
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4384/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4385void
3453rxvt_term::process_graphics () 4386rxvt_term::process_graphics ()
3454{ 4387{
3455 unicode_t ch, cmd = cmd_getc (); 4388 unicode_t ch, cmd = cmd_getc ();
3456 4389
3457 if (cmd == 'Q') 4390 if (cmd == 'Q')
3458 { /* query graphics */ 4391 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4392 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4393 return;
3461 } 4394 }
3462 /* swallow other graphics sequences until terminating ':' */ 4395 /* swallow other graphics sequences until terminating ':' */
3463 do 4396 do
3464 ch = cmd_getc (); 4397 ch = cmd_getc ();
… …
3474 */ 4407 */
3475void 4408void
3476rxvt_term::tt_printf (const char *fmt,...) 4409rxvt_term::tt_printf (const char *fmt,...)
3477{ 4410{
3478 va_list arg_ptr; 4411 va_list arg_ptr;
3479 unsigned char buf[256]; 4412 char buf[256];
3480 4413
3481 va_start (arg_ptr, fmt); 4414 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4415 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4416 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4417 tt_write (buf, strlen (buf));
3485} 4418}
3486 4419
3487/* ---------------------------------------------------------------------- */ 4420/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4421/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4422 * or generated by us in response to a query ESC sequence.
3490 */ 4423 */
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4425
3491void 4426void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4428{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return;
3495 4431
3496 if (len) 4432 if (pty->pty < 0)
4433 return;
4434
4435 if (v_buflen == 0)
4436 {
4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4438
4439 if ((unsigned int)written == len)
4440 return;
4441
4442 data += written;
4443 len -= written;
3497 { 4444 }
4445
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4447
4448 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len;
4450
4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4452}
4453
4454void rxvt_term::pty_write ()
4455{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4457
4458 if (written > 0)
4459 {
4460 v_buflen -= written;
4461
3498 if (v_buflen == 0) 4462 if (v_buflen == 0)
3499 { 4463 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4464 free (v_buffer);
3527 v_buffer = 0; 4465 v_buffer = 0;
3528 v_buflen = 0; 4466 v_buflen = 0;
3529 4467
3530 pty_ev.set (EVENT_READ); 4468 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4469 return;
3543 } 4470 }
4471
4472 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4473 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ);
3545} 4476}
3546 4477
3547/*----------------------- end-of-file (C source) -----------------------*/ 4478/*----------------------- end-of-file (C source) -----------------------*/
3548 4479

Diff Legend

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