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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

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

Diff Legend

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