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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.255 by root, Wed Jan 11 03:13:26 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
677 } 1018 }
678 1019
679 display->flush (); 1020 display->flush ();
680
681 flush_ev.stop ();
682} 1021}
683 1022
684void 1023void
685rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
686{ 1025{
687 SET_R (this); 1026 SET_R (this);
688 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
689 1028
690 display->flush (); 1029 display->flush ();
691 1030
692 if (!flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
694} 1033}
695 1034
696void 1035void
697rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
698{ 1037{
… …
762{ 1101{
763 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1105 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
767 refresh_type |= SMOOTH_REFRESH; 1110 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1111 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1113 }
771} 1114}
772#endif 1115#endif
773 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
774bool 1135bool
775rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
776{ 1137{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778 1139
779 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
780 { 1141 {
781 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");
782 n = 0; 1143 n = 0;
783 } 1144 }
784 1145
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
788 1149
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1151
791 if (n > 0) 1152 if (r > 0)
792 { 1153 {
793 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
794 return true; 1155 return true;
795 } 1156 }
796 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))
797 destroy (); 1169 destroy ();
1170 }
798 1171
799 return false; 1172 return false;
800} 1173}
801 1174
802void 1175void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1176rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1177{
805 SET_R (this); 1178 SET_R (this);
806 SET_LOCALE (locale); 1179 SET_LOCALE (locale);
807 1180
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1181 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1182 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1183 while (pty_fill ())
813 if (cmd_parse ()) 1184 if (cmd_parse ())
814 break; 1185 break;
1186
1187 if (revents & EVENT_WRITE)
1188 pty_write ();
815} 1189}
816 1190
817void 1191void
818rxvt_term::pointer_unblank () 1192rxvt_term::pointer_unblank ()
819{ 1193{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1194 XDefineCursor (display->display, vt, TermWin_cursor);
821 recolour_cursor (); 1195 recolour_cursor ();
822 1196
823#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1198 hidden_pointer = 0;
825 1199
826 if (Options & Opt_pointerBlank) 1200 if (OPTION (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1201 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1202#endif
829} 1203}
830 1204
831#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
832void 1206void
833rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
834{ 1208{
835 if (! (Options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
836 return; 1210 return;
837 1211
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
839 XFlush (display->display); 1213 XFlush (display->display);
840 1214
841 hidden_pointer = 1; 1215 hidden_pointer = 1;
842} 1216}
843 1217
… …
860 x = ev.x; 1234 x = ev.x;
861 y = ev.y; 1235 y = ev.y;
862 pixel_position (&x, &y); 1236 pixel_position (&x, &y);
863 1237
864 if (MEvent.button == AnyButton) 1238 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1239 button_number = 3;
867 }
868 else 1240 else
869 { 1241 {
870 button_number = MEvent.button - Button1; 1242 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1243 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1244 if (button_number >= 3)
873 button_number += (64 - 3); 1245 button_number += (64 - 3);
874 } 1246 }
875 1247
876 if (PrivateModes & PrivMode_MouseX10) 1248 if (priv_modes & PrivMode_MouseX10)
877 { 1249 {
878 /* 1250 /*
879 * do not report ButtonRelease 1251 * do not report ButtonRelease
880 * no state info allowed 1252 * no state info allowed
881 */ 1253 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1268 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1269 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1270#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1271 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1272#endif
901
902 } 1273 }
903 1274
904#ifdef DEBUG_MOUSEREPORT 1275#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1276 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1277 if (key_state & 16)
907 fputc ('C', stderr); 1278 fputc ('C', stderr);
908 if (key_state & 4) 1279 if (key_state & 4)
909 fputc ('S', stderr); 1280 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1284 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1285 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1286 button_number,
916 x + 1, 1287 x + 1,
917 y + 1); 1288 y + 1);
918#else 1289#endif
1290
919 tt_printf ("\033[M%c%c%c", 1291 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1292 (32 + button_number + key_state),
921 (32 + x + 1), 1293 (32 + x + 1),
922 (32 + y + 1)); 1294 (32 + y + 1));
923#endif
924} 1295}
925 1296
926#ifdef USING_W11LIB 1297#ifdef USING_W11LIB
927void 1298void
928rxvt_W11_process_x_event (XEvent *ev) 1299rxvt_W11_process_x_event (XEvent *ev)
… …
935 1306
936/*{{{ process an X event */ 1307/*{{{ process an X event */
937void 1308void
938rxvt_term::x_cb (XEvent &ev) 1309rxvt_term::x_cb (XEvent &ev)
939{ 1310{
1311 dDisp;
1312
940 SET_R (this); 1313 SET_R (this);
941 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
942 1315
943#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 }
954#endif
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1318 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1319
1028 switch (ev.type) 1320 switch (ev.type)
1029 { 1321 {
1030 case KeyPress: 1322 case KeyPress:
1323#if ISO_14755
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1031 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)))
1032 break; 1394 break;
1033 1395
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1046 } 1401#endif
1047 break; 1402 break;
1048 } 1403 }
1049#endif
1050 1404
1051 case ButtonPress: 1405 case ButtonPress:
1052 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1053 break; 1407 break;
1054 1408
… …
1056 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1057 break; 1411 break;
1058 1412
1059 case ClientMessage: 1413 case ClientMessage:
1060 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1062 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
1063#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1069 { 1441 {
1070 /* Get Dnd data */ 1442 /* Get Dnd data */
1071 Atom ActualType; 1443 Atom ActualType;
1072 int ActualFormat; 1444 int ActualFormat;
1073 unsigned char *data; 1445 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1075 1447
1076 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1450 0L, 1000000L,
1079 False, AnyPropertyType, 1451 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1082 &data); 1454 &data);
1083 XChangeProperty (display->display, display->root, 1455 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1456 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1459 }
1091#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1092 break; 1461 break;
1093 1462
1094 case MappingNotify: 1463 case MappingNotify:
… …
1119 break; 1488 break;
1120 } 1489 }
1121 break; 1490 break;
1122 1491
1123 case FocusIn: 1492 case FocusIn:
1124 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])
1125 { 1502 {
1126 TermWin.focus = 1; 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1504 ;
1128#ifdef USE_XIM 1505
1129 if (Input_Context != NULL) 1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1130 XSetICFocus (Input_Context);
1131#endif
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1507 {
1139 PixColors = PixColorsFocused; 1508 seen_resize = 1;
1140 set_colorfgbg (); 1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1510 }
1144#endif
1145 1511
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent))
1514 check_our_parents ();
1515#endif
1146 } 1516 }
1147 break; 1517 break;
1148 1518
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1519 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 { 1521 && ev.xproperty.state == PropertyNewValue)
1179 int height, width; 1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1523
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1524 break;
1202 1525
1203 case SelectionClear: 1526 case SelectionClear:
1204 selection_clear (); 1527 selection_clear ();
1205 break; 1528 break;
1206 1529
1207 case SelectionNotify: 1530 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1531 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1533 break;
1212 1534
1213 case SelectionRequest: 1535 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1215 break; 1537 break;
1216 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
1217 case UnmapNotify: 1547 case UnmapNotify:
1218 TermWin.mapped = 0; 1548 mapped = 0;
1219#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1221#endif 1551#endif
1222 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1223
1224 case MapNotify:
1225 TermWin.mapped = 1;
1226#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif
1229 break; 1553 break;
1230 1554
1231#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1232 case ReparentNotify: 1556 case ReparentNotify:
1233 rootwin_cb (ev); 1557 rootwin_cb (ev);
1234 break; 1558 break;
1235#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1236 1560
1237 case GraphicsExpose: 1561 case GraphicsExpose:
1238 case Expose: 1562 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1240 { 1564 {
1241 do 1565 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1245 1569
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1571
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1251 1575
1252 scr_refresh (refresh_type); 1576 want_refresh = 1;
1253 } 1577 }
1254 else 1578 else
1255 { 1579 {
1256 XEvent unused_event; 1580 XEvent unused_event;
1257 1581
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1583 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1585 ;
1262 1586
1263 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1264 { 1588 {
1265 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
… …
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose (); 1594 menubar_expose ();
1271#endif 1595#endif
1272 1596
1273#ifdef TRANSPARENT 1597#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1598 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1599 XClearWindow (disp, ev.xany.window);
1276#endif 1600#endif
1277 } 1601 }
1278 break; 1602 break;
1279 1603
1280 case MotionNotify: 1604 case MotionNotify:
… …
1287 { 1611 {
1288 menubar_control (ev.xbutton); 1612 menubar_control (ev.xbutton);
1289 break; 1613 break;
1290 } 1614 }
1291#endif 1615#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1617 break;
1294 1618
1295 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1296 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1624 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1300 ; 1626 ;
1301 1627
1302 XQueryPointer (display->display, TermWin.vt, 1628 XQueryPointer (disp, vt,
1303 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1632 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1634 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1635 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1636 {
1311#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
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1648
1314#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1652 {
1318 int dist; 1653 int dist;
1319 1654
1320 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1659 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1660
1326 /* save the event params so we can highlight 1661 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1662 * the selection in the pending-scroll loop
1328 */ 1663 */
1329 selection_save_x=ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1667
1334 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1336 { 1670 {
1337 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1339 } 1673 }
1340 else 1674 else
1341 { 1675 {
1342 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1677 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1678 }
1679
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1680 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1682 + 1;
1348 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1350 } 1685 }
1351 else 1686 else
1352 { 1687 {
1353 /* we are within the text window, so we 1688 /* we are within the text window, so we
1354 * shouldn't be scrolling 1689 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1691 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1692 sel_scroll_ev.stop();
1358 } 1693 }
1359#endif 1694#endif
1360#ifdef MOUSE_THRESHOLD 1695#ifdef MOUSE_THRESHOLD
1361
1362 } 1696 }
1363#endif 1697#endif
1364
1365 } 1698 }
1366 } 1699 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1701 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1702 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1703 MotionNotify, &ev))
1704 ;
1705
1371 XQueryPointer (display->display, scrollBar.win, 1706 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1707 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1709 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1710 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1712 scrollbar_size ());
1378 scr_refresh (refresh_type); 1713 want_refresh = 1;
1379 refresh_limit = 0; 1714 refresh_limit = 0;
1380 scrollbar_show (1); 1715 scrollbar_show (1);
1381 } 1716 }
1382 break; 1717 break;
1383 } 1718 }
1384}
1385 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
1386void 1820void
1387rxvt_term::rootwin_cb (XEvent &ev) 1821rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1822{
1389 SET_R (this); 1823 SET_R (this);
1390 SET_LOCALE (locale); 1824 SET_LOCALE (locale);
1391 1825
1392 switch (ev.type) 1826 switch (ev.type)
1393 { 1827 {
1394 case PropertyNotify: 1828 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1829 /*
1405 * 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,
1406 * 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.
1407 */ 1832 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 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])
1412 return; 1835 return;
1413 }
1414 1836
1415 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1416 case ReparentNotify: 1838 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1419 break; 1841 break;
1420#endif
1421 } 1842 }
1422} 1843}
1844#endif
1423 1845
1424void 1846void
1425rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1426{ 1848{
1427 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1428 1850
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1430 if (!bypass_keystate) 1853 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1855
1432 /* 1856 /*
1433 * VT window processing of button press 1857 * VT window processing of button press
1434 */ 1858 */
1435 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1436 { 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
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1870 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1871
1438 if (reportmode) 1872 if (reportmode)
1439 { 1873 {
1440 /* mouse report from vt window */ 1874 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1875 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1876 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1445 { 1879 {
1446 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1447 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1448 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1449 { 1884 {
1450 /* only report double clicks */ 1885 /* only report double clicks */
1451 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1452 mouse_report (ev); 1887 mouse_report (ev);
… …
1471 } 1906 }
1472 else 1907 else
1473 { 1908 {
1474 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1476 switch (ev.button) 1913 switch (ev.button)
1477 { 1914 {
1478 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
1479 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1926 {
1482 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1484 else 1929 else
1485 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1486 } 1931 }
1487 else 1932 else
1488 { 1933 {
1489 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1490 MEvent.clicks++; 1935 MEvent.clicks++;
1491 else 1936 else
1492 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1493 1938
1494 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1495 } 1940 }
1496 1941
1497 MEvent.button = Button1; 1942 MEvent.button = Button1;
1498 break; 1943 break;
1499 1944
1500 case Button3: 1945 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1503 else 1948 else
1504 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1950
1505 MEvent.button = Button3; 1951 MEvent.button = Button3;
1506 break; 1952 break;
1507 } 1953 }
1508 } 1954 }
1955
1509 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1510 return; 1957 return;
1511 } 1958 }
1512 1959
1513 /* 1960 /*
… …
1605 break; 2052 break;
1606 case R_SB_ALIGN_BOTTOM: 2053 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2054 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2055 break;
1609 } 2056 }
2057
1610 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 2062
1615 scrollBar.setMotion (); 2063 scrollBar.setMotion ();
1616 break; 2064 break;
1617 2065
1618 case Button1: 2066 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 2071 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1625 { 2073 {
1626 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1629# else 2077# else
1630 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1631# endif 2079# endif
1632 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1635# else 2083# else
1636 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1637# endif 2085# endif
1638 else 2086 else
1639 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1640 } 2088 }
1641 else 2089 else
1642 { 2090 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2092 (nrow
1645 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2094 / scrollbar_size ()));
1647 } 2095 }
2096
1648 break; 2097 break;
1649 } 2098 }
1650 } 2099 }
2100
1651 return; 2101 return;
1652 } 2102 }
2103
1653#if MENUBAR 2104#if MENUBAR
1654 /* 2105 /*
1655 * Menubar window processing of button press 2106 * Menubar window processing of button press
1656 */ 2107 */
1657 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
1664{ 2115{
1665 int reportmode = 0; 2116 int reportmode = 0;
1666 2117
1667 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2119 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2121
1671 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1672 { 2123 {
1673 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1674 scrollbar_show (0); 2125 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 2127 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 2128#endif
1678
1679 } 2129 }
2130
1680#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2132 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2133 sel_scroll_ev.stop();
1683#endif 2134#endif
2135
1684 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1685 { 2137 {
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
1686 if (reportmode) 2143 if (reportmode)
1687 { 2144 {
1688 /* mouse report from vt window */ 2145 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2146 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2147 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2161 MEvent.button = AnyButton;
1705 mouse_report (ev); 2162 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2163#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2164 return;
1708 } 2165 }
2166
1709 /* 2167 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2168 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2169 * when overriding mouse reporting
1712 */ 2170 */
1713 if (PrivateModes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2172 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
1716 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;
1717 2178
1718 switch (ev.button) 2179 switch (ev.button)
1719 { 2180 {
1720 case Button1: 2181 case Button1:
1721 case Button3: 2182 case Button3:
… …
1733 2194
1734 v = ev.button == Button4 ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
1735 2196
1736 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
1737 i = 1; 2198 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2200 i = nrow - 1;
1740 else 2201 else
1741 i = 5; 2202 i = 5;
1742 2203
1743# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
1745 { 2206 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2207 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2210
1750 if (slip_wheel_ev.at < NOW) 2211 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2213
1753 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
1754 } 2215 }
1755 else 2216 else
1756 { 2217 {
1757# endif 2218# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2219 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2220 scrollbar_show (1);
1762# else
1763 while (i--)
1764 {
1765 scr_page (v, 1);
1766 scr_refresh (SMOOTH_REFRESH);
1767 scrollbar_show (1);
1768 }
1769# endif
1770# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
1771 } 2222 }
1772#endif 2223# endif
1773 } 2224 }
1774 break; 2225 break;
1775#endif 2226#endif
1776 } 2227 }
1777 } 2228 }
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2248 int i;
1798 2249
1799 Visual* visual = display->visual; 2250 Visual *visual = display->visual;
1800 2251
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2253
1803 /* for convenience */ 2254 /* for convenience */
1804 mask_r = visual->red_mask; 2255 mask_r = visual->red_mask;
… …
2025 Atom atype; 2476 Atom atype;
2026 unsigned char *prop = NULL; 2477 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2478 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2479 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2030 2482
2031 pchanged = 0; 2483 pchanged = 0;
2032 2484
2033 if (!(Options & Opt_transparent)) 2485 if (!OPTION (Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2486 return pchanged; /* Don't try any more */
2035 2487
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2489 rootdepth = wrootattr.depth;
2038 2490
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2491 XGetWindowAttributes (disp, parent[0], &wattr);
2040 2492
2041 if (rootdepth != wattr.depth) 2493 if (rootdepth != wattr.depth)
2042 { 2494 {
2043 if (am_transparent) 2495 if (am_transparent)
2044 { 2496 {
2045 pchanged = 1; 2497 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2499 am_transparent = am_pixmap_trans = 0;
2048 } 2500 }
2049 2501
2050 return pchanged; /* Don't try any more */ 2502 return pchanged; /* Don't try any more */
2051 } 2503 }
2052 2504
2053 /* 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. */
2054 XSync (display->display, False); 2506 XSync (disp, False);
2055 2507
2056 /* 2508 /*
2057 * Make the frame window set by the window manager have 2509 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2510 * the root background. Some window managers put multiple nested frame
2059 * 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.
2060 */ 2512 */
2061 i = (xa[XA_XROOTPMAPID] 2513 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2516 &nitems, &bytes_after, &prop) == Success);
2065 2517
2066 if (!i || prop == NULL) 2518 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2519 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2522 &nitems, &bytes_after, &prop) == Success);
2071 2523
2072 if (!i || prop == NULL 2524 if (!i || prop == NULL
2073#if TINTING 2525#if TINTING
… …
2092 Window cr; 2544 Window cr;
2093 XImage *image; 2545 XImage *image;
2094 GC gc; 2546 GC gc;
2095 XGCValues gcvalue; 2547 XGCValues gcvalue;
2096 2548
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2549 XTranslateCoordinates (disp, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2550 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2551 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2552 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2553 nx = ny = 0;
2102 2554
… …
2112 nh += sy; 2564 nh += sy;
2113 ny = -sy; 2565 ny = -sy;
2114 sy = 0; 2566 sy = 0;
2115 } 2567 }
2116 2568
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2119 allowedxerror = -1; 2573 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2575
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2577 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2578 allowedxerror = 0;
2125 2579
2126 if (image == NULL) 2580 if (image == NULL)
2127 { 2581 {
2128 if (am_transparent && am_pixmap_trans) 2582 if (am_transparent && am_pixmap_trans)
2129 { 2583 {
2130 pchanged = 1; 2584 pchanged = 1;
2131 if (TermWin.pixmap != None) 2585 if (pixmap != None)
2132 { 2586 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2587 XFreePixmap (disp, pixmap);
2134 TermWin.pixmap = None; 2588 pixmap = None;
2135 } 2589 }
2136 } 2590 }
2137 2591
2138 am_pixmap_trans = 0; 2592 am_pixmap_trans = 0;
2139 } 2593 }
2140 else 2594 else
2141 { 2595 {
2142 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2144 2598
2145#if TINTING 2599#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2600 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2601 {
2148 unsigned short rm, gm, bm; 2602 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2604
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2606
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2607 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2608 }
2155#endif 2609#endif
2156 2610
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2611 pixmap = XCreatePixmap (disp, vt,
2158 szHint.width, szHint.height, image->depth); 2612 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2615 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2616 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2617 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2619 XClearWindow (disp, parent[0]);
2166 2620
2167 if (!am_transparent || !am_pixmap_trans) 2621 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2622 pchanged = 1;
2169 2623
2170 am_transparent = am_pixmap_trans = 1; 2624 am_transparent = am_pixmap_trans = 1;
2171 } 2625 }
2172 } 2626 }
2173 2627
2174 if (!am_pixmap_trans) 2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2175 { 2631 {
2176 unsigned int n; 2632 unsigned int n;
2177 /* 2633 /*
2178 * InheritPixmap transparency 2634 * InheritPixmap transparency
2179 */ 2635 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2637 {
2183 oldp = TermWin.parent[i]; 2638 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2639 XQueryTree (disp, parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2640 &parent[i], &list, &n);
2186 XFree (list); 2641 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2642
2189 if (TermWin.parent[i] == display->root) 2643 if (parent[i] == display->root)
2190 { 2644 {
2191 if (oldp != None) 2645 if (oldp != None)
2192 pchanged = 1; 2646 pchanged = 1;
2193 2647
2194 break; 2648 break;
2195 } 2649 }
2196 2650
2197 if (oldp != TermWin.parent[i]) 2651 if (oldp != parent[i])
2198 pchanged = 1; 2652 pchanged = 1;
2199 } 2653 }
2200 2654
2201 n = 0; 2655 n = 0;
2202 2656
2203 if (pchanged) 2657 if (pchanged)
2204 { 2658 {
2205 for (; n < (unsigned int)i; n++) 2659 for (; n < (unsigned int)i; n++)
2206 { 2660 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2661 XGetWindowAttributes (disp, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2663 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2665 break;
2213 } 2666 }
2214 } 2667 }
2215 } 2668 }
2216 2669
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2218 { 2671 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2674 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2675 /* XXX: also turn off Opt_transparent? */
2224 } 2676 }
2225 else 2677 else
2226 { 2678 {
2227#if WAIT_FOR_WM 2679#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2680 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2681 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2682 sleep (1);
2231#endif 2683#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2684 for (n = 0; n < (unsigned int)i; n++)
2234 { 2685 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2687 XClearWindow (disp, parent[n]);
2237 } 2688 }
2238 2689
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2240 am_transparent = 1; 2691 am_transparent = 1;
2241 } 2692 }
2242 2693
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2695 parent[i] = None;
2245 } 2696 }
2246 2697
2247 // this is experimental
2248 if (scrollBar.win) 2698 if (scrollBar.win)
2249 { 2699 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2701 scrollBar.setIdle ();
2253 scrollbar_show (0); 2702 scrollbar_show (0);
2254 } 2703 }
2255 2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2256 return pchanged; 2712 return pchanged;
2257} 2713}
2258#endif 2714#endif
2259 2715
2260/*}}} */ 2716/*}}} */
2261 2717
2262bool 2718bool
2263rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2264{ 2720{
2265 bool flag = false; 2721 bool flag = false;
2266 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2268 2724
2269 for (;;) 2725 for (;;)
2270 { 2726 {
2271 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2272 { 2728 {
2273 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2730 ch = next_char ();
2275 }
2276 2731
2277 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2278 break; 2733 break;
2734 }
2279 2735
2280 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)
2281 { 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
2282 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2754 bool refreshnow = false;
2285 int nlines = 0; 2755 int nlines = 0;
2286 unicode_t *str = buf; 2756 wchar_t *str = buf;
2287 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2758
2290 for (;;) 2759 for (;;)
2291 { 2760 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 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))
2296 break; 2762 break;
2297 2763
2298 *str++ = ch; 2764 *str++ = ch;
2299 2765
2300 if (ch == C0_LF) 2766 if (ch == C0_LF || str >= eol)
2301 { 2767 {
2768 if (ch == C0_LF)
2302 nlines++; 2769 nlines++;
2770
2303 refresh_count++; 2771 refresh_count++;
2304 2772
2305 if (! (Options & Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2775 {
2308 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2309 ch = NOCHAR; 2778 ch = NOCHAR;
2310 break; 2779 break;
2311 } 2780 }
2312 2781
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2783 if (nlines >= nrow - 1)
2315 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2316 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2317 nlines = 0; 2788 nlines = 0;
2318 str = buf; 2789 str = buf;
2790 eol = str + min (ncol, UBUFSIZ);
2319 } 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
2320 } 2804 }
2321 2805
2322 if (str >= buf + UBUFSIZ) 2806 seq_begin = cmdbuf_ptr;
2323 { 2807 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2808 }
2328 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2329 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2330 2812
2331 /* 2813 /*
2332 * 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
2333 * 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.
2334 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2817 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2818 */
2337 if (refreshnow) 2819 if (refreshnow)
2338 { 2820 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2822 refresh_limit++;
2341 else 2823 else
2342 { 2824 {
2343 flag = true; 2825 flag = true;
2344 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2345 } 2828 }
2346 } 2829 }
2347 2830
2348 } 2831 }
2349 else 2832 else
… …
2364 } 2847 }
2365 2848
2366 return flag; 2849 return flag;
2367} 2850}
2368 2851
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2378// read the next character 2852// read the next character
2379unicode_t 2853wchar_t
2380rxvt_term::next_char () 2854rxvt_term::next_char ()
2381{ 2855{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2857 {
2384 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2387 2861
2388 wchar_t wc; 2862 wchar_t wc;
2389 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);
2390 2864
2391 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2392 { 2866 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2869 break;
2396 } 2870 }
2397 2871
2398 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2399 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
2400 2874
2401 // assume wchar == unicode 2875 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2403 return wc; 2877 return wc & UNICODE_MASK;
2404 } 2878 }
2405 2879
2406 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;
2407} 2890}
2408 2891
2409/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2410/* 2893/*
2411 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2412 * to the command. 2895 * to the command.
2413 */ 2896 */
2414unicode_t 2897wchar_t
2415rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2416{ 2899{
2417 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2418 2901
2419 if (c == NOCHAR) 2902 if (c == NOCHAR)
2420 throw out_of_input; 2903 throw out_of_input;
2421 2904
2422 return c; 2905 return c;
2423} 2906}
2424 2907
2425unicode_t 2908uint32_t
2426rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2427{ 2910{
2428 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2429 2912
2430 if (c == NOCHAR) 2913 if (c == NOCHAR)
2431 throw out_of_input; 2914 throw out_of_input;
2432 2915
2433 return c; 2916 return c;
… …
2533 case C0_ESC: 3016 case C0_ESC:
2534 process_escape_seq (); 3017 process_escape_seq ();
2535 break; 3018 break;
2536 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 3022 else
2541 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 3024 break;
2544 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2545 scr_bell (); 3026 scr_bell ();
2546 break; 3027 break;
2547 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
2646void 3127void
2647rxvt_term::process_escape_seq () 3128rxvt_term::process_escape_seq ()
2648{ 3129{
2649 unicode_t ch = cmd_getc (); 3130 unicode_t ch = cmd_getc ();
2650 3131
2651 if (PrivateModes & PrivMode_vt52) 3132 if (priv_modes & PrivMode_vt52)
2652 { 3133 {
2653 process_escape_vt52 (ch); 3134 process_escape_vt52 (ch);
2654 return; 3135 return;
2655 } 3136 }
2656 3137
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3152 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3153 break;
2673 case '+': 3154 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3155 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3156 break;
2676#ifndef NO_FRILLS 3157#if ENABLE_FRILLS
2677 case '6': 3158 case '6':
2678 scr_backindex (); 3159 scr_backindex ();
2679 break; 3160 break;
2680#endif 3161#endif
2681 case '7': 3162 case '7':
2682 scr_cursor (SAVE); 3163 scr_cursor (SAVE);
2683 break; 3164 break;
2684 case '8': 3165 case '8':
2685 scr_cursor (RESTORE); 3166 scr_cursor (RESTORE);
2686 break; 3167 break;
2687#ifndef NO_FRILLS 3168#if ENABLE_FRILLS
2688 case '9': 3169 case '9':
2689 scr_forwardindex (); 3170 scr_forwardindex ();
2690 break; 3171 break;
2691#endif 3172#endif
2692 case '=': 3173 case '=':
… …
2702 break; 3183 break;
2703 3184
2704 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
2706 { 3187 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2709 } 3190 }
2710 break; 3191 break;
2711 3192
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
2735 process_dcs_seq (); 3216 process_dcs_seq ();
2736 break; 3217 break;
2737 3218
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
2743 3223
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2745 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 3226 process_csi_seq ();
… …
2871 { 3351 {
2872 switch (priv) 3352 switch (priv)
2873 { 3353 {
2874 case '>': 3354 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3355 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3357 break;
2878 case '?': 3358 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3360 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3361 break;
… …
2986 3466
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3467 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3468 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3469 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3472 break;
2993 3473
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3476 break;
2998 3477
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3001 break; 3480 break;
… …
3008 break; 3487 break;
3009 case 6: /* CPR requested */ 3488 case 6: /* CPR requested */
3010 scr_report_position (); 3489 scr_report_position ();
3011 break; 3490 break;
3012 case 7: /* unofficial extension */ 3491 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3492 if (OPTION (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3493 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3494 break;
3016 case 8: /* unofficial extension */ 3495 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3497 break;
3019 } 3498 }
… …
3055 break; 3534 break;
3056 3535
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3536 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3537 if (arg[0] == 4)
3059 scr_insert_mode (0); 3538 scr_insert_mode (0);
3539 else if (arg[0] == 20)
3540 priv_modes &= ~PrivMode_LFNL;
3060 break; 3541 break;
3061 3542
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3543 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3544 if (arg[0] == 4)
3064 scr_insert_mode (1); 3545 scr_insert_mode (1);
3546 else if (arg[0] == 20)
3547 priv_modes |= PrivMode_LFNL;
3065 break; 3548 break;
3066 3549
3067 /* 3550 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3551 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3552 */
… …
3081 break; 3564 break;
3082 case CSI_75: 3565 case CSI_75:
3083 scr_cursor (RESTORE); 3566 scr_cursor (RESTORE);
3084 break; 3567 break;
3085 3568
3086#ifndef NO_FRILLS 3569#if ENABLE_FRILLS
3087 case CSI_74: 3570 case CSI_74:
3088 process_window_ops (arg, nargs); 3571 process_window_ops (arg, nargs);
3089 break; 3572 break;
3090#endif 3573#endif
3091 3574
… …
3098 break; 3581 break;
3099 } 3582 }
3100} 3583}
3101/*}}} */ 3584/*}}} */
3102 3585
3103#ifndef NO_FRILLS 3586#if ENABLE_FRILLS
3104/* ARGSUSED */ 3587/* ARGSUSED */
3105void 3588void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3589rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3590{
3108 int x, y; 3591 int x, y;
3109 XWindowAttributes wattr; 3592 XWindowAttributes wattr;
3110 Window wdummy; 3593 Window wdummy;
3594 dDisp;
3111 3595
3112 if (nargs == 0) 3596 if (nargs == 0)
3113 return; 3597 return;
3114 3598
3115 switch (args[0]) 3599 switch (args[0])
3116 { 3600 {
3117 /* 3601 /*
3118 * commands 3602 * commands
3119 */ 3603 */
3120 case 1: /* deiconify window */ 3604 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3605 XMapWindow (disp, parent[0]);
3122 break; 3606 break;
3123 case 2: /* iconify window */ 3607 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3608 XIconifyWindow (disp, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3609 break;
3127 case 3: /* set position (pixels) */ 3610 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3611 XMoveWindow (disp, parent[0], args[1], args[2]);
3129 break; 3612 break;
3130 case 4: /* set size (pixels) */ 3613 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3615 break;
3133 case 5: /* raise window */ 3616 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3617 XRaiseWindow (disp, parent[0]);
3135 break; 3618 break;
3136 case 6: /* lower window */ 3619 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3620 XLowerWindow (disp, parent[0]);
3138 break; 3621 break;
3139 case 7: /* refresh window */ 3622 case 7: /* refresh window */
3140 scr_touch (true); 3623 scr_touch (true);
3141 break; 3624 break;
3142 case 8: /* set size (chars) */ 3625 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3626 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3627 (unsigned int) (args[1] * fheight));
3145 break; 3628 break;
3146 3629
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3630 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3631 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3632 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3633 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
3152 break; 3635 break;
3153 3636
3154 3637
3155 /* 3638 /*
3156 * reports - some output format copied from XTerm 3639 * reports - some output format copied from XTerm
3157 */ 3640 */
3158 case 11: /* report window state */ 3641 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3642 XGetWindowAttributes (disp, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3644 break;
3162 case 13: /* report window position */ 3645 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3646 XGetWindowAttributes (disp, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3647 XTranslateCoordinates (disp, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3648 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3649 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3650 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3651 break;
3169 case 14: /* report window size (pixels) */ 3652 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3655 break;
3173 case 18: /* report text area size (chars) */ 3656 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3657 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3658 break;
3176 case 19: /* report window size (chars) */ 3659 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3660 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3661 break;
3179 case 20: /* report icon label */ 3662 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3663 {
3182 char *s; 3664 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3665 XGetIconName (disp, parent[0], &s);
3184 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);
3185 } 3668 }
3186 break; 3669 break;
3187 case 21: /* report window title */ 3670 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3671 {
3190 char *s; 3672 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3673 XFetchName (disp, parent[0], &s);
3192 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);
3193 } 3676 }
3194 break; 3677 break;
3195 } 3678 }
3196} 3679}
3197#endif 3680#endif
3198 3681
3199/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3200/* 3683/*
3201 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3203 */ 3686 */
3204unsigned char * 3687char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3689{
3207 unicode_t prev = 0, ch; 3690 unicode_t ch;
3691 bool seen_esc = false;
3208 unsigned int n = 0; 3692 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3693 wchar_t string[STRING_MAX];
3211 3694
3212 while ((ch = cmd_getc ()) != NOCHAR) 3695 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3696 {
3214 if (prev == C0_ESC) 3697 if (seen_esc)
3215 { 3698 {
3216 if (ch == 0x5c) /* 7bit ST */ 3699 if (ch == 0x5c) /* 7bit ST */
3217 break; 3700 break;
3218 else 3701 else
3219 return NULL; 3702 return NULL;
3220 } 3703 }
3704 else if (ch == C0_ESC)
3705 {
3706 seen_esc = true;
3707 continue;
3708 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3709 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3710 break;
3223 else if (ch < 0x20) 3711 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3712 return NULL; /* other control character - exit */
3225 3713
3226 if (n >= sizeof (string) - 1) 3714 seen_esc = false;
3715
3716 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3717 // stop at some sane length
3228 return NULL; 3718 return NULL;
3229 3719
3230 if (ch == C0_SYN) 3720 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3721 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3722 else
3236 string[n++] = prev = ch; 3723 string[n++] = ch;
3237 } 3724 }
3238 3725
3239 string[n++] = '\0'; 3726 string[n++] = '\0';
3240 3727
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3729
3246 return s; 3730 return rxvt_wcstombs (string);
3247} 3731}
3248 3732
3249/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3250/* 3734/*
3251 * 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)'
3252 */ 3736 */
3253void 3737void
3254rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3255{ 3739{
3256 unsigned char *s; 3740 char *s;
3257 unicode_t eh; 3741 unicode_t eh;
3258 3742
3259 /* 3743 /*
3260 * Not handled yet 3744 * Not handled yet
3261 */ 3745 */
… …
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3282 3766
3283 if (ch == ';') 3767 if (ch == ';')
3284 { 3768 {
3285 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3286 3770
3287 if (s) 3771 if (s)
3288 { 3772 {
3289 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3290 free (s); 3774 free (s);
3291 } 3775 }
3292 } 3776 }
3293} 3777}
3294 3778
3295void 3779void
3296rxvt_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)
3297{ 3781{
3298 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3299 { 3783 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3784 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
3304 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);
3305 }
3306 } 3787 }
3307 else 3788 else
3308 set_window_color (color, str); 3789 set_window_color (color, str);
3309} 3790}
3310 3791
3311/* 3792/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3794 */
3336void 3795void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3338{ 3797{
3339 int changed = 0; 3798 int changed = 0;
3340 int color; 3799 int color;
3341 char *buf, *name; 3800 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
3802 int saveop = op;
3803 dDisp;
3343 3804
3344 assert (str != NULL); 3805 assert (str != NULL);
3345 switch (op) 3806 switch (op)
3346 { 3807 {
3347 case XTerm_name: 3808 case XTerm_name:
… …
3354 set_title (str); 3815 set_title (str);
3355 break; 3816 break;
3356 case XTerm_property: 3817 case XTerm_property:
3357 if (str[0] == '?') 3818 if (str[0] == '?')
3358 { 3819 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3820 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3821 Atom actual_type;
3361 int actual_format; 3822 int actual_format;
3362 unsigned long nitems; 3823 unsigned long nitems;
3363 unsigned long bytes_after; 3824 unsigned long bytes_after;
3364 unsigned char *value = 0; 3825 unsigned char *value = 0;
3365 const char *str = ""; 3826 const char *str = "";
3366 3827
3367 if (prop 3828 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3829 && XGetWindowProperty (disp, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3830 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3831 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3832 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3833 && actual_type != None
3373 && actual_format == 8) 3834 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3843 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3844
3384 if (eq) 3845 if (eq)
3385 { 3846 {
3386 *eq = 0; 3847 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3848 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3849 }
3392 else 3850 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3851 XDeleteProperty (disp, parent[0],
3394 display->atom (str)); 3852 display->atom (str));
3395 } 3853 }
3396 break; 3854 break;
3397 3855
3398 case XTerm_Color: 3856 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3857 for (buf = (char *)str; buf && *buf;)
3400 { 3858 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3860 break;
3403 3861
3404 *name++ = '\0'; 3862 *name++ = '\0';
3405 color = atoi (buf); 3863 color = atoi (buf);
3406 3864
3407 if (color < 0 || color >= TOTAL_COLORS) 3865 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3866 break;
3409 3867
3410 if ((buf = STRCHR (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3869 *buf++ = '\0';
3412 3870
3413 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3414 { 3872 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3873 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 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);
3420 }
3421 } 3876 }
3422 else 3877 else
3423 set_window_color (color + minCOLOR, name); 3878 set_window_color (color + minCOLOR, name);
3424 } 3879 }
3425 break; 3880 break;
… …
3447 case XTerm_Color_UL: 3902 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3904 break;
3450 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3907 break;
3908 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break;
3911#endif
3912#if TRANSPARENT && TINTING
3913 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3915 check_our_parents ();
3916 if (am_transparent)
3917 want_full_refresh = want_refresh = 1;
3452 break; 3918 break;
3453#endif 3919#endif
3454 3920
3455 case XTerm_Pixmap: 3921 case XTerm_Pixmap:
3456 if (*str != ';') 3922 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3461#endif 3927#endif
3462 scr_touch (true); 3928 scr_touch (true);
3463 } 3929 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3930 while ((str = strchr (str, ';')) != NULL)
3465 { 3931 {
3466 str++; 3932 str++;
3467#if XPM_BACKGROUND 3933#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3934 changed += scale_pixmap (str);
3469#endif 3935#endif
3470
3471 } 3936 }
3937
3472 if (changed) 3938 if (changed)
3473 { 3939 {
3474#ifdef XPM_BACKGROUND 3940#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3941 resize_pixmap ();
3476#endif 3942#endif
… …
3487 3953
3488 case XTerm_logfile: 3954 case XTerm_logfile:
3489 // TODO, when secure mode? 3955 // TODO, when secure mode?
3490 break; 3956 break;
3491 3957
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR 3958#ifdef MENUBAR
3533 case XTerm_Menu: 3959 case URxvt_Menu:
3534 if (Options & Opt_insecure) 3960 if (OPTION (Opt_insecure))
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3962 break;
3537#endif 3963#endif
3538#if 0 3964#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3965 case XTerm_dumpscreen: /* no error notices */
… …
3543 { 3969 {
3544 scr_dump (fd); 3970 scr_dump (fd);
3545 close (fd); 3971 close (fd);
3546 } 3972 }
3547 } 3973 }
3974 break;
3975#endif
3976 case XTerm_font:
3977 op = URxvt_font;
3978 case URxvt_font:
3979#if ENABLE_STYLES
3980 case URxvt_boldFont:
3981 case URxvt_italicFont:
3982 case URxvt_boldItalicFont:
3983#endif
3984 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", saveop,
3986 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3987 ? fontset[op - URxvt_font]->fontdesc : "",
3988 resp);
3989 else
3990 {
3991 const char *&res = rs[Rs_font + (op - URxvt_font)];
3992
3993 res = strdup (str);
3994 allocated.push_back ((void *)res);
3995 set_fonts ();
3996 }
3997 break;
3998
3999#if ENABLE_FRILLS
4000 case URxvt_locale:
4001 if (query)
4002 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4003 else
4004 {
4005 set_locale (str);
4006 pty.set_utf8_mode (enc_utf8);
4007 init_xlocale ();
4008 }
4009 break;
4010
4011 case URxvt_view_up:
4012 case URxvt_view_down:
4013 {
4014 int lines = atoi (str);
4015
4016 if (lines)
4017 scr_page (op == URxvt_view_up ? UP : DN, lines);
4018 else
4019 scr_erase_savelines ();
4020 }
4021
4022 break;
4023#endif
4024
4025#if ENABLE_PERL
4026 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028 ; // no responses yet
3548 break; 4029 break;
3549#endif 4030#endif
3550 } 4031 }
3551} 4032}
3552/*----------------------------------------------------------------------*/ 4033/*----------------------------------------------------------------------*/
… …
3566{ 4047{
3567 int state; 4048 int state;
3568 4049
3569 if (mode == 's') 4050 if (mode == 's')
3570 { 4051 {
3571 SavedModes |= (PrivateModes & bit); 4052 SavedModes |= (priv_modes & bit);
3572 return -1; 4053 return -1;
3573 } 4054 }
3574 else 4055 else
3575 { 4056 {
3576 if (mode == 'r') 4057 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4058 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 4059 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4060 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 4061 PrivMode (state, bit);
3581 } 4062 }
3582 4063
3583 return state; 4064 return state;
3584} 4065}
… …
3602 { 3, PrivMode_132 }, 4083 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 4084 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 4085 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 4086 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 4087 { 7, PrivMode_Autowrap },
4088 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 4089 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 4090#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 4091 { menuBar_esc, PrivMode_menuBar },
3610#endif 4092#endif
4093 // 18, 19 printing-related
4094 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 4095#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 4096 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 4097#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 4098 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 4099 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4100 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4101 // 45 margin bell NYI
3621 // 46 start logging 4102 // 46 start logging
… …
3661 } 4142 }
3662 4143
3663 /* extra handling for values with state unkept */ 4144 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4145 switch (arg[i])
3665 { 4146 {
4147#if ENABLE_STYLES
4148 case 1021:
4149 set_option (Opt_intensityStyles, mode);
4150
4151 scr_touch (true);
4152 break;
4153#endif
3666 case 1048: /* alternative cursor save */ 4154 case 1048: /* alternative cursor save */
4155 case 1049:
3667 if (Options & Opt_secondaryScreen) 4156 if (OPTION (Opt_secondaryScreen))
3668 if (mode == 0) 4157 if (mode == 0)
3669 scr_cursor (RESTORE); 4158 scr_cursor (RESTORE);
3670 else if (mode == 1) 4159 else if (mode == 1)
3671 scr_cursor (SAVE); 4160 scr_cursor (SAVE);
3672 break; 4161 break;
… …
3683 * within VT52 mode 4172 * within VT52 mode
3684 */ 4173 */
3685 PrivMode (1, PrivMode_vt52); 4174 PrivMode (1, PrivMode_vt52);
3686 break; 4175 break;
3687 case 3: /* 80/132 */ 4176 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4177 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4178 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4179 break;
3691 case 4: /* smooth scrolling */ 4180 case 4: /* smooth scrolling */
3692 if (state) 4181 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 4182 break;
3697 case 5: /* reverse video */ 4183 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4184 scr_rvideo_mode (state);
3699 break; 4185 break;
3700 case 6: /* relative/absolute origins */ 4186 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4190 scr_autowrap (state);
3705 break; 4191 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4192 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4193 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4194 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4195 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4196 break;
3711#ifdef menuBar_esc 4197#ifdef menuBar_esc
3712 case menuBar_esc: 4198 case menuBar_esc:
3713#ifdef MENUBAR 4199#ifdef MENUBAR
3714 map_menuBar (state); 4200 map_menuBar (state);
… …
3734 break; 4220 break;
3735 /* case 66: - application key pad */ 4221 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4222 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4223 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4224 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4225 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4226 break;
3741#if 0 4227#if 0
3742 case 1001: 4228 case 1001:
3743 break; /* X11 mouse highlighting */ 4229 break; /* X11 mouse highlighting */
3744#endif 4230#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4231 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 4232 set_option (Opt_scrollTtyOutput, !state);
3750 break; 4233 break;
3751 case 1011: /* scroll to bottom on key press */ 4234 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4235 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 4236 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4237 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4238 if (OPTION (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 4239 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4240 scr_erase_screen (2);
3761 scr_change_screen (state); 4241 scr_change_screen (state);
3762 break; 4242 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4243 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4244 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4245 if (OPTION (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 4246 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4247 scr_erase_screen (2);
3768 break; 4248 break;
3769 default: 4249 default:
3770 break; 4250 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4276 rendset = 0, rendstyle = ~RS_None;
3797 break; 4277 break;
3798 case 1: 4278 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4279 rendset = 1, rendstyle = RS_Bold;
3800 break; 4280 break;
3801 //case 2: // faint or second colour 4281 //case 2: // low intensity
4282 case 3:
4283 rendset = 1, rendstyle = RS_Italic;
4284 break;
3802 case 4: 4285 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4286 rendset = 1, rendstyle = RS_Uline;
3804 break; 4287 break;
3805 case 5: // slowly blinking 4288 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4289 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4301 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4302 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4303 //...
3821 //case 19: // ninth alt font 4304 //case 19: // ninth alt font
3822 //case 20: // gothic 4305 //case 20: // gothic
3823 case 21: // disable bold, faint 4306 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4307 rendset = 0, rendstyle = RS_Bold;
3825 break; 4308 break;
3826 case 22: 4309 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4310 rendset = 0, rendstyle = RS_Bold;
3828 break; 4311 break;
3829 //case 23: disable italic 4312 case 23: // disable italic
4313 rendset = 0, rendstyle = RS_Italic;
4314 break;
3830 case 24: 4315 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4316 rendset = 0, rendstyle = RS_Uline;
3832 break; 4317 break;
3833 case 25: 4318 case 25:
4319 rendset = 0, rendstyle = RS_Blink;
4320 break;
4321 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4322 rendset = 0, rendstyle = RS_Blink;
3835 break; 4323 break;
3836 case 27: 4324 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4325 rendset = 0, rendstyle = RS_RVid;
3838 break; 4326 break;
… …
3856 case 35: 4344 case 35:
3857 case 36: 4345 case 36:
3858 case 37: 4346 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4347 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4348 break;
3861#ifdef TTY_256COLOR 4349 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4350 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4351 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4352 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4353 i += 2;
3867 } 4354 }
3868 break; 4355 break;
3869#endif
3870 case 39: /* default fg */ 4356 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4357 scr_color (Color_fg, Color_fg);
3872 break; 4358 break;
3873 4359
3874 case 40: 4360 case 40:
… …
3879 case 45: 4365 case 45:
3880 case 46: 4366 case 46:
3881 case 47: 4367 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4368 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4369 break;
3884#ifdef TTY_256COLOR 4370 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4371 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4372 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4373 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4374 i += 2;
3890 } 4375 }
3891 break; 4376 break;
3892#endif
3893 case 49: /* default bg */ 4377 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4378 scr_color (Color_bg, Color_bg);
3895 break; 4379 break;
3896 4380
3897#ifndef NO_BRIGHTCOLOR 4381 //case 50: // not variable spacing
4382
4383#if ENABLE_FRILLS
3898 case 90: 4384 case 90:
3899 case 91: /* set bright fg color */ 4385 case 91: /* set bright fg color */
3900 case 92: 4386 case 92:
3901 case 93: 4387 case 93:
3902 case 94: 4388 case 94:
3903 case 95: 4389 case 95:
3904 case 96: 4390 case 96:
3905 case 97: 4391 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4392 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4393 break;
3909 case 100: 4394 case 100:
3910 case 101: /* set bright bg color */ 4395 case 101: /* set bright bg color */
3911 case 102: 4396 case 102:
3912 case 103: 4397 case 103:
3913 case 104: 4398 case 104:
3914 case 105: 4399 case 105:
3915 case 106: 4400 case 106:
3916 case 107: 4401 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4402 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4403 break;
3920#endif 4404#endif
3921
3922 } 4405 }
3923 } 4406 }
3924} 4407}
3925/*}}} */ 4408/*}}} */
3926 4409
… …
3930{ 4413{
3931 unicode_t ch, cmd = cmd_getc (); 4414 unicode_t ch, cmd = cmd_getc ();
3932 4415
3933 if (cmd == 'Q') 4416 if (cmd == 'Q')
3934 { /* query graphics */ 4417 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4418 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4419 return;
3937 } 4420 }
3938 /* swallow other graphics sequences until terminating ':' */ 4421 /* swallow other graphics sequences until terminating ':' */
3939 do 4422 do
3940 ch = cmd_getc (); 4423 ch = cmd_getc ();
… …
3950 */ 4433 */
3951void 4434void
3952rxvt_term::tt_printf (const char *fmt,...) 4435rxvt_term::tt_printf (const char *fmt,...)
3953{ 4436{
3954 va_list arg_ptr; 4437 va_list arg_ptr;
3955 unsigned char buf[256]; 4438 char buf[256];
3956 4439
3957 va_start (arg_ptr, fmt); 4440 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4441 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4442 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4443 tt_write (buf, strlen (buf));
3961} 4444}
3962 4445
3963/* ---------------------------------------------------------------------- */ 4446/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4447/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4448 * or generated by us in response to a query ESC sequence.
3966 */ 4449 */
4450const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4451
3967void 4452void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4453rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4454{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4455 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4456 return;
3971 4457
3972 if (len) 4458 if (pty.pty < 0)
4459 return;
4460
4461 if (v_buflen == 0)
4462 {
4463 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4464
4465 if ((unsigned int)written == len)
4466 return;
4467
4468 data += written;
4469 len -= written;
3973 { 4470 }
4471
4472 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4473
4474 memcpy (v_buffer + v_buflen, data, len);
4475 v_buflen += len;
4476
4477 pty_ev.set (EVENT_READ | EVENT_WRITE);
4478}
4479
4480void rxvt_term::pty_write ()
4481{
4482 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4483
4484 if (written > 0)
4485 {
4486 v_buflen -= written;
4487
3974 if (v_buflen == 0) 4488 if (v_buflen == 0)
3975 { 4489 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4490 free (v_buffer);
4003 v_buffer = 0; 4491 v_buffer = 0;
4004 v_buflen = 0; 4492 v_buflen = 0;
4005 4493
4006 pty_ev.set (EVENT_READ); 4494 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4495 return;
4019 } 4496 }
4497
4498 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4499 }
4500 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4501 pty_ev.set (EVENT_READ);
4021} 4502}
4022 4503
4023/*----------------------- end-of-file (C source) -----------------------*/ 4504/*----------------------- end-of-file (C source) -----------------------*/
4024 4505

Diff Legend

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