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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.258 by root, Thu Jan 12 03:32:56 2006 UTC

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

Diff Legend

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