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.131 by root, Fri Aug 13 22:38:57 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;
61 71
62#ifndef NO_FRILLS 72#if ENABLE_FRILLS || ISO_14755
63 73
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 74#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 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
67 79
80#if ISO_14755
68static unsigned short iso14755_symtab[] = { 81static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 82 // keysym, unicode
70 XK_Left, 0x2190, 83 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 84 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 85 XK_Up, 0x2191,
… …
110 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 125 XK_Print, 0x2399,
113 126
114 XK_space, 0x2423, 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,
115 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
116 0, 137 0,
117}; 138};
118 139
119void 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
120rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
121{ 252{
122 wchar_t ch[2]; 253 wchar_t ch[2];
123 254
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 255 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 256 ch[1] = 0;
126 257
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 258 if (iso14755buf & ISO_14755_51)
128 { 259 {
129 char mb[16]; 260 char mb[16];
130 int len; 261 int len;
131 262
132 // allow verbatim 0-bytes and control-bytes to be entered 263 // allow verbatim 0-bytes and control-bytes to be entered
… …
137 mb[0] = ch[0]; 268 mb[0] = ch[0];
138 len = 1; 269 len = 1;
139 } 270 }
140 271
141 if (len > 0) 272 if (len > 0)
142 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
143 else 274 else
144 scr_bell (); 275 scr_bell ();
145 } 276 }
146 277
147 iso14755buf = 0; 278 iso14755buf = 0;
… …
175 KeySym keysym; 306 KeySym keysym;
176#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
177 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
178#endif 309#endif
179 int valid_keysym; 310 int valid_keysym;
180 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
181 312
182 /* 313 /*
183 * 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
184 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
185 * 316 *
186 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
187 */ 318 */
188 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
189 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
190 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
191 322
192 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
193 { 324 {
194 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
195 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
203 Status status_return; 334 Status status_return;
204 335
205#if 0 336#if 0
206#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
207 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
208 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
209 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
210 else 341 else
211#endif 342#endif
212#endif 343#endif
213 { 344 {
… …
215 346
216 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
217 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
218 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
219 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
220 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
221 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
222 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
223 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
224 SET_LOCALE (locale); 357 SET_LOCALE (locale);
225 358
226 if (status_return == XLookupChars 359 if (status_return == XLookupChars
227 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
248 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
249 } 382 }
250 else 383 else
251#endif 384#endif
252 { 385 {
253 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
254 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
255 } 388 }
256 389
257 if (valid_keysym) 390 if (valid_keysym)
258 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
259 if (TermWin.saveLines) 397 if (saveLines)
260 { 398 {
261#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
262 if (!ctrl && !meta) 400 if (!ctrl && !meta)
263#else 401#else
264 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
265#endif 403#endif
266 { 404 {
267 int lnsppg; 405 int lnsppg;
268 406
269#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
271#else 409#else
272 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
273#endif 411#endif
274 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
275 { 413 {
276 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
277 return; 415 return;
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 459 {
322 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
324 } 462 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 464 {
327 switch (keysym) 465 switch (keysym)
328 { 466 {
329 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
332 return; 470 return;
333#if TODO // TODO 471#if TODO
334 /* rxvt extras */ 472 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 474 change_font (FONT_UP);
337 return; 475 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 479#endif
342 } 480 }
343 } 481 }
344 } 482 }
345 483
346#ifndef NO_FRILLS 484#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 485 // ISO 14755 support
348 if (shft && ctrl) 486 if (shft && ctrl)
349 { 487 {
350 int hv; 488 int hv;
351 489
490 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 491 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 492 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 493 {
355 commit_iso14755 (); 494 commit_iso14755 ();
495 iso14755buf = ISO_14755_51;
496# if ISO_14755
497 iso14755_51 (0);
498# endif
356 return; 499 return;
357 } 500 }
358 else if ((hv = hex_keyval (ev)) >= 0) 501 else if ((hv = hex_keyval (ev)) >= 0)
359 { 502 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 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
361 return; 508 return;
362 } 509 }
363 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
514# endif
364 iso14755buf = 0; 515 iso14755buf = 0;
516 }
365 } 517 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
368 iso14755buf |= ISO_14755_ACTIVE; 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 }
369#endif 528#endif
370 529
371#ifdef PRINTPIPE 530#ifdef PRINTPIPE
372 if (keysym == XK_Print) 531 if (keysym == XK_Print)
373 { 532 {
… …
376 } 535 }
377#endif 536#endif
378 537
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 539 {
381#ifdef KEYSYM_RESOURCE
382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
383 {
384 unsigned int l;
385 const unsigned char *kbuf0;
386
387 kbuf0 = (Keysym_map[keysym & 0xFF]);
388 l = (unsigned int)*kbuf0++;
389
390 /* escape prefix */
391 if (meta
392# ifdef META8_OPTION
393 && meta_char == C0_ESC
394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
398 tt_write (&ch, 1);
399 }
400
401 tt_write (kbuf0, l);
402 return;
403 }
404 else
405#endif
406 { 540 {
407 newlen = 1; 541 newlen = 1;
408 switch (keysym) 542 switch (keysym)
409 { 543 {
410#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 545 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
413 { 547 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
417 } 551 }
418 else 552 else
419 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
420 break; 554 break;
421#endif 555#endif
422#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
423 case XK_Delete: 567 case XK_Delete:
424 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
425 break; 569 break;
426#endif 570#endif
427 case XK_Tab: 571 case XK_Tab:
428 if (shft) 572 if (shft)
429 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
430 else 574 else
431 { 575 {
432#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 577 if (ctrl)
434 meta = 1; 578 meta = 1;
… …
444#ifdef XK_KP_Left 588#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 594 {
451 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 597 break;
454 } 598 }
455 else 599 else
456 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
459#endif 603#endif
460 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 610 /* do Shift first */
467 if (shft) 611 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 613 else if (ctrl)
470 { 614 {
471 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 617 }
474 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
476 break; 620 break;
477 621
478#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
480 case XK_KP_Prior: 624 case XK_KP_Prior:
481 /* allow shift to override */ 625 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 627 {
484 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
485 break; 629 break;
486 } 630 }
487 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
488# endif 632# endif
489 case XK_Prior: 633 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
491 break; 635 break;
492# ifdef XK_KP_Next 636# ifdef XK_KP_Next
493 case XK_KP_Next: 637 case XK_KP_Next:
494 /* allow shift to override */ 638 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 640 {
497 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
498 break; 642 break;
499 } 643 }
500 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
501# endif 645# endif
502 case XK_Next: 646 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
504 break; 648 break;
505#endif 649#endif
506 case XK_KP_Enter: 650 case XK_KP_Enter:
507 /* allow shift to override */ 651 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 653 {
510 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';
511 } 666 }
512 else 667 else
513 { 668 {
514 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
516 } 671 }
517 break; 672 break;
518 673
519#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
520 case XK_KP_Begin: 675 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
522 break; 677 break;
523 678
524 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op");
526 break;
527
528 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On");
530 break;
531#endif 679#endif
532 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
538 break; 686 break;
539 687
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 704 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 706 {
559 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 709 }
562 else 710 else
563 { 711 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
566 } 714 }
567 break; 715 break;
568 716
569 case XK_Find: 717 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
571 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
572 case XK_Insert: 731 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
574 break; 733 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 735 case DXK_Remove:
577 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
578#endif 737#endif
579 case XK_Execute: 738 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
581 break; 740 break;
582 case XK_Select: 741 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
584 break; 743 break;
585#ifdef XK_KP_End 744#ifdef XK_KP_End
586 case XK_KP_End: 745 case XK_KP_End:
587 /* allow shift to override */ 746 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 748 {
590 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
591 break; 750 break;
592 } 751 }
593 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
594#endif 753#endif
595 case XK_End: 754 case XK_End:
596 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
597 break; 756 break;
598#ifdef XK_KP_Home 757#ifdef XK_KP_Home
599 case XK_KP_Home: 758 case XK_KP_Home:
600 /* allow shift to override */ 759 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 761 {
603 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
604 break; 763 break;
605 } 764 }
606 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
607#endif 766#endif
608 case XK_Home: 767 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
610 break; 769 break;
611 770
612#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 773
… …
666#undef FKEY 825#undef FKEY
667 default: 826 default:
668 newlen = 0; 827 newlen = 0;
669 break; 828 break;
670 } 829 }
830
671 if (newlen) 831 if (newlen)
672 len = STRLEN (kbuf); 832 len = strlen (kbuf);
673 } 833 }
674 834
675 /* 835 /*
676 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
677 */ 837 */
… …
684 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
685 { 845 {
686 len = 1; 846 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
689 else 854 else
690 { 855 {
691#ifdef META8_OPTION 856#ifdef META8_OPTION
692 /* set 8-bit on */ 857 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
694 { 859 {
695 unsigned char *ch; 860 char *ch;
696 861
697 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
698 *ch |= 0x80; 863 *ch |= 0x80;
699 864
700 meta = 0; 865 meta = 0;
… …
705 } 870 }
706 871
707 if (len <= 0) 872 if (len <= 0)
708 return; /* not mapped */ 873 return; /* not mapped */
709 874
710 if (Options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
711 if (TermWin.view_start) 876 if (view_start)
712 { 877 {
713 TermWin.view_start = 0; 878 view_start = 0;
714 want_refresh = 1; 879 want_refresh = 1;
715 } 880 }
716 881
717 /* 882 /*
718 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
733#ifdef META8_OPTION 898#ifdef META8_OPTION
734 && meta_char == C0_ESC 899 && meta_char == C0_ESC
735#endif 900#endif
736 ) 901 )
737 { 902 {
738 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
739 tt_write (&ch, 1); 904 tt_write (&ch, 1);
740 } 905 }
741 906
742#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
743 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
751#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
753} 918}
754/*}}} */ 919/*}}} */
755 920
756#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
759unsigned int 924unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
761{ 926{
762 unsigned int n, s; 927 unsigned int n, s;
763 928
764 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 931
767 if (n > 0 && s < count) 932 if (n > 0 && s < count)
768 { 933 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 934 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 935 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 936 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 937 cmdbuf_endp -= n;
773 s += n; 938 s += n;
774 } 939 }
… …
784 949
785 cmd_parse (); 950 cmd_parse ();
786 951
787 return 0; 952 return 0;
788} 953}
789#endif /* MENUBAR_MAX */ 954#endif
790 955
791void 956void
792rxvt_term::flush () 957rxvt_term::flush ()
793{ 958{
959 flush_ev.stop ();
960
794#ifdef TRANSPARENT 961#ifdef TRANSPARENT
795 if (want_full_refresh) 962 if (want_full_refresh)
796 { 963 {
797 want_full_refresh = 0; 964 want_full_refresh = 0;
798 scr_clear (); 965 scr_clear ();
… …
808 IMSendSpot (); 975 IMSendSpot ();
809#endif 976#endif
810 } 977 }
811 978
812 display->flush (); 979 display->flush ();
813
814 flush_ev.stop ();
815} 980}
816 981
817void 982void
818rxvt_term::check_cb (check_watcher &w) 983rxvt_term::check_cb (check_watcher &w)
819{ 984{
… …
821 SET_LOCALE (locale); 986 SET_LOCALE (locale);
822 987
823 display->flush (); 988 display->flush ();
824 989
825 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 992}
828 993
829void 994void
830rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
831{ 996{
… …
895{ 1060{
896 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
897 || 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)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1064 {
1065 if (view_start == nsaved ||
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0;
1068
900 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1; 1070 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1072 }
904} 1073}
905#endif 1074#endif
906 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
907bool 1094bool
908rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
909{ 1096{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1098
912 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
913 { 1100 {
914 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");
915 n = 0; 1102 n = 0;
916 } 1103 }
917 1104
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
921 1108
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1110
924 if (n > 0) 1111 if (r > 0)
925 { 1112 {
926 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
927 return true; 1114 return true;
928 } 1115 }
929 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))
930 destroy (); 1128 destroy ();
1129 }
931 1130
932 return false; 1131 return false;
933} 1132}
934 1133
935void 1134void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1135rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1136{
938 SET_R (this); 1137 SET_R (this);
939 SET_LOCALE (locale); 1138 SET_LOCALE (locale);
940 1139
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1142 while (pty_fill ())
946 if (cmd_parse ()) 1143 if (cmd_parse ())
947 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
948} 1148}
949 1149
950void 1150void
951rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
952{ 1152{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
954 recolour_cursor (); 1154 recolour_cursor ();
955 1155
956#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1157 hidden_pointer = 0;
958 1158
959 if (Options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1161#endif
962} 1162}
963 1163
964#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
965void 1165void
966rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
967{ 1167{
968 if (! (Options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
969 return; 1169 return;
970 1170
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
972 XFlush (display->display); 1172 XFlush (display->display);
973 1173
974 hidden_pointer = 1; 1174 hidden_pointer = 1;
975} 1175}
976 1176
… …
993 x = ev.x; 1193 x = ev.x;
994 y = ev.y; 1194 y = ev.y;
995 pixel_position (&x, &y); 1195 pixel_position (&x, &y);
996 1196
997 if (MEvent.button == AnyButton) 1197 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1198 button_number = 3;
1000 }
1001 else 1199 else
1002 { 1200 {
1003 button_number = MEvent.button - Button1; 1201 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1202 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1203 if (button_number >= 3)
1006 button_number += (64 - 3); 1204 button_number += (64 - 3);
1007 } 1205 }
1008 1206
1009 if (PrivateModes & PrivMode_MouseX10) 1207 if (priv_modes & PrivMode_MouseX10)
1010 { 1208 {
1011 /* 1209 /*
1012 * do not report ButtonRelease 1210 * do not report ButtonRelease
1013 * no state info allowed 1211 * no state info allowed
1014 */ 1212 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1227 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1228 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1229#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1230 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1231#endif
1034
1035 } 1232 }
1036 1233
1037#ifdef DEBUG_MOUSEREPORT 1234#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1235 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1236 if (key_state & 16)
1040 fputc ('C', stderr); 1237 fputc ('C', stderr);
1041 if (key_state & 4) 1238 if (key_state & 4)
1042 fputc ('S', stderr); 1239 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1243 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1244 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1245 button_number,
1049 x + 1, 1246 x + 1,
1050 y + 1); 1247 y + 1);
1051#else 1248#endif
1249
1052 tt_printf ("\033[M%c%c%c", 1250 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1251 (32 + button_number + key_state),
1054 (32 + x + 1), 1252 (32 + x + 1),
1055 (32 + y + 1)); 1253 (32 + y + 1));
1056#endif
1057} 1254}
1058 1255
1059#ifdef USING_W11LIB 1256#ifdef USING_W11LIB
1060void 1257void
1061rxvt_W11_process_x_event (XEvent *ev) 1258rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1265
1069/*{{{ process an X event */ 1266/*{{{ process an X event */
1070void 1267void
1071rxvt_term::x_cb (XEvent &ev) 1268rxvt_term::x_cb (XEvent &ev)
1072{ 1269{
1270 dDisp;
1271
1073 SET_R (this); 1272 SET_R (this);
1074 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1075 1274
1076#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1277 {
1079 if (hidden_cursor) 1278 if (hidden_cursor)
1080 { 1279 {
1081 hidden_cursor = 0; 1280 hidden_cursor = 0;
1082 want_refresh = 1; 1281 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1285 }
1087#endif 1286#endif
1088 1287
1089#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1290 {
1092 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1297 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1298 pointer_blank ();
1100 } 1299 }
1101#endif 1300#endif
1102 1301
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1302 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1303 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1304 unsigned int unused_mask;
1111
1112#ifdef DEBUG_X
1113 const char *const eventnames[] =
1114 { /* mason - this matches my system */
1115 "",
1116 "",
1117 "KeyPress",
1118 "KeyRelease",
1119 "ButtonPress",
1120 "ButtonRelease",
1121 "MotionNotify",
1122 "EnterNotify",
1123 "LeaveNotify",
1124 "FocusIn",
1125 "FocusOut",
1126 "KeymapNotify",
1127 "Expose",
1128 "GraphicsExpose",
1129 "NoExpose",
1130 "VisibilityNotify",
1131 "CreateNotify",
1132 "DestroyNotify",
1133 "UnmapNotify",
1134 "MapNotify",
1135 "MapRequest",
1136 "ReparentNotify",
1137 "ConfigureNotify",
1138 "ConfigureRequest",
1139 "GravityNotify",
1140 "ResizeRequest",
1141 "CirculateNotify",
1142 "CirculateRequest",
1143 "PropertyNotify",
1144 "SelectionClear",
1145 "SelectionRequest",
1146 "SelectionNotify",
1147 "ColormapNotify",
1148 "ClientMessage",
1149 "MappingNotify"
1150 };
1151#endif
1152
1153#ifdef DEBUG_X
1154 struct timeval tp;
1155 struct tm *ltt;
1156 (void)gettimeofday (&tp, NULL);
1157 ltt = localtime (& (tp.tv_sec));
1158 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));
1159#endif
1160 1305
1161 switch (ev.type) 1306 switch (ev.type)
1162 { 1307 {
1163 case KeyPress: 1308 case KeyPress:
1309#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1165 lookup_key (ev.xkey); 1312 lookup_key (ev.xkey);
1166 1313
1167 break; 1314 break;
1168 1315
1169 case KeyRelease: 1316 case KeyRelease:
1170 { 1317 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1319 KeySym ks;
1173 1320
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1322#endif
1176 1323
1177#ifndef NO_FRILLS 1324#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1325 // ISO 14755 support
1179 if (iso14755buf) 1326 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1327 if (iso14755buf & ISO_14755_52)
1181 { 1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1333 // iso14755 part 5.2 handling: release time
1183 // first: controls 1334 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1335 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1336 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1337 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1338 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1340 commit_iso14755 ();
1190 return; // case-break; 1341 return; // case-break;
1191 } 1342 }
1192 1343
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1345 if (i[0] == ks)
1195 { 1346 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1347 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1348 commit_iso14755 ();
1198 return; // case-break; 1349 return; // case-break;
1199 } 1350 }
1200 1351
1352 scr_bell ();
1353# endif
1201 iso14755buf = 0; 1354 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1355 break;
1204 } 1356 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1362 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1363 commit_iso14755 ();
1364#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 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;
1211 } 1375 }
1212#endif 1376#endif
1213 1377
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
… …
1228 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1229 break; 1393 break;
1230 1394
1231 case ClientMessage: 1395 case ClientMessage:
1232 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 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
1235#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1241 { 1423 {
1242 /* Get Dnd data */ 1424 /* Get Dnd data */
1243 Atom ActualType; 1425 Atom ActualType;
1244 int ActualFormat; 1426 int ActualFormat;
1245 unsigned char *data; 1427 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1428 unsigned long Size, RemainingBytes;
1247 1429
1248 XGetWindowProperty (display->display, display->root, 1430 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1431 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1432 0L, 1000000L,
1251 False, AnyPropertyType, 1433 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1434 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1435 &Size, &RemainingBytes,
1254 &data); 1436 &data);
1255 XChangeProperty (display->display, display->root, 1437 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1438 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1441 }
1263#endif /* OFFIX_DND */ 1442#endif /* OFFIX_DND */
1264 break; 1443 break;
1265 1444
1266 case MappingNotify: 1445 case MappingNotify:
… …
1291 break; 1470 break;
1292 } 1471 }
1293 break; 1472 break;
1294 1473
1295 case FocusIn: 1474 case FocusIn:
1296 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])
1297 { 1484 {
1298 TermWin.focus = 1; 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1486 ;
1300#ifdef USE_XIM 1487
1301 if (Input_Context != NULL) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1302 XSetICFocus (Input_Context);
1303#endif
1304#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 { 1489 {
1311 PixColors = PixColorsFocused; 1490 seen_resize = 1;
1312 set_colorfgbg (); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1492 }
1316#endif
1317
1318 }
1319 break;
1320
1321 case FocusOut:
1322 if (TermWin.focus)
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break;
1347
1348 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0])
1350 {
1351 int height, width;
1352
1353 do
1354 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360
1361 if (szHint.width != width || szHint.height != height)
1362 resize_all_windows (width, height, 1);
1363 1493
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1496 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1497#endif
1372 } 1498 }
1373 break; 1499 break;
1374 1500
1375 case PropertyNotify: 1501 case PropertyNotify:
… …
1383 selection_clear (); 1509 selection_clear ();
1384 break; 1510 break;
1385 1511
1386 case SelectionNotify: 1512 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1513 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1515 break;
1391 1516
1392 case SelectionRequest: 1517 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1394 break; 1519 break;
1395 1520
1396 case UnmapNotify: 1521 case UnmapNotify:
1397 TermWin.mapped = 0; 1522 mapped = 0;
1398#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1400#endif 1525#endif
1401 break; 1526 break;
1402 1527
1403 case MapNotify: 1528 case MapNotify:
1404 TermWin.mapped = 1; 1529 mapped = 1;
1405#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif 1532#endif
1408 break; 1533 break;
1409 1534
… …
1413 break; 1538 break;
1414#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1415 1540
1416 case GraphicsExpose: 1541 case GraphicsExpose:
1417 case Expose: 1542 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1419 { 1544 {
1420 do 1545 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1549
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1551
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1430 1555
1431 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1432 } 1557 }
1433 else 1558 else
1434 { 1559 {
1435 XEvent unused_event; 1560 XEvent unused_event;
1436 1561
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1563 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1565 ;
1441 1566
1442 if (isScrollbarWindow (ev.xany.window)) 1567 if (isScrollbarWindow (ev.xany.window))
1443 { 1568 {
1444 scrollBar.setIdle (); 1569 scrollBar.setIdle ();
… …
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose (); 1574 menubar_expose ();
1450#endif 1575#endif
1451 1576
1452#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1455#endif 1580#endif
1456 } 1581 }
1457 break; 1582 break;
1458 1583
1459 case MotionNotify: 1584 case MotionNotify:
… …
1466 { 1591 {
1467 menubar_control (ev.xbutton); 1592 menubar_control (ev.xbutton);
1468 break; 1593 break;
1469 } 1594 }
1470#endif 1595#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1597 break;
1473 1598
1474 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1475 { 1600 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1602 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1604 ;
1480 1605
1481 XQueryPointer (display->display, TermWin.vt, 1606 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1609 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1610 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1612 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1613 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1614 {
1490#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
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1626
1493#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1630 {
1497 int dist; 1631 int dist;
1498 1632
1499 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1637 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1638
1505 /* save the event params so we can highlight 1639 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1640 * the selection in the pending-scroll loop
1507 */ 1641 */
1508 selection_save_x=ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1645
1513 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1515 { 1648 {
1516 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1518 } 1651 }
1519 else 1652 else
1520 { 1653 {
1521 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1655 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1656 }
1657
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1658 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1660 + 1;
1527 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1529 } 1663 }
1530 else 1664 else
1531 { 1665 {
1532 /* we are within the text window, so we 1666 /* we are within the text window, so we
1533 * shouldn't be scrolling 1667 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1669 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1537 } 1671 }
1538#endif 1672#endif
1539#ifdef MOUSE_THRESHOLD 1673#ifdef MOUSE_THRESHOLD
1540
1541 } 1674 }
1542#endif 1675#endif
1543
1544 } 1676 }
1545 } 1677 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1679 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1680 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1681 MotionNotify, &ev))
1682 ;
1683
1550 XQueryPointer (display->display, scrollBar.win, 1684 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1687 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1688 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1690 scrollbar_size ());
1557 scr_refresh (refresh_type); 1691 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1692 refresh_limit = 0;
… …
1560 } 1694 }
1561 break; 1695 break;
1562 } 1696 }
1563} 1697}
1564 1698
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
1565#if TRANSPARENT 1768#if TRANSPARENT
1566void 1769void
1567rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1771{
1569 SET_R (this); 1772 SET_R (this);
… …
1574 case PropertyNotify: 1777 case PropertyNotify:
1575 /* 1778 /*
1576 * 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,
1577 * 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.
1578 */ 1781 */
1579 if (xa[XA_XROOTPMAPID] == 0)
1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1581
1582 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])
1583 return; 1784 return;
1584 1785
1585 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1586 case ReparentNotify: 1787 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1589 break; 1790 break;
1590 } 1791 }
1591} 1792}
1592#endif 1793#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1596{ 1797{
1597 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1598 1799
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1600 if (!bypass_keystate) 1802 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804
1602 /* 1805 /*
1603 * VT window processing of button press 1806 * VT window processing of button press
1604 */ 1807 */
1605 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1606 { 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
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1608 if (reportmode) 1821 if (reportmode)
1609 { 1822 {
1610 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
… …
1641 } 1854 }
1642 else 1855 else
1643 { 1856 {
1644 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1861 switch (ev.button)
1647 { 1862 {
1648 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
1649 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1874 {
1652 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1654 else 1877 else
1655 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1656 } 1879 }
1657 else 1880 else
1658 { 1881 {
1659 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1883 MEvent.clicks++;
1661 else 1884 else
1662 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1663 1886
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1888 }
1666 1889
1667 MEvent.button = Button1; 1890 MEvent.button = Button1;
1668 break; 1891 break;
1669 1892
1670 case Button3: 1893 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1673 else 1896 else
1674 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1898
1675 MEvent.button = Button3; 1899 MEvent.button = Button3;
1676 break; 1900 break;
1677 } 1901 }
1678 } 1902 }
1903
1679 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1680 return; 1905 return;
1681 } 1906 }
1682 1907
1683 /* 1908 /*
… …
1794 case Button3: 2019 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1796 { 2021 {
1797 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1800# else 2025# else
1801 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1802# endif 2027# endif
1803 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1806# else 2031# else
1807 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1808# endif 2033# endif
1809 else 2034 else
1810 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1811 } 2036 }
1812 else 2037 else
1813 { 2038 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2040 (nrow
1816 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2042 / scrollbar_size ()));
1818 } 2043 }
1819 2044
1820 break; 2045 break;
… …
1836{ 2061{
1837 int reportmode = 0; 2062 int reportmode = 0;
1838 2063
1839 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2065 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2067
1843 if (scrollbar_isUpDn ()) 2068 if (scrollbar_isUpDn ())
1844 { 2069 {
1845 scrollBar.setIdle (); 2070 scrollBar.setIdle ();
1846 scrollbar_show (0); 2071 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2073 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2074#endif
1850
1851 } 2075 }
2076
1852#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
1855#endif 2080#endif
2081
1856 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1857 { 2083 {
2084#if ISO_14755
2085 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return;
2088#endif
1858 if (reportmode) 2089 if (reportmode)
1859 { 2090 {
1860 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
1877 mouse_report (ev); 2108 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2110 return;
1880 } 2111 }
2112
1881 /* 2113 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2115 * when overriding mouse reporting
1884 */ 2116 */
1885 if (PrivateModes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2118 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
1889 2121
1890 switch (ev.button) 2122 switch (ev.button)
… …
1905 2137
1906 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
1907 2139
1908 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
1909 i = 1; 2141 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2143 i = nrow - 1;
1912 else 2144 else
1913 i = 5; 2145 i = 5;
1914 2146
1915# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
1917 { 2149 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
1919 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;
1920 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;
1921 2153
1922 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2156
1925 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2201 int i;
1970 2202
1971 Visual* visual = display->visual; 2203 Visual *visual = display->visual;
1972 2204
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2206
1975 /* for convenience */ 2207 /* for convenience */
1976 mask_r = visual->red_mask; 2208 mask_r = visual->red_mask;
… …
2197 Atom atype; 2429 Atom atype;
2198 unsigned char *prop = NULL; 2430 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2431 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2432 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2202 2435
2203 pchanged = 0; 2436 pchanged = 0;
2204 2437
2205 if (!(Options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2207 2440
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2210 2443
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2445
2213 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2214 { 2447 {
2215 if (am_transparent) 2448 if (am_transparent)
2216 { 2449 {
2217 pchanged = 1; 2450 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2220 } 2453 }
2221 2454
2222 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2223 } 2456 }
2224 2457
2225 /* 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. */
2226 XSync (display->display, False); 2459 XSync (disp, False);
2227 2460
2228 /* 2461 /*
2229 * Make the frame window set by the window manager have 2462 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2463 * the root background. Some window managers put multiple nested frame
2231 * 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.
2232 */ 2465 */
2233 i = (xa[XA_XROOTPMAPID] 2466 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2237 2470
2238 if (!i || prop == NULL) 2471 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2472 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2475 &nitems, &bytes_after, &prop) == Success);
2243 2476
2244 if (!i || prop == NULL 2477 if (!i || prop == NULL
2245#if TINTING 2478#if TINTING
… …
2264 Window cr; 2497 Window cr;
2265 XImage *image; 2498 XImage *image;
2266 GC gc; 2499 GC gc;
2267 XGCValues gcvalue; 2500 XGCValues gcvalue;
2268 2501
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2506 nx = ny = 0;
2274 2507
… …
2284 nh += sy; 2517 nh += sy;
2285 ny = -sy; 2518 ny = -sy;
2286 sy = 0; 2519 sy = 0;
2287 } 2520 }
2288 2521
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2291 allowedxerror = -1; 2526 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2528
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2530 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2531 allowedxerror = 0;
2297 2532
2298 if (image == NULL) 2533 if (image == NULL)
2299 { 2534 {
2300 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2301 { 2536 {
2302 pchanged = 1; 2537 pchanged = 1;
2303 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2304 { 2539 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2541 pixmap = None;
2307 } 2542 }
2308 } 2543 }
2309 2544
2310 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2311 } 2546 }
2312 else 2547 else
2313 { 2548 {
2314 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2316 2551
2317#if TINTING 2552#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2554 {
2320 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2557
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2559
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2561 }
2327#endif 2562#endif
2328 2563
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2569 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2570 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2338 2573
2339 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2575 pchanged = 1;
2341 2576
2342 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2343 } 2578 }
2344 } 2579 }
2345 2580
2346 if (!am_pixmap_trans) 2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2347 { 2584 {
2348 unsigned int n; 2585 unsigned int n;
2349 /* 2586 /*
2350 * InheritPixmap transparency 2587 * InheritPixmap transparency
2351 */ 2588 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2590 {
2355 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2358 XFree (list); 2594 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2595
2361 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2362 { 2597 {
2363 if (oldp != None) 2598 if (oldp != None)
2364 pchanged = 1; 2599 pchanged = 1;
2365 2600
2366 break; 2601 break;
2367 } 2602 }
2368 2603
2369 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2370 pchanged = 1; 2605 pchanged = 1;
2371 } 2606 }
2372 2607
2373 n = 0; 2608 n = 0;
2374 2609
2375 if (pchanged) 2610 if (pchanged)
2376 { 2611 {
2377 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2378 { 2613 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2616 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2618 break;
2385 } 2619 }
2386 } 2620 }
2387 } 2621 }
2388 2622
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2624 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2627 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2396 } 2629 }
2397 else 2630 else
2398 { 2631 {
2399#if WAIT_FOR_WM 2632#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2633 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2635 sleep (1);
2403#endif 2636#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2406 { 2638 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2409 } 2641 }
2410 2642
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2644 am_transparent = 1;
2413 } 2645 }
2414 2646
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2648 parent[i] = None;
2417 } 2649 }
2418 2650
2419 // this is experimental
2420 if (scrollBar.win) 2651 if (scrollBar.win)
2421 { 2652 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2654 scrollBar.setIdle ();
2425 scrollbar_show (0); 2655 scrollbar_show (0);
2426 } 2656 }
2427 2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2428 return pchanged; 2665 return pchanged;
2429} 2666}
2430#endif 2667#endif
2431 2668
2432/*}}} */ 2669/*}}} */
… …
2434bool 2671bool
2435rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2436{ 2673{
2437 bool flag = false; 2674 bool flag = false;
2438 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2440 2677
2441 for (;;) 2678 for (;;)
2442 { 2679 {
2443 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2444 { 2681 {
… …
2449 if (ch == NOCHAR) // TODO: improve 2686 if (ch == NOCHAR) // TODO: improve
2450 break; 2687 break;
2451 2688
2452 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)
2453 { 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
2454 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2707 bool refreshnow = false;
2457 int nlines = 0; 2708 int nlines = 0;
2458 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2459 2711
2460 for (;;) 2712 for (;;)
2461 { 2713 {
2462 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))
2463 break; 2715 break;
2464 2716
2465 *str++ = ch; 2717 *str++ = ch;
2466 2718
2467 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2468 { 2720 {
2721 if (ch == C0_LF)
2469 nlines++; 2722 nlines++;
2723
2470 refresh_count++; 2724 refresh_count++;
2471 2725
2472 if (!(Options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2728 {
2475 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2476 ch = NOCHAR; 2731 ch = NOCHAR;
2477 break; 2732 break;
2478 } 2733 }
2479 2734
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2482 { 2737 {
2483 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2484 nlines = 0; 2739 nlines = 0;
2485 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2486 } 2742 }
2487 }
2488 2743
2489 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2490 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2491 ch = NOCHAR; 2748 ch = NOCHAR;
2492 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2493 } 2755 }
2494 2756
2495 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2758 ch = next_char ();
2497 } 2759 }
… …
2504 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2768 */
2507 if (refreshnow) 2769 if (refreshnow)
2508 { 2770 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2772 refresh_limit++;
2511 else 2773 else
2512 { 2774 {
2513 flag = true; 2775 flag = true;
2514 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2515 } 2778 }
2516 } 2779 }
2517 2780
2518 } 2781 }
2519 else 2782 else
… …
2550rxvt_term::next_char () 2813rxvt_term::next_char ()
2551{ 2814{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2816 {
2554 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2557 2820
2558 wchar_t wc; 2821 wchar_t wc;
2559 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);
2560 2823
2561 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2562 { 2825 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
… …
2568 if (len == (size_t)-1) 2831 if (len == (size_t)-1)
2569 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
2570 2833
2571 // assume wchar == unicode 2834 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2835 cmdbuf_ptr += len;
2573 return wc; 2836 return wc & UNICODE_MASK;
2574 } 2837 }
2575 2838
2576 return NOCHAR; 2839 return NOCHAR;
2577} 2840}
2578 2841
… …
2703 case C0_ESC: 2966 case C0_ESC:
2704 process_escape_seq (); 2967 process_escape_seq ();
2705 break; 2968 break;
2706 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2972 else
2711 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2974 break;
2714 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2715 scr_bell (); 2976 scr_bell ();
2716 break; 2977 break;
2717 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
2816void 3077void
2817rxvt_term::process_escape_seq () 3078rxvt_term::process_escape_seq ()
2818{ 3079{
2819 unicode_t ch = cmd_getc (); 3080 unicode_t ch = cmd_getc ();
2820 3081
2821 if (PrivateModes & PrivMode_vt52) 3082 if (priv_modes & PrivMode_vt52)
2822 { 3083 {
2823 process_escape_vt52 (ch); 3084 process_escape_vt52 (ch);
2824 return; 3085 return;
2825 } 3086 }
2826 3087
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3102 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3103 break;
2843 case '+': 3104 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3105 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3106 break;
2846#ifndef NO_FRILLS 3107#if ENABLE_FRILLS
2847 case '6': 3108 case '6':
2848 scr_backindex (); 3109 scr_backindex ();
2849 break; 3110 break;
2850#endif 3111#endif
2851 case '7': 3112 case '7':
2852 scr_cursor (SAVE); 3113 scr_cursor (SAVE);
2853 break; 3114 break;
2854 case '8': 3115 case '8':
2855 scr_cursor (RESTORE); 3116 scr_cursor (RESTORE);
2856 break; 3117 break;
2857#ifndef NO_FRILLS 3118#if ENABLE_FRILLS
2858 case '9': 3119 case '9':
2859 scr_forwardindex (); 3120 scr_forwardindex ();
2860 break; 3121 break;
2861#endif 3122#endif
2862 case '=': 3123 case '=':
… …
2905 process_dcs_seq (); 3166 process_dcs_seq ();
2906 break; 3167 break;
2907 3168
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
2913 3173
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3176 process_csi_seq ();
… …
3041 { 3301 {
3042 switch (priv) 3302 switch (priv)
3043 { 3303 {
3044 case '>': 3304 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3307 break;
3048 case '?': 3308 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3311 break;
… …
3156 3416
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3422 break;
3163 3423
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3426 break;
3168 3427
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3171 break; 3430 break;
… …
3178 break; 3437 break;
3179 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3180 scr_report_position (); 3439 scr_report_position ();
3181 break; 3440 break;
3182 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3444 break;
3186 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3447 break;
3189 } 3448 }
… …
3225 break; 3484 break;
3226 3485
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3486 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3487 if (arg[0] == 4)
3229 scr_insert_mode (0); 3488 scr_insert_mode (0);
3489 else if (arg[0] == 20)
3490 priv_modes &= ~PrivMode_LFNL;
3230 break; 3491 break;
3231 3492
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3493 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3494 if (arg[0] == 4)
3234 scr_insert_mode (1); 3495 scr_insert_mode (1);
3496 else if (arg[0] == 20)
3497 priv_modes |= PrivMode_LFNL;
3235 break; 3498 break;
3236 3499
3237 /* 3500 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3501 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3502 */
… …
3251 break; 3514 break;
3252 case CSI_75: 3515 case CSI_75:
3253 scr_cursor (RESTORE); 3516 scr_cursor (RESTORE);
3254 break; 3517 break;
3255 3518
3256#ifndef NO_FRILLS 3519#if ENABLE_FRILLS
3257 case CSI_74: 3520 case CSI_74:
3258 process_window_ops (arg, nargs); 3521 process_window_ops (arg, nargs);
3259 break; 3522 break;
3260#endif 3523#endif
3261 3524
… …
3268 break; 3531 break;
3269 } 3532 }
3270} 3533}
3271/*}}} */ 3534/*}}} */
3272 3535
3273#ifndef NO_FRILLS 3536#if ENABLE_FRILLS
3274/* ARGSUSED */ 3537/* ARGSUSED */
3275void 3538void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3540{
3278 int x, y; 3541 int x, y;
3279 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
3280 Window wdummy; 3543 Window wdummy;
3544 dDisp;
3281 3545
3282 if (nargs == 0) 3546 if (nargs == 0)
3283 return; 3547 return;
3284 3548
3285 switch (args[0]) 3549 switch (args[0])
3286 { 3550 {
3287 /* 3551 /*
3288 * commands 3552 * commands
3289 */ 3553 */
3290 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3292 break; 3556 break;
3293 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3559 break;
3297 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3562 break;
3300 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3565 break;
3303 case 5: /* raise window */ 3566 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3305 break; 3568 break;
3306 case 6: /* lower window */ 3569 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3308 break; 3571 break;
3309 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3310 scr_touch (true); 3573 scr_touch (true);
3311 break; 3574 break;
3312 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3315 break; 3578 break;
3316 3579
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3581 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3322 break; 3585 break;
3323 3586
3324 3587
3325 /* 3588 /*
3326 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3327 */ 3590 */
3328 case 11: /* report window state */ 3591 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3594 break;
3332 case 13: /* report window position */ 3595 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3601 break;
3339 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3605 break;
3343 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3608 break;
3346 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3611 break;
3349 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3350 { 3613 {
3351 char *s; 3614 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3617 XFree (s);
3355 } 3618 }
3356 break; 3619 break;
3357 case 21: /* report window title */ 3620 case 21: /* report window title */
3358 { 3621 {
3359 char *s; 3622 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3625 XFree (s);
3363 } 3626 }
3364 break; 3627 break;
3365 } 3628 }
3366} 3629}
… …
3369/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3370/* 3633/*
3371 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3373 */ 3636 */
3374unsigned char * 3637char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3639{
3377 unicode_t prev = 0, ch; 3640 unicode_t ch;
3641 bool seen_esc = false;
3378 unsigned int n = 0; 3642 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3643 wchar_t string[STRING_MAX];
3381 3644
3382 while ((ch = cmd_getc ()) != NOCHAR) 3645 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3646 {
3384 if (prev == C0_ESC) 3647 if (seen_esc)
3385 { 3648 {
3386 if (ch == 0x5c) /* 7bit ST */ 3649 if (ch == 0x5c) /* 7bit ST */
3387 break; 3650 break;
3388 else 3651 else
3389 return NULL; 3652 return NULL;
3390 } 3653 }
3654 else if (ch == C0_ESC)
3655 {
3656 seen_esc = true;
3657 continue;
3658 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3659 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3660 break;
3393 else if (ch < 0x20) 3661 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3395 3663
3396 if (n >= sizeof (string) - 1) 3664 seen_esc = false;
3665
3666 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3667 // stop at some sane length
3398 return NULL; 3668 return NULL;
3399 3669
3400 if (ch == C0_SYN) 3670 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3671 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3672 else
3406 string[n++] = prev = ch; 3673 string[n++] = ch;
3407 } 3674 }
3408 3675
3409 string[n++] = '\0'; 3676 string[n++] = '\0';
3410 3677
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3679
3416 return s; 3680 return rxvt_wcstombs (string);
3417} 3681}
3418 3682
3419/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3420/* 3684/*
3421 * 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)'
3422 */ 3686 */
3423void 3687void
3424rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3425{ 3689{
3426 unsigned char *s; 3690 char *s;
3427 unicode_t eh; 3691 unicode_t eh;
3428 3692
3429 /* 3693 /*
3430 * Not handled yet 3694 * Not handled yet
3431 */ 3695 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3452 3716
3453 if (ch == ';') 3717 if (ch == ';')
3454 { 3718 {
3455 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3456 3720
3457 if (s) 3721 if (s)
3458 { 3722 {
3459 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3460 free (s); 3724 free (s);
3461 } 3725 }
3462 } 3726 }
3463} 3727}
3464 3728
3465void 3729void
3466rxvt_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)
3467{ 3731{
3468 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3469 { 3733 {
3470 unsigned short r, g, b; 3734 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
3472 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);
3473 } 3737 }
3474 else 3738 else
3475 set_window_color (color, str); 3739 set_window_color (color, str);
3476} 3740}
3477 3741
3478/* 3742/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3480 * 0 = change iconName/title
3481 * 1 = change iconName
3482 * 2 = change title
3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
3486 * 12 = change text color
3487 * 13 = change mouse foreground color
3488 * 17 = change highlight character colour
3489 * 18 = change bold character color
3490 * 19 = change underlined character color
3491 * 46 = change logfile (not implemented)
3492 * 50 = change font
3493 *
3494 * rxvt extensions:
3495 * 20 = bg pixmap
3496 * 39 = change default fg color
3497 * 49 = change default bg color
3498 * 55 = dump scrollback buffer and all of screen
3499 * 701 = change locale
3500 * 702 = find font
3501 * 703 = menu
3502 */ 3744 */
3503void 3745void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3747{
3506 int changed = 0; 3748 int changed = 0;
3507 int color; 3749 int color;
3508 char *buf, *name; 3750 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753 dDisp;
3510 3754
3511 assert (str != NULL); 3755 assert (str != NULL);
3512 switch (op) 3756 switch (op)
3513 { 3757 {
3514 case XTerm_name: 3758 case XTerm_name:
… …
3521 set_title (str); 3765 set_title (str);
3522 break; 3766 break;
3523 case XTerm_property: 3767 case XTerm_property:
3524 if (str[0] == '?') 3768 if (str[0] == '?')
3525 { 3769 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3770 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3771 Atom actual_type;
3528 int actual_format; 3772 int actual_format;
3529 unsigned long nitems; 3773 unsigned long nitems;
3530 unsigned long bytes_after; 3774 unsigned long bytes_after;
3531 unsigned char *value = 0; 3775 unsigned char *value = 0;
3532 const char *str = ""; 3776 const char *str = "";
3533 3777
3534 if (prop 3778 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3783 && actual_type != None
3540 && actual_format == 8) 3784 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3794
3551 if (eq) 3795 if (eq)
3552 { 3796 {
3553 *eq = 0; 3797 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3798 set_utf8_property (display->atom (str), eq + 1);
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 } 3799 }
3559 else 3800 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3802 display->atom (str));
3562 } 3803 }
3563 break; 3804 break;
3564 3805
3565 case XTerm_Color: 3806 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
3567 { 3808 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3810 break;
3570 3811
3571 *name++ = '\0'; 3812 *name++ = '\0';
3572 color = atoi (buf); 3813 color = atoi (buf);
3573 3814
3574 if (color < 0 || color >= TOTAL_COLORS) 3815 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3816 break;
3576 3817
3577 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3819 *buf++ = '\0';
3579 3820
3580 if (name[0] == '?' && !name[1]) 3821 if (name[0] == '?' && !name[1])
3581 { 3822 {
3582 unsigned short r, g, b; 3823 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3584 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);
3585 } 3826 }
3586 else 3827 else
3587 set_window_color (color + minCOLOR, name); 3828 set_window_color (color + minCOLOR, name);
3588 } 3829 }
… …
3611 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3854 break;
3614 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3615 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;
3616 break; 3868 break;
3617#endif 3869#endif
3618 3870
3619 case XTerm_Pixmap: 3871 case XTerm_Pixmap:
3620 if (*str != ';') 3872 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3625#endif 3877#endif
3626 scr_touch (true); 3878 scr_touch (true);
3627 } 3879 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3629 { 3881 {
3630 str++; 3882 str++;
3631#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3633#endif 3885#endif
3634
3635 } 3886 }
3887
3636 if (changed) 3888 if (changed)
3637 { 3889 {
3638#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3891 resize_pixmap ();
3640#endif 3892#endif
… …
3651 3903
3652 case XTerm_logfile: 3904 case XTerm_logfile:
3653 // TODO, when secure mode? 3905 // TODO, when secure mode?
3654 break; 3906 break;
3655 3907
3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3663 change_font (str);
3664 break;
3665
3666#ifndef NO_FRILLS
3667 case XTerm_locale:
3668 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3670 else
3671 {
3672 set_locale (str);
3673# ifdef USE_XIM
3674 im_cb ();
3675# endif
3676 }
3677 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR 3908#ifdef MENUBAR
3691 case XTerm_Menu: 3909 case URxvt_Menu:
3692 if (Options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3912 break;
3695#endif 3913#endif
3696#if 0 3914#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3701 { 3919 {
3702 scr_dump (fd); 3920 scr_dump (fd);
3703 close (fd); 3921 close (fd);
3704 } 3922 }
3705 } 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
3706 break; 3979 break;
3707#endif 3980#endif
3708 } 3981 }
3709} 3982}
3710/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3724{ 3997{
3725 int state; 3998 int state;
3726 3999
3727 if (mode == 's') 4000 if (mode == 's')
3728 { 4001 {
3729 SavedModes |= (PrivateModes & bit); 4002 SavedModes |= (priv_modes & bit);
3730 return -1; 4003 return -1;
3731 } 4004 }
3732 else 4005 else
3733 { 4006 {
3734 if (mode == 'r') 4007 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4008 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4009 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4010 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4011 PrivMode (state, bit);
3739 } 4012 }
3740 4013
3741 return state; 4014 return state;
3742} 4015}
… …
3760 { 3, PrivMode_132 }, 4033 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4034 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4040#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 4041 { menuBar_esc, PrivMode_menuBar },
3768#endif 4042#endif
4043 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 4045#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4046 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4047#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4048 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4049 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4050 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4051 // 45 margin bell NYI
3779 // 46 start logging 4052 // 46 start logging
… …
3819 } 4092 }
3820 4093
3821 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4095 switch (arg[i])
3823 { 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
3824 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4108 case 1049:
3825 if (Options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4110 if (mode == 0)
3827 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3828 else if (mode == 1) 4112 else if (mode == 1)
3829 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3830 break; 4114 break;
… …
3841 * within VT52 mode 4125 * within VT52 mode
3842 */ 4126 */
3843 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
3844 break; 4128 break;
3845 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4132 break;
3849 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
3850 if (state) 4134 if (!state)
3851 Options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
3852 else 4136 else
3853 Options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
3854 break; 4138 break;
3855 case 5: /* reverse video */ 4139 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
3857 break; 4141 break;
3858 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4146 scr_autowrap (state);
3863 break; 4147 break;
3864 /* 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 */
3865 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4151 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4152 break;
3869#ifdef menuBar_esc 4153#ifdef menuBar_esc
3870 case menuBar_esc: 4154 case menuBar_esc:
3871#ifdef MENUBAR 4155#ifdef MENUBAR
3872 map_menuBar (state); 4156 map_menuBar (state);
… …
3892 break; 4176 break;
3893 /* case 66: - application key pad */ 4177 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4178 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4179 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4180 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4181 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4182 break;
3899#if 0 4183#if 0
3900 case 1001: 4184 case 1001:
3901 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
3902#endif 4186#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4188 if (!state)
3905 Options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
3906 else 4190 else
3907 Options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
3908 break; 4192 break;
3909 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
3910 if (state) 4194 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
3912 else 4196 else
3913 Options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
3914 break; 4198 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4199 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4202 scr_erase_screen (2);
3919 scr_change_screen (state); 4203 scr_change_screen (state);
3920 break; 4204 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4205 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4206 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4207 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4208 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4209 scr_erase_screen (2);
3926 break; 4210 break;
3927 default: 4211 default:
3928 break; 4212 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4238 rendset = 0, rendstyle = ~RS_None;
3955 break; 4239 break;
3956 case 1: 4240 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4241 rendset = 1, rendstyle = RS_Bold;
3958 break; 4242 break;
3959 //case 2: // faint or second colour 4243 //case 2: // low intensity
4244 case 3:
4245 rendset = 1, rendstyle = RS_Italic;
4246 break;
3960 case 4: 4247 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4248 rendset = 1, rendstyle = RS_Uline;
3962 break; 4249 break;
3963 case 5: // slowly blinking 4250 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4251 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4263 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4264 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4265 //...
3979 //case 19: // ninth alt font 4266 //case 19: // ninth alt font
3980 //case 20: // gothic 4267 //case 20: // gothic
3981 case 21: // disable bold, faint 4268 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4269 rendset = 0, rendstyle = RS_Bold;
3983 break; 4270 break;
3984 case 22: 4271 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4272 rendset = 0, rendstyle = RS_Bold;
3986 break; 4273 break;
3987 //case 23: disable italic 4274 case 23: // disable italic
4275 rendset = 0, rendstyle = RS_Italic;
4276 break;
3988 case 24: 4277 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4278 rendset = 0, rendstyle = RS_Uline;
3990 break; 4279 break;
3991 case 25: 4280 case 25:
4281 rendset = 0, rendstyle = RS_Blink;
4282 break;
4283 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4284 rendset = 0, rendstyle = RS_Blink;
3993 break; 4285 break;
3994 case 27: 4286 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4287 rendset = 0, rendstyle = RS_RVid;
3996 break; 4288 break;
… …
4014 case 35: 4306 case 35:
4015 case 36: 4307 case 36:
4016 case 37: 4308 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4309 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4310 break;
4019#ifdef TTY_256COLOR 4311 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4312 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4313 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4314 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4315 i += 2;
4025 } 4316 }
4026 break; 4317 break;
4027#endif
4028 case 39: /* default fg */ 4318 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4319 scr_color (Color_fg, Color_fg);
4030 break; 4320 break;
4031 4321
4032 case 40: 4322 case 40:
… …
4037 case 45: 4327 case 45:
4038 case 46: 4328 case 46:
4039 case 47: 4329 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4330 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4331 break;
4042#ifdef TTY_256COLOR 4332 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4333 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4334 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4335 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4336 i += 2;
4048 } 4337 }
4049 break; 4338 break;
4050#endif
4051 case 49: /* default bg */ 4339 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
4053 break; 4341 break;
4054 4342
4055#ifndef NO_BRIGHTCOLOR 4343 //case 50: // not variable spacing
4344
4345#if ENABLE_FRILLS
4056 case 90: 4346 case 90:
4057 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
4058 case 92: 4348 case 92:
4059 case 93: 4349 case 93:
4060 case 94: 4350 case 94:
4061 case 95: 4351 case 95:
4062 case 96: 4352 case 96:
4063 case 97: 4353 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4354 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4355 break;
4067 case 100: 4356 case 100:
4068 case 101: /* set bright bg color */ 4357 case 101: /* set bright bg color */
4069 case 102: 4358 case 102:
4070 case 103: 4359 case 103:
4071 case 104: 4360 case 104:
4072 case 105: 4361 case 105:
4073 case 106: 4362 case 106:
4074 case 107: 4363 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4365 break;
4078#endif 4366#endif
4079
4080 } 4367 }
4081 } 4368 }
4082} 4369}
4083/*}}} */ 4370/*}}} */
4084 4371
… …
4088{ 4375{
4089 unicode_t ch, cmd = cmd_getc (); 4376 unicode_t ch, cmd = cmd_getc ();
4090 4377
4091 if (cmd == 'Q') 4378 if (cmd == 'Q')
4092 { /* query graphics */ 4379 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4380 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4381 return;
4095 } 4382 }
4096 /* swallow other graphics sequences until terminating ':' */ 4383 /* swallow other graphics sequences until terminating ':' */
4097 do 4384 do
4098 ch = cmd_getc (); 4385 ch = cmd_getc ();
… …
4108 */ 4395 */
4109void 4396void
4110rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4111{ 4398{
4112 va_list arg_ptr; 4399 va_list arg_ptr;
4113 unsigned char buf[256]; 4400 char buf[256];
4114 4401
4115 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4404 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4405 tt_write (buf, strlen (buf));
4119} 4406}
4120 4407
4121/* ---------------------------------------------------------------------- */ 4408/* ---------------------------------------------------------------------- */
4122/* 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,
4123 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4124 */ 4411 */
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413
4125void 4414void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4416{
4128 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));
4129 4420
4130 if (len) 4421 if ((unsigned int)written == len)
4422 return;
4423
4424 data += written;
4425 len -= written;
4131 { 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
4132 if (v_buflen == 0) 4444 if (v_buflen == 0)
4133 { 4445 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
4135
4136 if ((unsigned int)written == len)
4137 return;
4138
4139 data += written;
4140 len -= written;
4141 }
4142
4143
4144 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4145
4146 memcpy (v_buffer + v_buflen, data, len);
4147 v_buflen += len;
4148 }
4149
4150 for (;;)
4151 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4153
4154 if (written > 0)
4155 {
4156 v_buflen -= written;
4157
4158 if (v_buflen == 0)
4159 {
4160 free (v_buffer); 4446 free (v_buffer);
4161 v_buffer = 0; 4447 v_buffer = 0;
4162 v_buflen = 0; 4448 v_buflen = 0;
4163 4449
4164 pty_ev.set (EVENT_READ); 4450 pty_ev.set (EVENT_READ);
4165 return;
4166 }
4167
4168 memmove (v_buffer, v_buffer + written, v_buflen);
4169 }
4170 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4171 // original code just ignores this...
4172 destroy ();
4173 else
4174 {
4175 pty_ev.set (EVENT_READ | EVENT_WRITE);
4176 return; 4451 return;
4177 } 4452 }
4453
4454 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4455 }
4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4457 pty_ev.set (EVENT_READ);
4179} 4458}
4180 4459
4181/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
4182 4461

Diff Legend

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