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

Diff Legend

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