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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 2006 UTC

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

Diff Legend

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