ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 UTC

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

Diff Legend

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