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

Diff Legend

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