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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC

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

Diff Legend

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