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.269 by root, Tue Jan 17 12:22:59 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;
… …
199 scr_move_to (0, 1); 443 scr_move_to (0, 1);
200 return; 444 return;
201 } 445 }
202 else if (keysym == XK_End) 446 else if (keysym == XK_End)
203 { 447 {
204 scr_move_to (1, 0); 448 scr_move_to (1, 1);
205 return; 449 return;
206 } 450 }
207 } 451 }
208#endif 452#endif
209 } 453 }
… …
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 defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 925unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 927{
628 unsigned int n, s; 928 unsigned int n, s;
629 929
630 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 932
633 if (n > 0 && s < count) 933 if (n > 0 && s < count)
634 { 934 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 935 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 936 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 937 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 938 cmdbuf_endp -= n;
639 s += n; 939 s += n;
640 } 940 }
… …
650 950
651 cmd_parse (); 951 cmd_parse ();
652 952
653 return 0; 953 return 0;
654} 954}
655#endif /* MENUBAR_MAX */ 955#endif
656 956
657void 957void
658rxvt_term::flush () 958rxvt_term::flush ()
659{ 959{
960 flush_ev.stop ();
961
660#ifdef TRANSPARENT 962#ifdef TRANSPARENT
661 if (want_full_refresh) 963 if (want_full_refresh)
662 { 964 {
663 want_full_refresh = 0; 965 want_full_refresh = 0;
664 scr_clear (); 966 scr_clear ();
665 scr_touch (false); 967 scr_touch (false);
666 want_refresh = 1;
667 } 968 }
668#endif 969#endif
669 970
670 if (want_refresh) 971 if (want_refresh)
671 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
672 scr_refresh (refresh_type); 1011 scr_refresh ();
673 scrollbar_show (1); 1012 scrollbar_show (1);
674#ifdef USE_XIM 1013#ifdef USE_XIM
675 IMSendSpot (); 1014 IMSendSpot ();
676#endif 1015#endif
677 } 1016 }
… …
680} 1019}
681 1020
682void 1021void
683rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
684{ 1023{
685 SET_R (this); 1024 make_current ();
686 SET_LOCALE (locale);
687 1025
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0;
688 flush (); 1039 flush ();
689} 1040}
690 1041
691#ifdef CURSOR_BLINK 1042#ifdef CURSOR_BLINK
692void 1043void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1061 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1062 }
712} 1063}
713#endif 1064#endif
714 1065
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void
1068rxvt_term::cont_scroll_cb (time_watcher &w)
1069{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1075 }
1076}
1077#endif
1078
1079#ifdef SELECTION_SCROLLING
1080void
1081rxvt_term::sel_scroll_cb (time_watcher &w)
1082{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 }
1089}
1090#endif
1091
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void
1094rxvt_term::slip_wheel_cb (time_watcher &w)
1095{
1096 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 }
1106}
1107#endif
1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
715bool 1127bool
716rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
717{ 1129{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1131
720 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
721 { 1133 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1135 n = 0;
724 } 1136 }
725 1137
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
729 1141
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
731 1143
732 if (n > 0) 1144 if (r > 0)
733 { 1145 {
734 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
735 return true; 1147 return true;
736 } 1148 }
737 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
738 destroy (); 1161 destroy ();
1162 }
739 1163
740 return false; 1164 return false;
741} 1165}
742 1166
743void 1167void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1169{
746 SET_R (this); 1170 make_current ();
747 SET_LOCALE (locale);
748 1171
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1174 while (pty_fill ())
754 if (cmd_parse ()) 1175 if (cmd_parse ())
755 break; 1176 break;
1177
1178 if (revents & EVENT_WRITE)
1179 pty_write ();
1180}
1181
1182void
1183rxvt_term::pointer_unblank ()
1184{
1185 XDefineCursor (display->display, vt, TermWin_cursor);
1186 recolour_cursor ();
1187
1188#ifdef POINTER_BLANK
1189 hidden_pointer = 0;
1190
1191 if (OPTION (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif
756} 1194}
757 1195
758#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
759void 1197void
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 () 1198rxvt_term::pointer_blank ()
773{ 1199{
774 if (! (Options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
775 return; 1201 return;
776 1202
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
778 XFlush (display->display); 1204 XFlush (display->display);
779 1205
780 hidden_pointer = 1; 1206 hidden_pointer = 1;
781} 1207}
782 1208
783void 1209void
784rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
785{ 1211{
786 SET_R (this); 1212 make_current ();
787 SET_LOCALE (locale);
788 1213
789 pointer_blank (); 1214 pointer_blank ();
790} 1215}
791#endif 1216#endif
792 1217
… …
799 x = ev.x; 1224 x = ev.x;
800 y = ev.y; 1225 y = ev.y;
801 pixel_position (&x, &y); 1226 pixel_position (&x, &y);
802 1227
803 if (MEvent.button == AnyButton) 1228 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1229 button_number = 3;
806 }
807 else 1230 else
808 { 1231 {
809 button_number = MEvent.button - Button1; 1232 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1233 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1234 if (button_number >= 3)
812 button_number += (64 - 3); 1235 button_number += (64 - 3);
813 } 1236 }
814 1237
815 if (PrivateModes & PrivMode_MouseX10) 1238 if (priv_modes & PrivMode_MouseX10)
816 { 1239 {
817 /* 1240 /*
818 * do not report ButtonRelease 1241 * do not report ButtonRelease
819 * no state info allowed 1242 * no state info allowed
820 */ 1243 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1258 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1259 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1260#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1261 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1262#endif
840
841 } 1263 }
842 1264
843#ifdef DEBUG_MOUSEREPORT 1265#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1266 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1267 if (key_state & 16)
846 fputc ('C', stderr); 1268 fputc ('C', stderr);
847 if (key_state & 4) 1269 if (key_state & 4)
848 fputc ('S', stderr); 1270 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1274 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1275 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1276 button_number,
855 x + 1, 1277 x + 1,
856 y + 1); 1278 y + 1);
857#else 1279#endif
1280
858 tt_printf ("\033[M%c%c%c", 1281 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1282 (32 + button_number + key_state),
860 (32 + x + 1), 1283 (32 + x + 1),
861 (32 + y + 1)); 1284 (32 + y + 1));
862#endif
863} 1285}
864 1286
865#ifdef USING_W11LIB 1287#ifdef USING_W11LIB
866void 1288void
867rxvt_W11_process_x_event (XEvent *ev) 1289rxvt_W11_process_x_event (XEvent *ev)
… …
874 1296
875/*{{{ process an X event */ 1297/*{{{ process an X event */
876void 1298void
877rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
878{ 1300{
879 SET_R (this); 1301 make_current ();
880 SET_LOCALE (locale);
881 1302
882#if defined(CURSOR_BLINK) 1303 dDisp;
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
884 {
885 if (hidden_cursor)
886 {
887 hidden_cursor = 0;
888 want_refresh = 1;
889 }
890 1304
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
892 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
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; 1308 return;
912#endif
913 1309
1310 // for XQueryPointer
914 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1313 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 1314
967 switch (ev.type) 1315 switch (ev.type)
968 { 1316 {
969 case KeyPress: 1317 case KeyPress:
1318#if ISO_14755
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
970 lookup_key (ev.xkey); 1321 lookup_key (ev.xkey);
1322
1323 break;
1324
1325 case KeyRelease:
1326 {
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
971 break; 1389 break;
972 1390
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
978 else 1396#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; 1397 break;
987 } 1398 }
988#endif
989 1399
990 case ButtonPress: 1400 case ButtonPress:
991 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
992 break; 1402 break;
993 1403
… …
995 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
996 break; 1406 break;
997 1407
998 case ClientMessage: 1408 case ClientMessage:
999 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1002#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1008 { 1436 {
1009 /* Get Dnd data */ 1437 /* Get Dnd data */
1010 Atom ActualType; 1438 Atom ActualType;
1011 int ActualFormat; 1439 int ActualFormat;
1012 unsigned char *data; 1440 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1014 1442
1015 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1445 0L, 1000000L,
1018 False, AnyPropertyType, 1446 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1021 &data); 1449 &data);
1022 XChangeProperty (display->display, display->root, 1450 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1451 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1454 }
1030#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1031 break; 1456 break;
1032 1457
1033 case MappingNotify: 1458 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1459 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1460 break;
1036 1461
1037 /* 1462 /*
1038 * XXX: this is not the _current_ arrangement 1463 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1464 * Here's my conclusion:
… …
1058 break; 1483 break;
1059 } 1484 }
1060 break; 1485 break;
1061 1486
1062 case FocusIn: 1487 case FocusIn:
1063 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1064 { 1497 {
1065 TermWin.focus = 1; 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1499 ;
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 1500
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 {
1503 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 }
1506
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent))
1509 check_our_parents ();
1510#endif
1076 } 1511 }
1077 break; 1512 break;
1078 1513
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: 1514 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1099 { 1516 && ev.xproperty.state == PropertyNewValue)
1100 int height, width; 1517 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1518
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; 1519 break;
1131 1520
1132 case SelectionClear: 1521 case SelectionClear:
1133 selection_clear (); 1522 selection_clear ();
1134 break; 1523 break;
1135 1524
1136 case SelectionNotify: 1525 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1526 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1527 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1528 break;
1141 1529
1142 case SelectionRequest: 1530 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1144 break; 1532 break;
1145 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1146 case UnmapNotify: 1542 case UnmapNotify:
1147 TermWin.mapped = 0; 1543 mapped = 0;
1148#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1150#endif 1546#endif
1151 break; 1547 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; 1548 break;
1159 1549
1160#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1161 case ReparentNotify: 1551 case ReparentNotify:
1162 rootwin_cb (ev); 1552 rootwin_cb (ev);
1163 break; 1553 break;
1164#endif /* TRANSPARENT */ 1554#endif /* TRANSPARENT */
1165 1555
1166 case GraphicsExpose: 1556 case GraphicsExpose:
1167 case Expose: 1557 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == vt)
1169 { 1559 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1560 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1564
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1570
1178 // ev.xexpose.width, TermWin.height, False);
1179#endif
1180 want_refresh = 1; 1571 want_refresh = 1;
1181 } 1572 }
1182 else 1573 else
1183 { 1574 {
1184 XEvent unused_event; 1575 XEvent unused_event;
1185 1576
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1578 ;
1188 &unused_event)) ; 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1580 ;
1190 GraphicsExpose, 1581
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1193 { 1583 {
1194 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1195 scrollbar_show (0); 1585 scrollbar_show (0);
1196 } 1586 }
1197#ifdef MENUBAR 1587
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1588#ifdef TRANSPARENT
1199 menubar_expose (); 1589 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window);
1200#endif 1591#endif
1201 } 1592 }
1202 break; 1593 break;
1203 1594
1204 case MotionNotify: 1595 case MotionNotify:
1205#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1597 if (hidden_pointer)
1207 pointer_unblank (); 1598 pointer_unblank ();
1208#endif 1599#endif
1209#if MENUBAR 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1210 if (isMenuBarWindow (ev.xany.window)) 1601 break;
1602
1603 if (ev.xany.window == vt)
1211 { 1604 {
1212 menubar_control (ev.xbutton); 1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1607 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1609 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1224 ; 1611 ;
1225 1612
1226 XQueryPointer (display->display, TermWin.vt, 1613 XQueryPointer (disp, vt,
1227 &unused_root, &unused_child, 1614 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1615 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1616 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1617 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1619 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1620 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1621 {
1235#endif 1622#endif
1623#if ISO_14755
1624 // 5.4
1625 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1626 {
1627 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1628 break;
1629 }
1630#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1631 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1632 ev.xbutton.state & Button3Mask ? 2 : 0);
1633
1238#ifdef SELECTION_SCROLLING 1634#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1635 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1636 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1637 {
1242 int dist; 1638 int dist;
1243
1244 pending_scroll_selection=1;
1245 1639
1246 /* don't clobber the current delay if we are 1640 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1641 * already in the middle of scrolling.
1248 */ 1642 */
1249 if (scroll_selection_delay<=0) 1643 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1644 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1645
1252 /* save the event params so we can highlight 1646 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1647 * the selection in the pending-scroll loop
1254 */ 1648 */
1255 selection_save_x=ev.xbutton.x; 1649 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1650 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1651 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1652
1260 /* calc number of lines to scroll */ 1653 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1654 if (ev.xbutton.y < int_bwidth)
1262 { 1655 {
1263 scroll_selection_dir = UP; 1656 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1657 dist = int_bwidth - ev.xbutton.y;
1265 } 1658 }
1266 else 1659 else
1267 { 1660 {
1268 scroll_selection_dir = DN; 1661 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1662 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1663 }
1664
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1665 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1666 / SELECTION_SCROLL_LINE_SPEEDUP
1667 + 1;
1274 MIN_IT (scroll_selection_lines, 1668 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1669 SELECTION_SCROLL_MAX_LINES);
1276 } 1670 }
1277 else 1671 else
1278 { 1672 {
1279 /* we are within the text window, so we 1673 /* we are within the text window, so we
1280 * shouldn't be scrolling 1674 * shouldn't be scrolling
1281 */ 1675 */
1282 pending_scroll_selection = 0; 1676 if (sel_scroll_ev.active)
1677 sel_scroll_ev.stop();
1283 } 1678 }
1284#endif 1679#endif
1285#ifdef MOUSE_THRESHOLD 1680#ifdef MOUSE_THRESHOLD
1286
1287 } 1681 }
1288#endif 1682#endif
1289
1290 } 1683 }
1291 } 1684 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1686 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1687 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1688 MotionNotify, &ev))
1689 ;
1690
1296 XQueryPointer (display->display, scrollBar.win, 1691 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1692 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1694 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1695 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1697 scrollbar_size ());
1303 scr_refresh (refresh_type); 1698 want_refresh = 1;
1304 refresh_limit = 0; 1699 refresh_limit = 0;
1305 scrollbar_show (1); 1700 scrollbar_show (1);
1306 } 1701 }
1307 break; 1702 break;
1308 } 1703 }
1309}
1310 1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1733}
1734
1735void
1736rxvt_term::focus_in ()
1737{
1738 if (!focus)
1739 {
1740 focus = 1;
1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 {
1748 IMSetStatusPosition ();
1749 XSetICFocus (Input_Context);
1750 }
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_focused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ENABLE_OVERLAY
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1802}
1803
1804#if TRANSPARENT
1311void 1805void
1312rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1807{
1314 SET_R (this); 1808 make_current ();
1315 SET_LOCALE (locale);
1316 1809
1317 switch (ev.type) 1810 switch (ev.type)
1318 { 1811 {
1319 case PropertyNotify: 1812 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 /* 1813 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1814 * 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. 1815 * use the property to determine the pixmap. We use it later on.
1332 */ 1816 */
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]) 1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1337 return; 1819 return;
1338 }
1339 1820
1340 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1341 case ReparentNotify: 1822 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1344 break; 1825 break;
1345#endif
1346 } 1826 }
1347} 1827}
1828#endif
1348 1829
1349void 1830void
1350rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1351{ 1832{
1352 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1353 1834
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1355 if (!bypass_keystate) 1837 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1839
1357 /* 1840 /*
1358 * VT window processing of button press 1841 * VT window processing of button press
1359 */ 1842 */
1360 if (ev.window == TermWin.vt) 1843 if (ev.window == vt)
1361 { 1844 {
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1363 if (reportmode) 1856 if (reportmode)
1364 { 1857 {
1365 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1370 { 1863 {
1371 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1372 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1373 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1374 { 1868 {
1375 /* only report double clicks */ 1869 /* only report double clicks */
1376 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1377 mouse_report (ev); 1871 mouse_report (ev);
… …
1396 } 1890 }
1397 else 1891 else
1398 { 1892 {
1399 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1401 switch (ev.button) 1897 switch (ev.button)
1402 { 1898 {
1403 case Button1: 1899 case Button1:
1900 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */
1902#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask);
1904#else
1905 selection.rect = false;
1906#endif
1907
1404 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1910 {
1407 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1409 else 1913 else
1410 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1411 } 1915 }
1412 else 1916 else
1413 { 1917 {
1414 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1415 MEvent.clicks++; 1919 MEvent.clicks++;
1416 else 1920 else
1417 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1418 1922
1419 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1420 } 1924 }
1421 1925
1422 MEvent.button = Button1; 1926 MEvent.button = Button1;
1423 break; 1927 break;
1424 1928
1425 case Button3: 1929 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1428 else 1932 else
1429 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1934
1430 MEvent.button = Button3; 1935 MEvent.button = Button3;
1431 break; 1936 break;
1432 } 1937 }
1433 } 1938 }
1939
1434 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1435 return; 1941 return;
1436 } 1942 }
1437 1943
1438 /* 1944 /*
… …
1504 upordown = 1; /* down */ 2010 upordown = 1; /* down */
1505 } 2011 }
1506 if (upordown) 2012 if (upordown)
1507 { 2013 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 2016#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2017 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 2018 {
1513 if (upordown < 0) 2019 if (upordown < 0)
1514 scrollBar.setUp (); 2020 scrollBar.setUp ();
… …
1530 break; 2036 break;
1531 case R_SB_ALIGN_BOTTOM: 2037 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2038 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2039 break;
1534 } 2040 }
2041
1535 if (scrollBar.style == R_SB_XTERM 2042 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2043 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2044 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2046
1540 scrollBar.setMotion (); 2047 scrollBar.setMotion ();
1541 break; 2048 break;
1542 2049
1543 case Button1: 2050 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2051 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2055 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1550 { 2057 {
1551 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1554# else 2061# else
1555 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1556# endif 2063# endif
1557 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1560# else 2067# else
1561 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1562# endif 2069# endif
1563 else 2070 else
1564 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1565 } 2072 }
1566 else 2073 else
1567 { 2074 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2076 (nrow
1570 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2078 / scrollbar_size ()));
1572 } 2079 }
2080
1573 break; 2081 break;
1574 } 2082 }
1575 } 2083 }
2084
1576 return; 2085 return;
1577 } 2086 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2087}
1586 2088
1587void 2089void
1588rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1589{ 2091{
1590 int reportmode = 0; 2092 int reportmode = 0;
1591 2093
1592 csrO = 0; /* reset csr Offset */ 2094 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2095 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2096 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2097
1596 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1597 { 2099 {
1598 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1599 scrollbar_show (0); 2101 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2102 }
2103
1605#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop();
1607#endif 2107#endif
2108
1608 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1609 { 2110 {
2111#if ISO_14755
2112 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return;
2115#endif
1610 if (reportmode) 2116 if (reportmode)
1611 { 2117 {
1612 /* mouse report from vt window */ 2118 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2119 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2120 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2134 MEvent.button = AnyButton;
1629 mouse_report (ev); 2135 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2136#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2137 return;
1632 } 2138 }
2139
1633 /* 2140 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2141 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2142 * when overriding mouse reporting
1636 */ 2143 */
1637 if (PrivateModes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2145 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
1641 2151
1642 switch (ev.button) 2152 switch (ev.button)
1643 { 2153 {
1644 case Button1: 2154 case Button1:
1645 case Button3: 2155 case Button3:
… …
1653 case Button5: 2163 case Button5:
1654 { 2164 {
1655 int i; 2165 int i;
1656 page_dirn v; 2166 page_dirn v;
1657 2167
1658 v = (ev.button == Button4) ? UP : DN; 2168 v = ev.button == Button4 ? UP : DN;
2169
1659 if (ev.state & ShiftMask) 2170 if (ev.state & ShiftMask)
1660 i = 1; 2171 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2172 else if (OPTION (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2173 i = nrow - 1;
1663 else 2174 else
1664 i = 5; 2175 i = 5;
2176
1665# ifdef MOUSE_SLIP_WHEELING 2177# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2178 if (ev.state & ControlMask)
1667 { 2179 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2180 mouse_slip_wheel_speed += v ? -1 : 1;
2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2183
2184 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2186
2187 slip_wheel_ev.start ();
2188 }
2189 else
2190 {
2191# endif
2192 scr_page (v, i);
2193 scrollbar_show (1);
2194# ifdef MOUSE_SLIP_WHEELING
1670 } 2195 }
1671# endif 2196# 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 } 2197 }
1686 break; 2198 break;
1687#endif 2199#endif
1688
1689 } 2200 }
1690 } 2201 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695} 2202}
1696 2203
1697#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
1698#if TINTING 2205#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2206/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2207
1702static void 2208typedef 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 2209
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2211{
1710 /* No saturation */ 2212 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2213 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i;
1714 2218
1715 b = ((uint16_t *) ptr)[x]; 2219 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2220
1717 g = (b & 0x3e0) * gm; 2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2222
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2223 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2224 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2225 mask_g = visual->green_mask;
1722 } 2226 mask_b = visual->blue_mask;
1723 ptr += bpl; 2227
1724 } 2228 /* boring lookup table pre-initialization */
2229 switch (srcImage->bits_per_pixel) {
2230 case 15:
2231 if ((mask_r != 0x7c00) ||
2232 (mask_g != 0x03e0) ||
2233 (mask_b != 0x001f))
2234 return;
2235 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2236 lookup_r = lookup;
2237 lookup_g = lookup+32;
2238 lookup_b = lookup+32+32;
2239 sh_r = 10;
2240 sh_g = 5;
2241 sh_b = 0;
2242 break;
2243 case 16:
2244 if ((mask_r != 0xf800) ||
2245 (mask_g != 0x07e0) ||
2246 (mask_b != 0x001f))
2247 return;
2248 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2249 lookup_r = lookup;
2250 lookup_g = lookup+32;
2251 lookup_b = lookup+32+64;
2252 sh_r = 11;
2253 sh_g = 5;
2254 sh_b = 0;
2255 break;
2256 case 24:
2257 if ((mask_r != 0xff0000) ||
2258 (mask_g != 0x00ff00) ||
2259 (mask_b != 0x0000ff))
2260 return;
2261 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2262 lookup_r = lookup;
2263 lookup_g = lookup+256;
2264 lookup_b = lookup+256+256;
2265 sh_r = 16;
2266 sh_g = 8;
2267 sh_b = 0;
2268 break;
2269 case 32:
2270 if ((mask_r != 0xff0000) ||
2271 (mask_g != 0x00ff00) ||
2272 (mask_b != 0x0000ff))
2273 return;
2274 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2275 lookup_r = lookup;
2276 lookup_g = lookup+256;
2277 lookup_b = lookup+256+256;
2278 sh_r = 16;
2279 sh_g = 8;
2280 sh_b = 0;
2281 break;
2282 default:
2283 return; /* we do not support this color depth */
2284 }
2285
2286 /* prepare limits for color transformation (each channel is handled separately) */
2287 if (shade < 0) {
2288 shade = -shade;
2289 if (shade < 0) shade = 0;
2290 if (shade > 100) shade = 100;
2291
2292 lower_lim_r = 65535-rm;
2293 lower_lim_g = 65535-gm;
2294 lower_lim_b = 65535-bm;
2295
2296 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2297 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2298 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2299
2300 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2301 } else {
1726 for (y = h; --y >= 0;) { 2302 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2303 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2304
1730 b = ((uint16_t *) ptr)[x]; 2305 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2306
1732 g = (b & 0x3e0) * gm; 2307 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2308 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2309 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2310 }
1736 b |= (!(b >> 5) - 1); 2311
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2312 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2313 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2314 {
1740 } 2315 unsigned int tmp;
1741 ptr += bpl; 2316
2317 tmp = lower_lim_r;
2318 lower_lim_r = lower_lim_b;
2319 lower_lim_b = tmp;
2320
2321 tmp = upper_lim_r;
2322 upper_lim_r = upper_lim_b;
2323 upper_lim_b = tmp;
2324 }
2325
2326 /* fill our lookup tables */
2327 for (i = 0; i <= mask_r>>sh_r; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2331 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2332 lookup_r[i] = (tmp/65535)<<sh_r;
2333 }
2334 for (i = 0; i <= mask_g>>sh_g; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2338 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2339 lookup_g[i] = (tmp/65535)<<sh_g;
2340 }
2341 for (i = 0; i <= mask_b>>sh_b; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2345 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2346 lookup_b[i] = (tmp/65535)<<sh_b;
2347 }
2348
2349 /* apply table to input image (replacing colors by newly calculated ones) */
2350 switch (srcImage->bits_per_pixel)
2351 {
2352 case 15:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
1742 } 2362 {
2363 *p = lookup_r[(*p & 0x7c00)>>10] |
2364 lookup_g[(*p & 0x03e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2368 }
1744} 2369 break;
1745 2370 }
1746/* RGB 16 */ 2371 case 16:
1747static void 2372 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2373 unsigned short *p1, *pf, *p, *pl;
1749{ 2374 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2375 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2376 while (p1 < pf)
1752 2377 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2378 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2379 pl = p1 + srcImage->width;
1755 /* No saturation */ 2380 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 } 2381 {
1770 } else { 2382 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2383 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2384 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 } 2385 }
1786 ptr += bpl; 2386 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 24:
2391 {
2392 unsigned char *p1, *pf, *p, *pl;
2393 p1 = (unsigned char *) srcImage->data;
2394 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width * 3;
2399 for (; p < pl; p += 3)
1787 } 2400 {
2401 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2402 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2403 p[2] = lookup_r[(p[2] & 0x0000ff)];
2404 }
2405 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2406 }
1789} 2407 break;
2408 }
2409 case 32:
2410 {
2411 RUINT32T *p1, *pf, *p, *pl;
2412 p1 = (RUINT32T *) srcImage->data;
2413 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2414
1791/* RGB 24 */ 2415 while (p1 < pf)
1792static void 2416 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2417 p = p1;
1794{ 2418 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2419 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 } 2420 {
1823 } else { 2421 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2422 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2423 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2424 (*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 } 2425 }
1854 ptr += bpl; 2426 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2427 }
2428 break;
2429 }
1856 } 2430 }
1857}
1858 2431
1859/* RGB 32 */ 2432 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} 2433}
1930
1931#endif 2434#endif
1932 2435
1933/* 2436/*
1934 * Check our parents are still who we think they are. 2437 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2438 * Do transparency updates if required
… …
1942 Atom atype; 2445 Atom atype;
1943 unsigned char *prop = NULL; 2446 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2447 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2448 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
1947 2451
1948 pchanged = 0; 2452 pchanged = 0;
1949 2453
1950 if (!(Options & Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
1952 2456
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2457 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
1955 2459
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2460 XGetWindowAttributes (disp, parent[0], &wattr);
1957 2461
1958 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
1959 { 2463 {
1960 if (am_transparent) 2464 if (am_transparent)
1961 { 2465 {
1962 pchanged = 1; 2466 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
1965 } 2469 }
1966 2470
1967 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
1968 } 2472 }
1969 2473
1970 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False); 2475 XSync (disp, False);
1972 2476
1973 /* 2477 /*
1974 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
1977 */ 2481 */
1978 i = (xa[XA_XROOTPMAPID] 2482 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
1982 2486
1983 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
1988 2492
1989 if (!i || prop == NULL) 2493 if (!i || prop == NULL
2494#if TINTING
2495 || !rs[Rs_color + Color_tint]
2496#endif
2497 )
1990 have_pixmap = 0; 2498 have_pixmap = 0;
1991 else 2499 else
1992 { 2500 {
1993 have_pixmap = 1; 2501 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2502 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2513 Window cr;
2006 XImage *image; 2514 XImage *image;
2007 GC gc; 2515 GC gc;
2008 XGCValues gcvalue; 2516 XGCValues gcvalue;
2009 2517
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2518 XTranslateCoordinates (disp, parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2522 nx = ny = 0;
2015 2523
… …
2025 nh += sy; 2533 nh += sy;
2026 ny = -sy; 2534 ny = -sy;
2027 sy = 0; 2535 sy = 0;
2028 } 2536 }
2029 2537
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
2032 allowedxerror = -1; 2542 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2544
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2547 allowedxerror = 0;
2038 2548
2039 if (image == NULL) 2549 if (image == NULL)
2040 { 2550 {
2041 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2042 { 2552 {
2043 pchanged = 1; 2553 pchanged = 1;
2044 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2045 { 2555 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2556 XFreePixmap (disp, pixmap);
2047 TermWin.pixmap = None; 2557 pixmap = None;
2048 } 2558 }
2049 } 2559 }
2050 2560
2051 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2052 } 2562 }
2053 else 2563 else
2054 { 2564 {
2055 if (TermWin.pixmap != None) 2565 if (pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2566 XFreePixmap (disp, pixmap);
2057 2567
2058#if TINTING 2568#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2570 {
2061 unsigned short shade, rm, gm, bm; 2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2573
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2575
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2576 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 } 2577 }
2076#endif 2578#endif
2077 2579
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2580 pixmap = XCreatePixmap (disp, vt,
2079 szHint.width, szHint.height, image->depth); 2581 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2584 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2585 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2586 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2086 TermWin.pixmap); 2588 XClearWindow (disp, parent[0]);
2087 2589
2088 if (!am_transparent || !am_pixmap_trans) 2590 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2591 pchanged = 1;
2090 2592
2091 am_transparent = am_pixmap_trans = 1; 2593 am_transparent = am_pixmap_trans = 1;
2092 } 2594 }
2093 } 2595 }
2094 2596
2095 if (!am_pixmap_trans) 2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
2096 { 2600 {
2097 unsigned int n; 2601 unsigned int n;
2098 /* 2602 /*
2099 * InheritPixmap transparency 2603 * InheritPixmap transparency
2100 */ 2604 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2606 {
2104 oldp = TermWin.parent[i]; 2607 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2608 XQueryTree (disp, parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2609 &parent[i], &list, &n);
2107 XFree (list); 2610 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2611
2110 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2111 { 2613 {
2112 if (oldp != None) 2614 if (oldp != None)
2113 pchanged = 1; 2615 pchanged = 1;
2114 2616
2115 break; 2617 break;
2116 } 2618 }
2117 2619
2118 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2119 pchanged = 1; 2621 pchanged = 1;
2120 } 2622 }
2121 2623
2122 n = 0; 2624 n = 0;
2123 2625
2124 if (pchanged) 2626 if (pchanged)
2125 { 2627 {
2126 for (; n < (unsigned int)i; n++) 2628 for (; n < (unsigned int)i; n++)
2127 { 2629 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2630 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) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2632 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2634 break;
2134 } 2635 }
2135 } 2636 }
2136 } 2637 }
2137 2638
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2139 { 2640 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2643 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2644 /* XXX: also turn off Opt_transparent? */
2145 } 2645 }
2146 else 2646 else
2147 { 2647 {
2148#if WAIT_FOR_WM 2648#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2649 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2650 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2651 sleep (1);
2152#endif 2652#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2653 for (n = 0; n < (unsigned int)i; n++)
2654 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]);
2657 }
2156 2658
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2158 am_transparent = 1; 2660 am_transparent = 1;
2159 } 2661 }
2160 2662
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2664 parent[i] = None;
2665 }
2666
2667 if (scrollBar.win)
2668 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle ();
2671 scrollbar_show (0);
2672 }
2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2163 } 2679 }
2164 2680
2165 return pchanged; 2681 return pchanged;
2166} 2682}
2167#endif 2683#endif
… …
2170 2686
2171bool 2687bool
2172rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2173{ 2689{
2174 bool flag = false; 2690 bool flag = false;
2175 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2177 2693
2178 for (;;) 2694 for (;;)
2179 { 2695 {
2180 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2181 { 2697 {
2182 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2699 ch = next_char ();
2184 }
2185 2700
2186 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2187 break; 2702 break;
2703 }
2188 2704
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2706 {
2707 if (!seen_input)
2708 {
2709 seen_input = 1;
2710 // many badly-written programs (e.g. jed) contain a race condition:
2711 // they first read the screensize and then install a SIGWINCH handler.
2712 // some window managers resize the window early, and these programs
2713 // then sometimes get the size wrong.
2714 // unfortunately other programs are even more buggy and dislike
2715 // being sent SIGWINCH, so only do it when we were in fact being
2716 // resized.
2717 if (seen_resize && cmd_pid)
2718 kill (-cmd_pid, SIGWINCH);
2719 }
2720
2191 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2723 bool refreshnow = false;
2194 int nlines = 0; 2724 int nlines = 0;
2195 unicode_t *str = buf; 2725 wchar_t *str = buf;
2196 2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2727
2199 for (;;) 2728 for (;;)
2200 { 2729 {
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)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2731 break;
2206 2732
2207 *str++ = ch; 2733 *str++ = ch;
2208 2734
2209 if (ch == C0_LF) 2735 if (ch == C0_LF || str >= eol)
2210 { 2736 {
2737 if (ch == C0_LF)
2211 nlines++; 2738 nlines++;
2739
2212 refresh_count++; 2740 refresh_count++;
2213 2741
2214 if (! (Options & Opt_jumpScroll) 2742 if (!OPTION (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2744 {
2217 refreshnow = true; 2745 refreshnow = true;
2218 flag = true; 2746 refresh_count = 0;
2219 ch = NOCHAR; 2747 ch = NOCHAR;
2220 break; 2748 break;
2221 } 2749 }
2222 2750
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2752 if (nlines >= nrow - 1)
2225 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2226 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2227 nlines = 0; 2758 nlines = 0;
2228 str = buf; 2759 str = buf;
2760 eol = str + min (ncol, UBUFSIZ);
2229 } 2761 }
2762
2763 if (str >= eol)
2764 {
2765 if (eol >= buf + UBUFSIZ)
2766 {
2767 ch = NOCHAR;
2768 break;
2769 }
2770 else
2771 eol = min (eol + ncol, buf + UBUFSIZ);
2772 }
2773
2230 } 2774 }
2231 2775
2232 if (str >= buf + UBUFSIZ) 2776 seq_begin = cmdbuf_ptr;
2233 { 2777 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2778 }
2238 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2240 2783
2241 /* 2784 /*
2242 * If there have been a lot of new lines, then update the screen 2785 * 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. 2786 * 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 2787 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2788 * 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 */ 2789 */
2250 if (refreshnow) 2790 if (refreshnow)
2251 { 2791 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2793 refresh_limit++;
2254 else 2794 else
2795 {
2796 flag = true;
2255 scr_refresh (refresh_type); 2797 scr_refresh ();
2798 want_refresh = 1;
2799 }
2256 } 2800 }
2257 2801
2258 } 2802 }
2259 else 2803 else
2260 { 2804 {
… …
2275 2819
2276 return flag; 2820 return flag;
2277} 2821}
2278 2822
2279// read the next character 2823// read the next character
2280unicode_t 2824wchar_t
2281rxvt_term::next_char () 2825rxvt_term::next_char ()
2282{ 2826{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2828 {
2285 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2288 2832
2289 wchar_t wc; 2833 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291 2835
2292 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2293 { 2837 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2296 break; 2840 break;
2297 } 2841 }
2298 2842
2299 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 2845
2302 // assume wchar == unicode 2846 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2304 return wc; 2848 return wc & UNICODE_MASK;
2305 } 2849 }
2306 2850
2307 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2308} 2861}
2309 2862
2310/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2311/* 2864/*
2312 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2313 * to the command. 2866 * to the command.
2314 */ 2867 */
2315unicode_t 2868wchar_t
2316rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2317{ 2870{
2318 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2872
2873 if (c == NOCHAR)
2874 throw out_of_input;
2875
2876 return c;
2877}
2878
2879uint32_t
2880rxvt_term::cmd_get8 ()
2881{
2882 uint32_t c = next_octet ();
2319 2883
2320 if (c == NOCHAR) 2884 if (c == NOCHAR)
2321 throw out_of_input; 2885 throw out_of_input;
2322 2886
2323 return c; 2887 return c;
… …
2423 case C0_ESC: 2987 case C0_ESC:
2424 process_escape_seq (); 2988 process_escape_seq ();
2425 break; 2989 break;
2426 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 2993 else
2431 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 2995 break;
2434 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2435 scr_bell (); 2997 scr_bell ();
2436 break; 2998 break;
2437 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
2453 break; 3015 break;
2454 case C0_SI: /* shift in - acs */ 3016 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 3017 scr_charset_choose (0);
2456 break; 3018 break;
2457 3019
3020#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 3021 // 8-bit controls
2459 case 0x90: /* DCS */ 3022 case 0x90: /* DCS */
2460 process_dcs_seq (); 3023 process_dcs_seq ();
2461 break; 3024 break;
2462 case 0x9b: /* CSI */ 3025 case 0x9b: /* CSI */
2463 process_csi_seq (); 3026 process_csi_seq ();
2464 break; 3027 break;
2465 case 0x9d: /* CSI */ 3028 case 0x9d: /* CSI */
2466 process_osc_seq (); 3029 process_osc_seq ();
2467 break; 3030 break;
3031#endif
2468 } 3032 }
2469} 3033}
2470/*}}} */ 3034/*}}} */
2471 3035
2472 3036
… …
2534void 3098void
2535rxvt_term::process_escape_seq () 3099rxvt_term::process_escape_seq ()
2536{ 3100{
2537 unicode_t ch = cmd_getc (); 3101 unicode_t ch = cmd_getc ();
2538 3102
2539 if (PrivateModes & PrivMode_vt52) 3103 if (priv_modes & PrivMode_vt52)
2540 { 3104 {
2541 process_escape_vt52 (ch); 3105 process_escape_vt52 (ch);
2542 return; 3106 return;
2543 } 3107 }
2544 3108
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3123 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3124 break;
2561 case '+': 3125 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3126 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3127 break;
2564#ifndef NO_FRILLS 3128#if ENABLE_FRILLS
2565 case '6': 3129 case '6':
2566 scr_backindex (); 3130 scr_backindex ();
2567 break; 3131 break;
2568#endif 3132#endif
2569 case '7': 3133 case '7':
2570 scr_cursor (SAVE); 3134 scr_cursor (SAVE);
2571 break; 3135 break;
2572 case '8': 3136 case '8':
2573 scr_cursor (RESTORE); 3137 scr_cursor (RESTORE);
2574 break; 3138 break;
2575#ifndef NO_FRILLS 3139#if ENABLE_FRILLS
2576 case '9': 3140 case '9':
2577 scr_forwardindex (); 3141 scr_forwardindex ();
2578 break; 3142 break;
2579#endif 3143#endif
2580 case '=': 3144 case '=':
… …
2590 break; 3154 break;
2591 3155
2592 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
2594 { 3158 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2597 } 3161 }
2598 break; 3162 break;
2599 3163
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
2623 process_dcs_seq (); 3187 process_dcs_seq ();
2624 break; 3188 break;
2625 3189
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
2631 3194
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2633 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 3197 process_csi_seq ();
… …
2661 3224
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3225/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3226/* *INDENT-OFF* */
2664enum { 3227enum {
2665 CSI_ICH = 0x40, 3228 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3229 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 , 3230 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, 3231 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, 3232 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, 3233 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, 3234 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2759 { 3322 {
2760 switch (priv) 3323 switch (priv)
2761 { 3324 {
2762 case '>': 3325 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3326 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3328 break;
2766 case '?': 3329 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3331 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3332 break;
… …
2874 3437
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3438 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3439 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3440 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3443 break;
2881 3444
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3447 break;
2886 3448
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
2889 break; 3451 break;
… …
2896 break; 3458 break;
2897 case 6: /* CPR requested */ 3459 case 6: /* CPR requested */
2898 scr_report_position (); 3460 scr_report_position ();
2899 break; 3461 break;
2900 case 7: /* unofficial extension */ 3462 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3463 if (OPTION (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3464 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3465 break;
2904 case 8: /* unofficial extension */ 3466 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3468 break;
2907 } 3469 }
… …
2943 break; 3505 break;
2944 3506
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3507 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3508 if (arg[0] == 4)
2947 scr_insert_mode (0); 3509 scr_insert_mode (0);
3510 else if (arg[0] == 20)
3511 priv_modes &= ~PrivMode_LFNL;
2948 break; 3512 break;
2949 3513
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3514 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3515 if (arg[0] == 4)
2952 scr_insert_mode (1); 3516 scr_insert_mode (1);
3517 else if (arg[0] == 20)
3518 priv_modes |= PrivMode_LFNL;
2953 break; 3519 break;
2954 3520
2955 /* 3521 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3522 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3523 */
… …
2969 break; 3535 break;
2970 case CSI_75: 3536 case CSI_75:
2971 scr_cursor (RESTORE); 3537 scr_cursor (RESTORE);
2972 break; 3538 break;
2973 3539
2974#ifndef NO_FRILLS 3540#if ENABLE_FRILLS
2975 case CSI_74: 3541 case CSI_74:
2976 process_window_ops (arg, nargs); 3542 process_window_ops (arg, nargs);
2977 break; 3543 break;
2978#endif 3544#endif
2979 3545
… …
2986 break; 3552 break;
2987 } 3553 }
2988} 3554}
2989/*}}} */ 3555/*}}} */
2990 3556
2991#ifndef NO_FRILLS 3557#if ENABLE_FRILLS
2992/* ARGSUSED */ 3558/* ARGSUSED */
2993void 3559void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3560rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3561{
2996 int x, y; 3562 int x, y;
2997 XWindowAttributes wattr; 3563 XWindowAttributes wattr;
2998 Window wdummy; 3564 Window wdummy;
3565 dDisp;
2999 3566
3000 if (nargs == 0) 3567 if (nargs == 0)
3001 return; 3568 return;
3002 3569
3003 switch (args[0]) 3570 switch (args[0])
3004 { 3571 {
3005 /* 3572 /*
3006 * commands 3573 * commands
3007 */ 3574 */
3008 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (disp, parent[0]);
3010 break; 3577 break;
3011 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (disp, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3580 break;
3015 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (disp, parent[0], args[1], args[2]);
3017 break; 3583 break;
3018 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3586 break;
3021 case 5: /* raise window */ 3587 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (disp, parent[0]);
3023 break; 3589 break;
3024 case 6: /* lower window */ 3590 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (disp, parent[0]);
3026 break; 3592 break;
3027 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3028 scr_touch (true); 3594 scr_touch (true);
3029 break; 3595 break;
3030 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3033 break; 3599 break;
3034 3600
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3602 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3040 break; 3606 break;
3041 3607
3042 3608
3043 /* 3609 /*
3044 * reports - some output format copied from XTerm 3610 * reports - some output format copied from XTerm
3045 */ 3611 */
3046 case 11: /* report window state */ 3612 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3613 XGetWindowAttributes (disp, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3615 break;
3050 case 13: /* report window position */ 3616 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3618 XTranslateCoordinates (disp, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3619 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3620 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3621 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3622 break;
3057 case 14: /* report window size (pixels) */ 3623 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3626 break;
3061 case 18: /* report text area size (chars) */ 3627 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3628 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3629 break;
3064 case 19: /* report window size (chars) */ 3630 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3631 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3632 break;
3067 case 20: /* report icon label */ 3633 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3634 {
3070 char *s; 3635 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3636 XGetIconName (disp, parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s);
3073 } 3639 }
3074 break; 3640 break;
3075 case 21: /* report window title */ 3641 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3642 {
3078 char *s; 3643 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3644 XFetchName (disp, parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s);
3081 } 3647 }
3082 break; 3648 break;
3083 } 3649 }
3084} 3650}
3085#endif 3651#endif
3086 3652
3087/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3088/* 3654/*
3089 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3091 */ 3657 */
3092unsigned char * 3658char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3660{
3095 int seen_esc = 0; /* seen escape? */ 3661 unicode_t ch;
3662 bool seen_esc = false;
3096 unsigned int n = 0; 3663 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3664 wchar_t string[STRING_MAX];
3100 3665
3101 while ((ch = cmd_getc ())) 3666 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3667 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3668 if (seen_esc)
3669 {
3107 if (ch == 0x5c) /* 7bit ST */ 3670 if (ch == 0x5c) /* 7bit ST */
3108 break; 3671 break;
3109 else 3672 else
3110 return NULL; 3673 return NULL;
3111 3674 }
3112 if (ch == C0_ESC) 3675 else if (ch == C0_ESC)
3113 { 3676 {
3114 seen_esc = 1; 3677 seen_esc = true;
3115 continue; 3678 continue;
3116 } 3679 }
3680 else if (ch == C0_BEL || ch == CHAR_ST)
3681 break;
3117 else if (ch == C0_HT) 3682 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 */ 3683 return NULL; /* other control character - exit */
3121 3684
3122 if (n >= sizeof (string) - 1) 3685 seen_esc = false;
3686
3687 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3688 // stop at some sane length
3124 return NULL; 3689 return NULL;
3125 3690
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
3126 string[n++] = ch; 3694 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3695 }
3129 3696
3130 string[n++] = '\0'; 3697 string[n++] = '\0';
3131 3698
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3700
3137 return s; 3701 return rxvt_wcstombs (string);
3138} 3702}
3139 3703
3140/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3141/* 3705/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3707 */
3144void 3708void
3145rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3146{ 3710{
3147 unsigned char *s; 3711 char *s;
3148 unicode_t eh; 3712 unicode_t eh;
3149 3713
3150 /* 3714 /*
3151 * Not handled yet 3715 * Not handled yet
3152 */ 3716 */
… …
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3173 3737
3174 if (ch == ';') 3738 if (ch == ';')
3175 { 3739 {
3176 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3177 3741
3178 if (s) 3742 if (s)
3179 { 3743 {
3180 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3181 free (s); 3745 free (s);
3182 } 3746 }
3183 } 3747 }
3184} 3748}
3185 3749
3186void 3750void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3752{
3189 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3190 { 3754 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3755 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3758 }
3198 else 3759 else
3199 set_window_color (color, str); 3760 set_window_color (color, str);
3200} 3761}
3201 3762
3202/* 3763/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * 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 */ 3765 */
3227void 3766void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3229{ 3768{
3230 int changed = 0; 3769 int changed = 0;
3231 int color; 3770 int color;
3232 char *buf, *name; 3771 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
3773 int saveop = op;
3774 dDisp;
3234 3775
3235 assert (str != NULL); 3776 assert (str != NULL);
3236 switch (op) 3777 switch (op)
3237 { 3778 {
3238 case XTerm_name: 3779 case XTerm_name:
… …
3245 set_title (str); 3786 set_title (str);
3246 break; 3787 break;
3247 case XTerm_property: 3788 case XTerm_property:
3248 if (str[0] == '?') 3789 if (str[0] == '?')
3249 { 3790 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3791 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3792 Atom actual_type;
3252 int actual_format; 3793 int actual_format;
3253 unsigned long nitems; 3794 unsigned long nitems;
3254 unsigned long bytes_after; 3795 unsigned long bytes_after;
3255 unsigned char *value = 0; 3796 unsigned char *value = 0;
3256 const char *str = ""; 3797 const char *str = "";
3257 3798
3258 if (prop 3799 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3800 && XGetWindowProperty (disp, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3801 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3802 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3803 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3804 && actual_type != None
3264 && actual_format == 8) 3805 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3814 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3815
3275 if (eq) 3816 if (eq)
3276 { 3817 {
3277 *eq = 0; 3818 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3819 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 } 3820 }
3283 else 3821 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3822 XDeleteProperty (disp, parent[0],
3285 display->atom (str)); 3823 display->atom (str));
3286 } 3824 }
3287 break; 3825 break;
3288 3826
3289 case XTerm_Color: 3827 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3828 for (buf = (char *)str; buf && *buf;)
3291 { 3829 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3831 break;
3294 3832
3295 *name++ = '\0'; 3833 *name++ = '\0';
3296 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3297 3835
3298 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 3837 break;
3300 3838
3301 if ((buf = STRCHR (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3840 *buf++ = '\0';
3303 3841
3304 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3305 { 3843 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3844 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3845 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); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3847 }
3313 else 3848 else
3314 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3315 } 3850 }
3316 break; 3851 break;
3317 case XTerm_Color00: 3852 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3319 break; 3854 break;
3320 case XTerm_Color01: 3855 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3322 break; 3857 break;
3323#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3326 break; 3861 break;
… …
3330 break; 3865 break;
3331 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3333 break; 3868 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#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: 3870 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3343 break; 3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3880 break;
3881 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3883 break;
3344#endif 3884#endif
3885#if TRANSPARENT && TINTING
3886 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3888 check_our_parents ();
3889 if (am_transparent)
3890 want_full_refresh = want_refresh = 1;
3891 break;
3892#endif
3345 3893
3346 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3347 if (*str != ';') 3895 if (*str != ';')
3348 { 3896 {
3349#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3350 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true); 3900 scr_touch (true);
3901#endif
3354 } 3902 }
3903
3355 while ((str = STRCHR (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3356 { 3905 {
3357 str++; 3906 str++;
3358#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3360#endif 3909#endif
3361
3362 } 3910 }
3911
3363 if (changed) 3912 if (changed)
3364 { 3913 {
3365#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3915 resize_pixmap ();
3367#endif
3368 scr_touch (true); 3916 scr_touch (true);
3917#endif
3369 } 3918 }
3370 break; 3919 break;
3371 3920
3372 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3373 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3374 break; 3923 break;
3375 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3376 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3377 break; 3926 break;
3378 3927
3379 case XTerm_logfile: 3928 case XTerm_logfile:
3380 // TODO, when secure mode? 3929 // TODO, when secure mode?
3381 break; 3930 break;
3382 3931
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
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3429#if 0 3932#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3431 { 3934 {
3432 int fd; 3935 int fd;
3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3434 { 3937 {
3435 scr_dump (fd); 3938 scr_dump (fd);
3436 close (fd); 3939 close (fd);
3437 } 3940 }
3438 } 3941 }
3942 break;
3943#endif
3944 case XTerm_font:
3945 op = URxvt_font;
3946 case URxvt_font:
3947#if ENABLE_STYLES
3948 case URxvt_boldFont:
3949 case URxvt_italicFont:
3950 case URxvt_boldItalicFont:
3951#endif
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp);
3957 else
3958 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)];
3960
3961 res = strdup (str);
3962 allocated.push_back ((void *)res);
3963 set_fonts ();
3964 }
3965 break;
3966
3967#if ENABLE_FRILLS
3968 case URxvt_locale:
3969 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else
3972 {
3973 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale ();
3976 }
3977 break;
3978
3979 case URxvt_view_up:
3980 case URxvt_view_down:
3981 {
3982 int lines = atoi (str);
3983
3984 if (lines)
3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3986 else
3987 scr_erase_savelines ();
3988 }
3989
3990 break;
3991#endif
3992
3993#if ENABLE_PERL
3994 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3996 ; // no responses yet
3439 break; 3997 break;
3440#endif 3998#endif
3441 } 3999 }
3442} 4000}
3443/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
… …
3457{ 4015{
3458 int state; 4016 int state;
3459 4017
3460 if (mode == 's') 4018 if (mode == 's')
3461 { 4019 {
3462 SavedModes |= (PrivateModes & bit); 4020 SavedModes |= (priv_modes & bit);
3463 return -1; 4021 return -1;
3464 } 4022 }
3465 else 4023 else
3466 { 4024 {
3467 if (mode == 'r') 4025 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4026 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 4027 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4028 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 4029 PrivMode (state, bit);
3472 } 4030 }
3473 4031
3474 return state; 4032 return state;
3475} 4033}
… …
3493 { 3, PrivMode_132 }, 4051 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 4052 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4056 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4058 // 18, 19 printing-related
3500 { menuBar_esc, PrivMode_menuBar }, 4059 { 25, PrivMode_VisibleCursor },
3501#endif
3502#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4062#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4063 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4064 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4065 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4066 // 45 margin bell NYI
3512 // 46 start logging 4067 // 46 start logging
… …
3552 } 4107 }
3553 4108
3554 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4110 switch (arg[i])
3556 { 4111 {
4112#if ENABLE_STYLES
4113 case 1021:
4114 set_option (Opt_intensityStyles, mode);
4115
4116 scr_touch (true);
4117 break;
4118#endif
3557 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4120 case 1049:
3558 if (Options & Opt_secondaryScreen) 4121 if (OPTION (Opt_secondaryScreen))
3559 if (mode == 0) 4122 if (mode == 0)
3560 scr_cursor (RESTORE); 4123 scr_cursor (RESTORE);
3561 else if (mode == 1) 4124 else if (mode == 1)
3562 scr_cursor (SAVE); 4125 scr_cursor (SAVE);
3563 break; 4126 break;
… …
3574 * within VT52 mode 4137 * within VT52 mode
3575 */ 4138 */
3576 PrivMode (1, PrivMode_vt52); 4139 PrivMode (1, PrivMode_vt52);
3577 break; 4140 break;
3578 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4144 break;
3582 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
3583 if (state) 4146 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 4147 break;
3588 case 5: /* reverse video */ 4148 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
3590 break; 4150 break;
3591 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4155 scr_autowrap (state);
3596 break; 4156 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4161 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
3610 case scrollBar_esc: 4163 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
3612 { 4165 {
3613 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
3625 break; 4178 break;
3626 /* case 66: - application key pad */ 4179 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4180 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4181 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4182 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4183 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4184 break;
3632#if 0 4185#if 0
3633 case 1001: 4186 case 1001:
3634 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
3635#endif 4188#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 4190 set_option (Opt_scrollTtyOutput, !state);
3641 break; 4191 break;
3642 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4193 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 4194 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4198 scr_erase_screen (2);
3652 scr_change_screen (state); 4199 scr_change_screen (state);
3653 break; 4200 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4202 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4205 scr_erase_screen (2);
3659 break; 4206 break;
3660 default: 4207 default:
3661 break; 4208 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4234 rendset = 0, rendstyle = ~RS_None;
3688 break; 4235 break;
3689 case 1: 4236 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4237 rendset = 1, rendstyle = RS_Bold;
3691 break; 4238 break;
4239 //case 2: // low intensity
4240 case 3:
4241 rendset = 1, rendstyle = RS_Italic;
4242 break;
3692 case 4: 4243 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4244 rendset = 1, rendstyle = RS_Uline;
3694 break; 4245 break;
3695 case 5: 4246 case 5: // slowly blinking
4247 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4248 rendset = 1, rendstyle = RS_Blink;
3697 break; 4249 break;
3698 //case 6: // scoansi light background 4250 //case 6: // scoansi light background
3699 case 7: 4251 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4252 rendset = 1, rendstyle = RS_RVid;
3701 break; 4253 break;
3702 case 8: 4254 case 8:
3703 // invisible. NYI 4255 // invisible. NYI
3704 break; 4256 break;
4257 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4258 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4259 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4260 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4261 //...
4262 //case 19: // ninth alt font
4263 //case 20: // gothic
4264 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4265 rendset = 0, rendstyle = RS_Bold;
3710 break; 4266 break;
3711 case 22: 4267 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4268 rendset = 0, rendstyle = RS_Bold;
4269 break;
4270 case 23: // disable italic
4271 rendset = 0, rendstyle = RS_Italic;
3713 break; 4272 break;
3714 case 24: 4273 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4274 rendset = 0, rendstyle = RS_Uline;
3716 break; 4275 break;
3717 case 25: 4276 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4277 rendset = 0, rendstyle = RS_Blink;
3719 break; 4278 break;
4279 case 26: // variable spacing (iso 8613)
4280 rendset = 0, rendstyle = RS_Blink;
4281 break;
3720 case 27: 4282 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4283 rendset = 0, rendstyle = RS_RVid;
3722 break; 4284 break;
3723 case 28:
3724 // visible. NYI 4285 //case 28: // visible. NYI
3725 break; 4286 //case 29: // not crossed-out
3726 } 4287 }
3727 4288
3728 if (rendset != -1) 4289 if (rendset != -1)
3729 { 4290 {
3730 scr_rendition (rendset, rendstyle); 4291 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4302 case 35:
3742 case 36: 4303 case 36:
3743 case 37: 4304 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4305 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4306 break;
3746#ifdef TTY_256COLOR 4307 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4308 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4309 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4310 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4311 i += 2;
3752 } 4312 }
3753 break; 4313 break;
3754#endif
3755 case 39: /* default fg */ 4314 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4315 scr_color (Color_fg, Color_fg);
3757 break; 4316 break;
3758 4317
3759 case 40: 4318 case 40:
… …
3764 case 45: 4323 case 45:
3765 case 46: 4324 case 46:
3766 case 47: 4325 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4326 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4327 break;
3769#ifdef TTY_256COLOR 4328 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4329 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4330 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4331 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4332 i += 2;
3775 } 4333 }
3776 break; 4334 break;
3777#endif
3778 case 49: /* default bg */ 4335 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
3780 break; 4337 break;
3781 4338
3782#ifndef NO_BRIGHTCOLOR 4339 //case 50: // not variable spacing
4340
4341#if ENABLE_FRILLS
3783 case 90: 4342 case 90:
3784 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
3785 case 92: 4344 case 92:
3786 case 93: 4345 case 93:
3787 case 94: 4346 case 94:
3788 case 95: 4347 case 95:
3789 case 96: 4348 case 96:
3790 case 97: 4349 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4351 break;
3794 case 100: 4352 case 100:
3795 case 101: /* set bright bg color */ 4353 case 101: /* set bright bg color */
3796 case 102: 4354 case 102:
3797 case 103: 4355 case 103:
3798 case 104: 4356 case 104:
3799 case 105: 4357 case 105:
3800 case 106: 4358 case 106:
3801 case 107: 4359 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4361 break;
3805#endif 4362#endif
3806
3807 } 4363 }
3808 } 4364 }
3809} 4365}
3810/*}}} */ 4366/*}}} */
3811 4367
… …
3815{ 4371{
3816 unicode_t ch, cmd = cmd_getc (); 4372 unicode_t ch, cmd = cmd_getc ();
3817 4373
3818 if (cmd == 'Q') 4374 if (cmd == 'Q')
3819 { /* query graphics */ 4375 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4376 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4377 return;
3822 } 4378 }
3823 /* swallow other graphics sequences until terminating ':' */ 4379 /* swallow other graphics sequences until terminating ':' */
3824 do 4380 do
3825 ch = cmd_getc (); 4381 ch = cmd_getc ();
… …
3835 */ 4391 */
3836void 4392void
3837rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
3838{ 4394{
3839 va_list arg_ptr; 4395 va_list arg_ptr;
3840 unsigned char buf[256]; 4396 char buf[256];
3841 4397
3842 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4400 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4401 tt_write (buf, strlen (buf));
3846} 4402}
3847 4403
3848/* ---------------------------------------------------------------------- */ 4404/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4405/* 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. 4406 * or generated by us in response to a query ESC sequence.
3851 */ 4407 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409
3852void 4410void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 4412{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
3856 4415
3857 if (len) 4416 if (pty->pty < 0)
4417 return;
4418
4419 if (v_buflen == 0)
4420 {
4421 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422
4423 if ((unsigned int)written == len)
4424 return;
4425
4426 data += written;
4427 len -= written;
3858 { 4428 }
4429
4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4431
4432 memcpy (v_buffer + v_buflen, data, len);
4433 v_buflen += len;
4434
4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436}
4437
4438void rxvt_term::pty_write ()
4439{
4440 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441
4442 if (written > 0)
4443 {
4444 v_buflen -= written;
4445
3859 if (v_buflen == 0) 4446 if (v_buflen == 0)
3860 { 4447 {
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); 4448 free (v_buffer);
3888 v_buffer = 0; 4449 v_buffer = 0;
3889 v_buflen = 0; 4450 v_buflen = 0;
3890 4451
3891 pty_ev.set (EVENT_READ); 4452 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; 4453 return;
3904 } 4454 }
4455
4456 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4457 }
4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4459 pty_ev.set (EVENT_READ);
3906} 4460}
3907 4461
3908/*----------------------- end-of-file (C source) -----------------------*/ 4462/*----------------------- end-of-file (C source) -----------------------*/
3909 4463

Diff Legend

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