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

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

Diff Legend

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