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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC

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

Diff Legend

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