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

Diff Legend

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