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.269 by root, Tue Jan 17 12:22:59 2006 UTC

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

Diff Legend

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