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.239 by root, Fri Jan 6 03:02:22 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 ();
… …
800 } 967 }
801#endif 968#endif
802 969
803 if (want_refresh) 970 if (want_refresh)
804 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
805 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
806 scrollbar_show (1); 1012 scrollbar_show (1);
807#ifdef USE_XIM 1013#ifdef USE_XIM
808 IMSendSpot (); 1014 IMSendSpot ();
809#endif 1015#endif
810 } 1016 }
811 1017
812 display->flush (); 1018 display->flush ();
813
814 flush_ev.stop ();
815} 1019}
816 1020
817void 1021void
818rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
819{ 1023{
… …
821 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
822 1026
823 display->flush (); 1027 display->flush ();
824 1028
825 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 1031}
828 1032
829void 1033void
830rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
831{ 1035{
… …
895{ 1099{
896 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1103 {
1104 if (view_start == nsaved ||
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0;
1107
900 refresh_type |= SMOOTH_REFRESH; 1108 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1; 1109 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1111 }
904} 1112}
905#endif 1113#endif
906 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
907bool 1133bool
908rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
909{ 1135{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1137
912 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
913 { 1139 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1141 n = 0;
916 } 1142 }
917 1143
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
921 1147
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1149
924 if (n > 0) 1150 if (r > 0)
925 { 1151 {
926 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
927 return true; 1153 return true;
928 } 1154 }
929 else if (n < 0 && errno != EAGAIN) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1163 {
1164 pty_ev.stop ();
1165
1166 if (!OPTION (Opt_hold))
930 destroy (); 1167 destroy ();
1168 }
931 1169
932 return false; 1170 return false;
933} 1171}
934 1172
935void 1173void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1174rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1175{
938 SET_R (this); 1176 SET_R (this);
939 SET_LOCALE (locale); 1177 SET_LOCALE (locale);
940 1178
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1179 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1180 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1181 while (pty_fill ())
946 if (cmd_parse ()) 1182 if (cmd_parse ())
947 break; 1183 break;
1184
1185 if (revents & EVENT_WRITE)
1186 pty_write ();
948} 1187}
949 1188
950void 1189void
951rxvt_term::pointer_unblank () 1190rxvt_term::pointer_unblank ()
952{ 1191{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1192 XDefineCursor (display->display, vt, TermWin_cursor);
954 recolour_cursor (); 1193 recolour_cursor ();
955 1194
956#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1196 hidden_pointer = 0;
958 1197
959 if (Options & Opt_pointerBlank) 1198 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1199 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1200#endif
962} 1201}
963 1202
964#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
965void 1204void
966rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
967{ 1206{
968 if (! (Options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
969 return; 1208 return;
970 1209
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
972 XFlush (display->display); 1211 XFlush (display->display);
973 1212
974 hidden_pointer = 1; 1213 hidden_pointer = 1;
975} 1214}
976 1215
… …
993 x = ev.x; 1232 x = ev.x;
994 y = ev.y; 1233 y = ev.y;
995 pixel_position (&x, &y); 1234 pixel_position (&x, &y);
996 1235
997 if (MEvent.button == AnyButton) 1236 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1237 button_number = 3;
1000 }
1001 else 1238 else
1002 { 1239 {
1003 button_number = MEvent.button - Button1; 1240 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1241 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1242 if (button_number >= 3)
1006 button_number += (64 - 3); 1243 button_number += (64 - 3);
1007 } 1244 }
1008 1245
1009 if (PrivateModes & PrivMode_MouseX10) 1246 if (priv_modes & PrivMode_MouseX10)
1010 { 1247 {
1011 /* 1248 /*
1012 * do not report ButtonRelease 1249 * do not report ButtonRelease
1013 * no state info allowed 1250 * no state info allowed
1014 */ 1251 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1266 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1267 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1268#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1269 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1270#endif
1034
1035 } 1271 }
1036 1272
1037#ifdef DEBUG_MOUSEREPORT 1273#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1274 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1275 if (key_state & 16)
1040 fputc ('C', stderr); 1276 fputc ('C', stderr);
1041 if (key_state & 4) 1277 if (key_state & 4)
1042 fputc ('S', stderr); 1278 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1282 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1283 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1284 button_number,
1049 x + 1, 1285 x + 1,
1050 y + 1); 1286 y + 1);
1051#else 1287#endif
1288
1052 tt_printf ("\033[M%c%c%c", 1289 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1290 (32 + button_number + key_state),
1054 (32 + x + 1), 1291 (32 + x + 1),
1055 (32 + y + 1)); 1292 (32 + y + 1));
1056#endif
1057} 1293}
1058 1294
1059#ifdef USING_W11LIB 1295#ifdef USING_W11LIB
1060void 1296void
1061rxvt_W11_process_x_event (XEvent *ev) 1297rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1304
1069/*{{{ process an X event */ 1305/*{{{ process an X event */
1070void 1306void
1071rxvt_term::x_cb (XEvent &ev) 1307rxvt_term::x_cb (XEvent &ev)
1072{ 1308{
1309 dDisp;
1310
1073 SET_R (this); 1311 SET_R (this);
1074 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
1075 1313
1076#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1316 {
1079 if (hidden_cursor) 1317 if (hidden_cursor)
1080 { 1318 {
1081 hidden_cursor = 0; 1319 hidden_cursor = 0;
1082 want_refresh = 1; 1320 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1324 }
1087#endif 1325#endif
1088 1326
1089#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1329 {
1092 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1333 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1336 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1337 pointer_blank ();
1100 } 1338 }
1101#endif 1339#endif
1102 1340
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1343 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 1344
1161 switch (ev.type) 1345 switch (ev.type)
1162 { 1346 {
1163 case KeyPress: 1347 case KeyPress:
1348#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1165 lookup_key (ev.xkey); 1351 lookup_key (ev.xkey);
1166 1352
1167 break; 1353 break;
1168 1354
1169 case KeyRelease: 1355 case KeyRelease:
1170 { 1356 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1358 KeySym ks;
1173 1359
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1361#endif
1176 1362
1177#ifndef NO_FRILLS 1363#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1364 // ISO 14755 support
1179 if (iso14755buf) 1365 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1366 if (iso14755buf & ISO_14755_52)
1181 { 1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1372 // iso14755 part 5.2 handling: release time
1183 // first: controls 1373 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1374 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1375 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1376 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1377 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1379 commit_iso14755 ();
1190 return; // case-break; 1380 return; // case-break;
1191 } 1381 }
1192 1382
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1384 if (i[0] == ks)
1195 { 1385 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1386 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1387 commit_iso14755 ();
1198 return; // case-break; 1388 return; // case-break;
1199 } 1389 }
1200 1390
1391 scr_bell ();
1392# endif
1201 iso14755buf = 0; 1393 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1394 break;
1204 } 1395 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1396 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1397 {
1398# if ENABLE_OVERLAY
1399 scr_overlay_off ();
1400# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1401 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1402 commit_iso14755 ();
1403#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1404 else if (iso14755buf & ISO_14755_STARTED)
1405 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1406 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1407
1408 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1409 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1410 }
1411# endif
1412 else
1413 iso14755buf = 0;
1211 } 1414 }
1212#endif 1415#endif
1213 1416
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1418 if (!(ev.xkey.state & ControlMask))
… …
1228 button_release (ev.xbutton); 1431 button_release (ev.xbutton);
1229 break; 1432 break;
1230 1433
1231 case ClientMessage: 1434 case ClientMessage:
1232 if (ev.xclient.format == 32 1435 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1437 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1439 destroy ();
1440#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev);
1445#endif
1446 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1235#ifdef OFFIX_DND 1456#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1457 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1459 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1460 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1461 || ev.xclient.data.l[0] == DndLink))
1241 { 1462 {
1242 /* Get Dnd data */ 1463 /* Get Dnd data */
1243 Atom ActualType; 1464 Atom ActualType;
1244 int ActualFormat; 1465 int ActualFormat;
1245 unsigned char *data; 1466 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1467 unsigned long Size, RemainingBytes;
1247 1468
1248 XGetWindowProperty (display->display, display->root, 1469 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1470 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1471 0L, 1000000L,
1251 False, AnyPropertyType, 1472 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1473 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1474 &Size, &RemainingBytes,
1254 &data); 1475 &data);
1255 XChangeProperty (display->display, display->root, 1476 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1477 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1480 }
1263#endif /* OFFIX_DND */ 1481#endif /* OFFIX_DND */
1264 break; 1482 break;
1265 1483
1266 case MappingNotify: 1484 case MappingNotify:
… …
1291 break; 1509 break;
1292 } 1510 }
1293 break; 1511 break;
1294 1512
1295 case FocusIn: 1513 case FocusIn:
1296 if (!TermWin.focus) 1514 focus_in ();
1515 break;
1516
1517 case FocusOut:
1518 focus_out ();
1519 break;
1520
1521 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0])
1297 { 1523 {
1298 TermWin.focus = 1; 1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1525 ;
1300#ifdef USE_XIM 1526
1301 if (Input_Context != NULL) 1527 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 { 1528 {
1311 PixColors = PixColorsFocused; 1529 seen_resize = 1;
1312 set_colorfgbg (); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1531 }
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 1532
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1534 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1535 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1536#endif
1372 } 1537 }
1373 break; 1538 break;
1374 1539
1375 case PropertyNotify: 1540 case PropertyNotify:
… …
1383 selection_clear (); 1548 selection_clear ();
1384 break; 1549 break;
1385 1550
1386 case SelectionNotify: 1551 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1552 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1554 break;
1391 1555
1392 case SelectionRequest: 1556 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1394 break; 1558 break;
1395 1559
1396 case UnmapNotify: 1560 case UnmapNotify:
1397 TermWin.mapped = 0; 1561 mapped = 0;
1398#ifdef TEXT_BLINK 1562#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1563 text_blink_ev.stop ();
1400#endif 1564#endif
1401 break; 1565 break;
1402 1566
1403 case MapNotify: 1567 case MapNotify:
1404 TermWin.mapped = 1; 1568 mapped = 1;
1405#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif 1571#endif
1408 break; 1572 break;
1409 1573
… …
1413 break; 1577 break;
1414#endif /* TRANSPARENT */ 1578#endif /* TRANSPARENT */
1415 1579
1416 case GraphicsExpose: 1580 case GraphicsExpose:
1417 case Expose: 1581 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1419 { 1583 {
1420 do 1584 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1585 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1586 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1588
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1590
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1430 1594
1431 scr_refresh (refresh_type); 1595 scr_refresh (refresh_type);
1432 } 1596 }
1433 else 1597 else
1434 { 1598 {
1435 XEvent unused_event; 1599 XEvent unused_event;
1436 1600
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1602 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1604 ;
1441 1605
1442 if (isScrollbarWindow (ev.xany.window)) 1606 if (isScrollbarWindow (ev.xany.window))
1443 { 1607 {
1444 scrollBar.setIdle (); 1608 scrollBar.setIdle ();
… …
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose (); 1613 menubar_expose ();
1450#endif 1614#endif
1451 1615
1452#ifdef TRANSPARENT 1616#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1617 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1618 XClearWindow (disp, ev.xany.window);
1455#endif 1619#endif
1456 } 1620 }
1457 break; 1621 break;
1458 1622
1459 case MotionNotify: 1623 case MotionNotify:
… …
1466 { 1630 {
1467 menubar_control (ev.xbutton); 1631 menubar_control (ev.xbutton);
1468 break; 1632 break;
1469 } 1633 }
1470#endif 1634#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1636 break;
1473 1637
1474 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1475 { 1639 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1641 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1643 ;
1480 1644
1481 XQueryPointer (display->display, TermWin.vt, 1645 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1648 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1649 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1651 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1652 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1653 {
1490#endif 1654#endif
1655#if ISO_14755
1656 // 5.4
1657 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1658 {
1659 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1660 break;
1661 }
1662#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1665
1493#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1669 {
1497 int dist; 1670 int dist;
1498 1671
1499 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1676 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1677
1505 /* save the event params so we can highlight 1678 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1679 * the selection in the pending-scroll loop
1507 */ 1680 */
1508 selection_save_x=ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1684
1513 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1515 { 1687 {
1516 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1518 } 1690 }
1519 else 1691 else
1520 { 1692 {
1521 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1694 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1695 }
1696
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1697 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1699 + 1;
1527 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1529 } 1702 }
1530 else 1703 else
1531 { 1704 {
1532 /* we are within the text window, so we 1705 /* we are within the text window, so we
1533 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1708 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1709 sel_scroll_ev.stop();
1537 } 1710 }
1538#endif 1711#endif
1539#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1540
1541 } 1713 }
1542#endif 1714#endif
1543
1544 } 1715 }
1545 } 1716 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1718 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1719 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1720 MotionNotify, &ev))
1721 ;
1722
1550 XQueryPointer (display->display, scrollBar.win, 1723 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1726 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1727 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1729 scrollbar_size ());
1557 scr_refresh (refresh_type); 1730 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1731 refresh_limit = 0;
… …
1560 } 1733 }
1561 break; 1734 break;
1562 } 1735 }
1563} 1736}
1564 1737
1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1805}
1806
1565#if TRANSPARENT 1807#if TRANSPARENT
1566void 1808void
1567rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1810{
1569 SET_R (this); 1811 SET_R (this);
… …
1574 case PropertyNotify: 1816 case PropertyNotify:
1575 /* 1817 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1818 * 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. 1819 * use the property to determine the pixmap. We use it later on.
1578 */ 1820 */
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]) 1821 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1823 return;
1584 1824
1585 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1586 case ReparentNotify: 1826 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1589 break; 1829 break;
1590 } 1830 }
1591} 1831}
1592#endif 1832#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1596{ 1836{
1597 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1598 1838
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1600 if (!bypass_keystate) 1841 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1843
1602 /* 1844 /*
1603 * VT window processing of button press 1845 * VT window processing of button press
1604 */ 1846 */
1605 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1606 { 1848 {
1849#if ISO_14755
1850 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 {
1853 iso14755_54 (ev.x, ev.y);
1854 return;
1855 }
1856#endif
1857
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1858 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1859
1608 if (reportmode) 1860 if (reportmode)
1609 { 1861 {
1610 /* mouse report from vt window */ 1862 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1863 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1864 MEvent.state = ev.state;
… …
1641 } 1893 }
1642 else 1894 else
1643 { 1895 {
1644 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1900 switch (ev.button)
1647 { 1901 {
1648 case Button1: 1902 case Button1:
1903 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */
1905#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask);
1907#else
1908 selection.rect = false;
1909#endif
1910
1649 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1913 {
1652 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1654 else 1916 else
1655 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1656 } 1918 }
1657 else 1919 else
1658 { 1920 {
1659 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1922 MEvent.clicks++;
1661 else 1923 else
1662 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1663 1925
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1927 }
1666 1928
1667 MEvent.button = Button1; 1929 MEvent.button = Button1;
1668 break; 1930 break;
1669 1931
1670 case Button3: 1932 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1673 else 1935 else
1674 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1937
1675 MEvent.button = Button3; 1938 MEvent.button = Button3;
1676 break; 1939 break;
1677 } 1940 }
1678 } 1941 }
1942
1679 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1680 return; 1944 return;
1681 } 1945 }
1682 1946
1683 /* 1947 /*
… …
1794 case Button3: 2058 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1796 { 2060 {
1797 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1800# else 2064# else
1801 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1802# endif 2066# endif
1803 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1806# else 2070# else
1807 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1808# endif 2072# endif
1809 else 2073 else
1810 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1811 } 2075 }
1812 else 2076 else
1813 { 2077 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2079 (nrow
1816 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2081 / scrollbar_size ()));
1818 } 2082 }
1819 2083
1820 break; 2084 break;
… …
1836{ 2100{
1837 int reportmode = 0; 2101 int reportmode = 0;
1838 2102
1839 csrO = 0; /* reset csr Offset */ 2103 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2104 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2105 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2106
1843 if (scrollbar_isUpDn ()) 2107 if (scrollbar_isUpDn ())
1844 { 2108 {
1845 scrollBar.setIdle (); 2109 scrollBar.setIdle ();
1846 scrollbar_show (0); 2110 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2112 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2113#endif
1850
1851 } 2114 }
2115
1852#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
1855#endif 2119#endif
2120
1856 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
1857 { 2122 {
2123#if ISO_14755
2124 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return;
2127#endif
1858 if (reportmode) 2128 if (reportmode)
1859 { 2129 {
1860 /* mouse report from vt window */ 2130 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2146 MEvent.button = AnyButton;
1877 mouse_report (ev); 2147 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2148#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2149 return;
1880 } 2150 }
2151
1881 /* 2152 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2153 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2154 * when overriding mouse reporting
1884 */ 2155 */
1885 if (PrivateModes & PrivMode_mouse_report 2156 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2157 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2158 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2159 selection_extend (ev.x, ev.y, 0);
1889 2160
1890 switch (ev.button) 2161 switch (ev.button)
… …
1905 2176
1906 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
1907 2178
1908 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
1909 i = 1; 2180 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2182 i = nrow - 1;
1912 else 2183 else
1913 i = 5; 2184 i = 5;
1914 2185
1915# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
1917 { 2188 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2190 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; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2192
1922 if (slip_wheel_ev.at < NOW) 2193 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2195
1925 slip_wheel_ev.start (); 2196 slip_wheel_ev.start ();
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2240 int i;
1970 2241
1971 Visual* visual = display->visual; 2242 Visual *visual = display->visual;
1972 2243
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2245
1975 /* for convenience */ 2246 /* for convenience */
1976 mask_r = visual->red_mask; 2247 mask_r = visual->red_mask;
… …
2197 Atom atype; 2468 Atom atype;
2198 unsigned char *prop = NULL; 2469 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2470 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2471 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2202 2474
2203 pchanged = 0; 2475 pchanged = 0;
2204 2476
2205 if (!(Options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
2207 2479
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
2210 2482
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2484
2213 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
2214 { 2486 {
2215 if (am_transparent) 2487 if (am_transparent)
2216 { 2488 {
2217 pchanged = 1; 2489 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
2220 } 2492 }
2221 2493
2222 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
2223 } 2495 }
2224 2496
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2497 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2498 XSync (disp, False);
2227 2499
2228 /* 2500 /*
2229 * Make the frame window set by the window manager have 2501 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2502 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2503 * windows for each client, so we have to take care about that.
2232 */ 2504 */
2233 i = (xa[XA_XROOTPMAPID] 2505 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2508 &nitems, &bytes_after, &prop) == Success);
2237 2509
2238 if (!i || prop == NULL) 2510 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2511 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
2243 2515
2244 if (!i || prop == NULL 2516 if (!i || prop == NULL
2245#if TINTING 2517#if TINTING
… …
2264 Window cr; 2536 Window cr;
2265 XImage *image; 2537 XImage *image;
2266 GC gc; 2538 GC gc;
2267 XGCValues gcvalue; 2539 XGCValues gcvalue;
2268 2540
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2545 nx = ny = 0;
2274 2546
… …
2284 nh += sy; 2556 nh += sy;
2285 ny = -sy; 2557 ny = -sy;
2286 sy = 0; 2558 sy = 0;
2287 } 2559 }
2288 2560
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2291 allowedxerror = -1; 2565 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2567
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2569 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2570 allowedxerror = 0;
2297 2571
2298 if (image == NULL) 2572 if (image == NULL)
2299 { 2573 {
2300 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2301 { 2575 {
2302 pchanged = 1; 2576 pchanged = 1;
2303 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2304 { 2578 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2580 pixmap = None;
2307 } 2581 }
2308 } 2582 }
2309 2583
2310 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2311 } 2585 }
2312 else 2586 else
2313 { 2587 {
2314 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2316 2590
2317#if TINTING 2591#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2593 {
2320 unsigned short rm, gm, bm; 2594 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2596
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2598
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2600 }
2327#endif 2601#endif
2328 2602
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2608 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2609 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2611 XClearWindow (disp, parent[0]);
2338 2612
2339 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2614 pchanged = 1;
2341 2615
2342 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2343 } 2617 }
2344 } 2618 }
2345 2619
2346 if (!am_pixmap_trans) 2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2347 { 2623 {
2348 unsigned int n; 2624 unsigned int n;
2349 /* 2625 /*
2350 * InheritPixmap transparency 2626 * InheritPixmap transparency
2351 */ 2627 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2629 {
2355 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2358 XFree (list); 2633 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2634
2361 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2362 { 2636 {
2363 if (oldp != None) 2637 if (oldp != None)
2364 pchanged = 1; 2638 pchanged = 1;
2365 2639
2366 break; 2640 break;
2367 } 2641 }
2368 2642
2369 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2370 pchanged = 1; 2644 pchanged = 1;
2371 } 2645 }
2372 2646
2373 n = 0; 2647 n = 0;
2374 2648
2375 if (pchanged) 2649 if (pchanged)
2376 { 2650 {
2377 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2378 { 2652 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2653 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) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2655 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2657 break;
2385 } 2658 }
2386 } 2659 }
2387 } 2660 }
2388 2661
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2663 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2666 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2396 } 2668 }
2397 else 2669 else
2398 { 2670 {
2399#if WAIT_FOR_WM 2671#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2672 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2674 sleep (1);
2403#endif 2675#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2406 { 2677 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2679 XClearWindow (disp, parent[n]);
2409 } 2680 }
2410 2681
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2683 am_transparent = 1;
2413 } 2684 }
2414 2685
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2687 parent[i] = None;
2417 } 2688 }
2418 2689
2419 // this is experimental
2420 if (scrollBar.win) 2690 if (scrollBar.win)
2421 { 2691 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2693 scrollBar.setIdle ();
2425 scrollbar_show (0); 2694 scrollbar_show (0);
2426 } 2695 }
2427 2696
2697 if (am_transparent)
2698 {
2699 want_refresh = want_full_refresh = 1;
2700 if (am_pixmap_trans)
2701 flush ();
2702 }
2703
2428 return pchanged; 2704 return pchanged;
2429} 2705}
2430#endif 2706#endif
2431 2707
2432/*}}} */ 2708/*}}} */
… …
2434bool 2710bool
2435rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2436{ 2712{
2437 bool flag = false; 2713 bool flag = false;
2438 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2440 2716
2441 for (;;) 2717 for (;;)
2442 { 2718 {
2443 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2444 { 2720 {
2445 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2722 ch = next_char ();
2447 }
2448 2723
2449 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2450 break; 2725 break;
2726 }
2451 2727
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2729 {
2730 if (!seen_input)
2731 {
2732 seen_input = 1;
2733 // many badly-written programs (e.g. jed) contain a race condition:
2734 // they first read the screensize and then install a SIGWINCH handler.
2735 // some window managers resize the window early, and these programs
2736 // then sometimes get the size wrong.
2737 // unfortunately other programs are even more buggy and dislike
2738 // being sent SIGWINCH, so only do it when we were in fact being
2739 // resized.
2740 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH);
2742 }
2743
2454 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2746 bool refreshnow = false;
2457 int nlines = 0; 2747 int nlines = 0;
2458 unicode_t *str = buf; 2748 unicode_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2459 2750
2460 for (;;) 2751 for (;;)
2461 { 2752 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2754 break;
2464 2755
2465 *str++ = ch; 2756 *str++ = ch;
2466 2757
2467 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2468 { 2759 {
2760 if (ch == C0_LF)
2469 nlines++; 2761 nlines++;
2762
2470 refresh_count++; 2763 refresh_count++;
2471 2764
2472 if (!(Options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2767 {
2475 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2476 ch = NOCHAR; 2770 ch = NOCHAR;
2477 break; 2771 break;
2478 } 2772 }
2479 2773
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2482 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2483 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2484 nlines = 0; 2780 nlines = 0;
2485 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2486 } 2783 }
2487 }
2488 2784
2489 if (str >= buf + UBUFSIZ) 2785 if (str >= eol)
2490 { 2786 {
2787 if (eol >= buf + UBUFSIZ)
2788 {
2491 ch = NOCHAR; 2789 ch = NOCHAR;
2492 break; 2790 break;
2791 }
2792 else
2793 eol = min (eol + ncol, buf + UBUFSIZ);
2794 }
2795
2493 } 2796 }
2494 2797
2495 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2799 ch = next_char ();
2497 } 2800 }
2498 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2499 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2500 2804
2501 /* 2805 /*
2502 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2503 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2810 */
2507 if (refreshnow) 2811 if (refreshnow)
2508 { 2812 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2814 refresh_limit++;
2511 else 2815 else
2512 { 2816 {
2513 flag = true; 2817 flag = true;
2514 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2515 } 2820 }
2516 } 2821 }
2517 2822
2518 } 2823 }
2519 else 2824 else
… …
2550rxvt_term::next_char () 2855rxvt_term::next_char ()
2551{ 2856{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2858 {
2554 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2557 2862
2558 wchar_t wc; 2863 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2865
2561 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2562 { 2867 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2568 if (len == (size_t)-1) 2873 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2875
2571 // assume wchar == unicode 2876 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2877 cmdbuf_ptr += len;
2573 return wc; 2878 return wc & UNICODE_MASK;
2574 } 2879 }
2575 2880
2576 return NOCHAR; 2881 return NOCHAR;
2577} 2882}
2578 2883
… …
2703 case C0_ESC: 3008 case C0_ESC:
2704 process_escape_seq (); 3009 process_escape_seq ();
2705 break; 3010 break;
2706 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 3014 else
2711 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 3016 break;
2714 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2715 scr_bell (); 3018 scr_bell ();
2716 break; 3019 break;
2717 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
2816void 3119void
2817rxvt_term::process_escape_seq () 3120rxvt_term::process_escape_seq ()
2818{ 3121{
2819 unicode_t ch = cmd_getc (); 3122 unicode_t ch = cmd_getc ();
2820 3123
2821 if (PrivateModes & PrivMode_vt52) 3124 if (priv_modes & PrivMode_vt52)
2822 { 3125 {
2823 process_escape_vt52 (ch); 3126 process_escape_vt52 (ch);
2824 return; 3127 return;
2825 } 3128 }
2826 3129
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3144 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3145 break;
2843 case '+': 3146 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3147 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3148 break;
2846#ifndef NO_FRILLS 3149#if ENABLE_FRILLS
2847 case '6': 3150 case '6':
2848 scr_backindex (); 3151 scr_backindex ();
2849 break; 3152 break;
2850#endif 3153#endif
2851 case '7': 3154 case '7':
2852 scr_cursor (SAVE); 3155 scr_cursor (SAVE);
2853 break; 3156 break;
2854 case '8': 3157 case '8':
2855 scr_cursor (RESTORE); 3158 scr_cursor (RESTORE);
2856 break; 3159 break;
2857#ifndef NO_FRILLS 3160#if ENABLE_FRILLS
2858 case '9': 3161 case '9':
2859 scr_forwardindex (); 3162 scr_forwardindex ();
2860 break; 3163 break;
2861#endif 3164#endif
2862 case '=': 3165 case '=':
… …
2905 process_dcs_seq (); 3208 process_dcs_seq ();
2906 break; 3209 break;
2907 3210
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
2913 3215
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3218 process_csi_seq ();
… …
3041 { 3343 {
3042 switch (priv) 3344 switch (priv)
3043 { 3345 {
3044 case '>': 3346 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3347 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3349 break;
3048 case '?': 3350 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3352 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3353 break;
… …
3156 3458
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3464 break;
3163 3465
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3468 break;
3168 3469
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3171 break; 3472 break;
… …
3178 break; 3479 break;
3179 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
3180 scr_report_position (); 3481 scr_report_position ();
3181 break; 3482 break;
3182 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3486 break;
3186 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3489 break;
3189 } 3490 }
… …
3225 break; 3526 break;
3226 3527
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3528 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3529 if (arg[0] == 4)
3229 scr_insert_mode (0); 3530 scr_insert_mode (0);
3531 else if (arg[0] == 20)
3532 priv_modes &= ~PrivMode_LFNL;
3230 break; 3533 break;
3231 3534
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3535 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3536 if (arg[0] == 4)
3234 scr_insert_mode (1); 3537 scr_insert_mode (1);
3538 else if (arg[0] == 20)
3539 priv_modes |= PrivMode_LFNL;
3235 break; 3540 break;
3236 3541
3237 /* 3542 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3543 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3544 */
… …
3251 break; 3556 break;
3252 case CSI_75: 3557 case CSI_75:
3253 scr_cursor (RESTORE); 3558 scr_cursor (RESTORE);
3254 break; 3559 break;
3255 3560
3256#ifndef NO_FRILLS 3561#if ENABLE_FRILLS
3257 case CSI_74: 3562 case CSI_74:
3258 process_window_ops (arg, nargs); 3563 process_window_ops (arg, nargs);
3259 break; 3564 break;
3260#endif 3565#endif
3261 3566
… …
3268 break; 3573 break;
3269 } 3574 }
3270} 3575}
3271/*}}} */ 3576/*}}} */
3272 3577
3273#ifndef NO_FRILLS 3578#if ENABLE_FRILLS
3274/* ARGSUSED */ 3579/* ARGSUSED */
3275void 3580void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3581rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3582{
3278 int x, y; 3583 int x, y;
3279 XWindowAttributes wattr; 3584 XWindowAttributes wattr;
3280 Window wdummy; 3585 Window wdummy;
3586 dDisp;
3281 3587
3282 if (nargs == 0) 3588 if (nargs == 0)
3283 return; 3589 return;
3284 3590
3285 switch (args[0]) 3591 switch (args[0])
3286 { 3592 {
3287 /* 3593 /*
3288 * commands 3594 * commands
3289 */ 3595 */
3290 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3292 break; 3598 break;
3293 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3600 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3601 break;
3297 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3604 break;
3300 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3607 break;
3303 case 5: /* raise window */ 3608 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3305 break; 3610 break;
3306 case 6: /* lower window */ 3611 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3308 break; 3613 break;
3309 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3310 scr_touch (true); 3615 scr_touch (true);
3311 break; 3616 break;
3312 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3315 break; 3620 break;
3316 3621
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3623 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3322 break; 3627 break;
3323 3628
3324 3629
3325 /* 3630 /*
3326 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3327 */ 3632 */
3328 case 11: /* report window state */ 3633 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3636 break;
3332 case 13: /* report window position */ 3637 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3643 break;
3339 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3647 break;
3343 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3650 break;
3346 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3653 break;
3349 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3350 { 3655 {
3351 char *s; 3656 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3659 XFree (s);
3355 } 3660 }
3356 break; 3661 break;
3357 case 21: /* report window title */ 3662 case 21: /* report window title */
3358 { 3663 {
3359 char *s; 3664 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3667 XFree (s);
3363 } 3668 }
3364 break; 3669 break;
3365 } 3670 }
3366} 3671}
… …
3369/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3370/* 3675/*
3371 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3373 */ 3678 */
3374unsigned char * 3679char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3681{
3377 unicode_t prev = 0, ch; 3682 unicode_t ch;
3683 bool seen_esc = false;
3378 unsigned int n = 0; 3684 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3685 wchar_t string[STRING_MAX];
3381 3686
3382 while ((ch = cmd_getc ()) != NOCHAR) 3687 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3688 {
3384 if (prev == C0_ESC) 3689 if (seen_esc)
3385 { 3690 {
3386 if (ch == 0x5c) /* 7bit ST */ 3691 if (ch == 0x5c) /* 7bit ST */
3387 break; 3692 break;
3388 else 3693 else
3389 return NULL; 3694 return NULL;
3390 } 3695 }
3696 else if (ch == C0_ESC)
3697 {
3698 seen_esc = true;
3699 continue;
3700 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3701 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3702 break;
3393 else if (ch < 0x20) 3703 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3395 3705
3396 if (n >= sizeof (string) - 1) 3706 seen_esc = false;
3707
3708 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3709 // stop at some sane length
3398 return NULL; 3710 return NULL;
3399 3711
3400 if (ch == C0_SYN) 3712 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3713 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3714 else
3406 string[n++] = prev = ch; 3715 string[n++] = ch;
3407 } 3716 }
3408 3717
3409 string[n++] = '\0'; 3718 string[n++] = '\0';
3410 3719
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3721
3416 return s; 3722 return rxvt_wcstombs (string);
3417} 3723}
3418 3724
3419/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3420/* 3726/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3728 */
3423void 3729void
3424rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3425{ 3731{
3426 unsigned char *s; 3732 char *s;
3427 unicode_t eh; 3733 unicode_t eh;
3428 3734
3429 /* 3735 /*
3430 * Not handled yet 3736 * Not handled yet
3431 */ 3737 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3452 3758
3453 if (ch == ';') 3759 if (ch == ';')
3454 { 3760 {
3455 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3456 3762
3457 if (s) 3763 if (s)
3458 { 3764 {
3459 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3460 free (s); 3766 free (s);
3461 } 3767 }
3462 } 3768 }
3463} 3769}
3464 3770
3465void 3771void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3773{
3468 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3469 { 3775 {
3470 unsigned short r, g, b; 3776 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3779 }
3474 else 3780 else
3475 set_window_color (color, str); 3781 set_window_color (color, str);
3476} 3782}
3477 3783
3478/* 3784/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * 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 */ 3786 */
3503void 3787void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3789{
3506 int changed = 0; 3790 int changed = 0;
3507 int color; 3791 int color;
3508 char *buf, *name; 3792 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3794 int saveop = op;
3795 dDisp;
3510 3796
3511 assert (str != NULL); 3797 assert (str != NULL);
3512 switch (op) 3798 switch (op)
3513 { 3799 {
3514 case XTerm_name: 3800 case XTerm_name:
… …
3521 set_title (str); 3807 set_title (str);
3522 break; 3808 break;
3523 case XTerm_property: 3809 case XTerm_property:
3524 if (str[0] == '?') 3810 if (str[0] == '?')
3525 { 3811 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3812 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3813 Atom actual_type;
3528 int actual_format; 3814 int actual_format;
3529 unsigned long nitems; 3815 unsigned long nitems;
3530 unsigned long bytes_after; 3816 unsigned long bytes_after;
3531 unsigned char *value = 0; 3817 unsigned char *value = 0;
3532 const char *str = ""; 3818 const char *str = "";
3533 3819
3534 if (prop 3820 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3825 && actual_type != None
3540 && actual_format == 8) 3826 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3835 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3836
3551 if (eq) 3837 if (eq)
3552 { 3838 {
3553 *eq = 0; 3839 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3840 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 } 3841 }
3559 else 3842 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3844 display->atom (str));
3562 } 3845 }
3563 break; 3846 break;
3564 3847
3565 case XTerm_Color: 3848 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3849 for (buf = (char *)str; buf && *buf;)
3567 { 3850 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3851 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3852 break;
3570 3853
3571 *name++ = '\0'; 3854 *name++ = '\0';
3572 color = atoi (buf); 3855 color = atoi (buf);
3573 3856
3574 if (color < 0 || color >= TOTAL_COLORS) 3857 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3858 break;
3576 3859
3577 if ((buf = STRCHR (name, ';')) != NULL) 3860 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3861 *buf++ = '\0';
3579 3862
3580 if (name[0] == '?' && !name[1]) 3863 if (name[0] == '?' && !name[1])
3581 { 3864 {
3582 unsigned short r, g, b; 3865 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3866 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); 3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3868 }
3586 else 3869 else
3587 set_window_color (color + minCOLOR, name); 3870 set_window_color (color + minCOLOR, name);
3588 } 3871 }
… …
3611 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3896 break;
3614 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3899 break;
3900 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break;
3903#endif
3904#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3907 check_our_parents ();
3908 if (am_transparent)
3909 want_full_refresh = want_refresh = 1;
3616 break; 3910 break;
3617#endif 3911#endif
3618 3912
3619 case XTerm_Pixmap: 3913 case XTerm_Pixmap:
3620 if (*str != ';') 3914 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3917 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3918 set_bgPixmap (str); /* change pixmap */
3625#endif 3919#endif
3626 scr_touch (true); 3920 scr_touch (true);
3627 } 3921 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3922 while ((str = strchr (str, ';')) != NULL)
3629 { 3923 {
3630 str++; 3924 str++;
3631#if XPM_BACKGROUND 3925#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3926 changed += scale_pixmap (str);
3633#endif 3927#endif
3634
3635 } 3928 }
3929
3636 if (changed) 3930 if (changed)
3637 { 3931 {
3638#ifdef XPM_BACKGROUND 3932#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3933 resize_pixmap ();
3640#endif 3934#endif
… …
3651 3945
3652 case XTerm_logfile: 3946 case XTerm_logfile:
3653 // TODO, when secure mode? 3947 // TODO, when secure mode?
3654 break; 3948 break;
3655 3949
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 3950#ifdef MENUBAR
3691 case XTerm_Menu: 3951 case URxvt_Menu:
3692 if (Options & Opt_insecure) 3952 if (OPTION (Opt_insecure))
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3954 break;
3695#endif 3955#endif
3696#if 0 3956#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3957 case XTerm_dumpscreen: /* no error notices */
… …
3701 { 3961 {
3702 scr_dump (fd); 3962 scr_dump (fd);
3703 close (fd); 3963 close (fd);
3704 } 3964 }
3705 } 3965 }
3966 break;
3967#endif
3968 case XTerm_font:
3969 op = URxvt_font;
3970 case URxvt_font:
3971#if ENABLE_STYLES
3972 case URxvt_boldFont:
3973 case URxvt_italicFont:
3974 case URxvt_boldItalicFont:
3975#endif
3976 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3979 ? fontset[op - URxvt_font]->fontdesc : "",
3980 resp);
3981 else
3982 {
3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
3984
3985 res = strdup (str);
3986 allocated.push_back ((void *)res);
3987 set_fonts ();
3988 }
3989 break;
3990
3991#if ENABLE_FRILLS
3992 case URxvt_locale:
3993 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3995 else
3996 {
3997 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8);
3999 init_xlocale ();
4000 }
4001 break;
4002
4003 case URxvt_view_up:
4004 case URxvt_view_down:
4005 {
4006 int lines = atoi (str);
4007
4008 if (lines)
4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
4010 else
4011 scr_erase_savelines ();
4012 }
4013
4014 break;
4015#endif
4016
4017#if ENABLE_PERL
4018 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4020 ; // no responses yet
3706 break; 4021 break;
3707#endif 4022#endif
3708 } 4023 }
3709} 4024}
3710/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
3724{ 4039{
3725 int state; 4040 int state;
3726 4041
3727 if (mode == 's') 4042 if (mode == 's')
3728 { 4043 {
3729 SavedModes |= (PrivateModes & bit); 4044 SavedModes |= (priv_modes & bit);
3730 return -1; 4045 return -1;
3731 } 4046 }
3732 else 4047 else
3733 { 4048 {
3734 if (mode == 'r') 4049 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4050 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4051 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4052 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4053 PrivMode (state, bit);
3739 } 4054 }
3740 4055
3741 return state; 4056 return state;
3742} 4057}
… …
3760 { 3, PrivMode_132 }, 4075 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4076 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4077 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4078 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4079 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4081 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4082#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 4083 { menuBar_esc, PrivMode_menuBar },
3768#endif 4084#endif
4085 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 4087#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4088 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4089#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4090 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4091 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4092 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4093 // 45 margin bell NYI
3779 // 46 start logging 4094 // 46 start logging
… …
3819 } 4134 }
3820 4135
3821 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4137 switch (arg[i])
3823 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
3824 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4150 case 1049:
3825 if (Options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4152 if (mode == 0)
3827 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
3828 else if (mode == 1) 4154 else if (mode == 1)
3829 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
3830 break; 4156 break;
… …
3841 * within VT52 mode 4167 * within VT52 mode
3842 */ 4168 */
3843 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
3844 break; 4170 break;
3845 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4174 break;
3849 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
3850 if (state) 4176 if (!state)
3851 Options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
3852 else 4178 else
3853 Options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
3854 break; 4180 break;
3855 case 5: /* reverse video */ 4181 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
3857 break; 4183 break;
3858 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4188 scr_autowrap (state);
3863 break; 4189 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4194 break;
3869#ifdef menuBar_esc 4195#ifdef menuBar_esc
3870 case menuBar_esc: 4196 case menuBar_esc:
3871#ifdef MENUBAR 4197#ifdef MENUBAR
3872 map_menuBar (state); 4198 map_menuBar (state);
… …
3892 break; 4218 break;
3893 /* case 66: - application key pad */ 4219 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4220 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4221 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4222 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4223 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4224 break;
3899#if 0 4225#if 0
3900 case 1001: 4226 case 1001:
3901 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
3902#endif 4228#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4230 if (!state)
3905 Options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
3906 else 4232 else
3907 Options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
3908 break; 4234 break;
3909 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
3910 if (state) 4236 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
3912 else 4238 else
3913 Options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
3914 break; 4240 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4244 scr_erase_screen (2);
3919 scr_change_screen (state); 4245 scr_change_screen (state);
3920 break; 4246 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4248 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4251 scr_erase_screen (2);
3926 break; 4252 break;
3927 default: 4253 default:
3928 break; 4254 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4280 rendset = 0, rendstyle = ~RS_None;
3955 break; 4281 break;
3956 case 1: 4282 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4283 rendset = 1, rendstyle = RS_Bold;
3958 break; 4284 break;
3959 //case 2: // faint or second colour 4285 //case 2: // low intensity
4286 case 3:
4287 rendset = 1, rendstyle = RS_Italic;
4288 break;
3960 case 4: 4289 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4290 rendset = 1, rendstyle = RS_Uline;
3962 break; 4291 break;
3963 case 5: // slowly blinking 4292 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4293 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4305 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4306 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4307 //...
3979 //case 19: // ninth alt font 4308 //case 19: // ninth alt font
3980 //case 20: // gothic 4309 //case 20: // gothic
3981 case 21: // disable bold, faint 4310 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4311 rendset = 0, rendstyle = RS_Bold;
3983 break; 4312 break;
3984 case 22: 4313 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4314 rendset = 0, rendstyle = RS_Bold;
3986 break; 4315 break;
3987 //case 23: disable italic 4316 case 23: // disable italic
4317 rendset = 0, rendstyle = RS_Italic;
4318 break;
3988 case 24: 4319 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4320 rendset = 0, rendstyle = RS_Uline;
3990 break; 4321 break;
3991 case 25: 4322 case 25:
4323 rendset = 0, rendstyle = RS_Blink;
4324 break;
4325 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4326 rendset = 0, rendstyle = RS_Blink;
3993 break; 4327 break;
3994 case 27: 4328 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4329 rendset = 0, rendstyle = RS_RVid;
3996 break; 4330 break;
… …
4014 case 35: 4348 case 35:
4015 case 36: 4349 case 36:
4016 case 37: 4350 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4352 break;
4019#ifdef TTY_256COLOR 4353 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4354 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4355 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4356 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4357 i += 2;
4025 } 4358 }
4026 break; 4359 break;
4027#endif
4028 case 39: /* default fg */ 4360 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4361 scr_color (Color_fg, Color_fg);
4030 break; 4362 break;
4031 4363
4032 case 40: 4364 case 40:
… …
4037 case 45: 4369 case 45:
4038 case 46: 4370 case 46:
4039 case 47: 4371 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4373 break;
4042#ifdef TTY_256COLOR 4374 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4375 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4376 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4377 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4378 i += 2;
4048 } 4379 }
4049 break; 4380 break;
4050#endif
4051 case 49: /* default bg */ 4381 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4053 break; 4383 break;
4054 4384
4055#ifndef NO_BRIGHTCOLOR 4385 //case 50: // not variable spacing
4386
4387#if ENABLE_FRILLS
4056 case 90: 4388 case 90:
4057 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4058 case 92: 4390 case 92:
4059 case 93: 4391 case 93:
4060 case 94: 4392 case 94:
4061 case 95: 4393 case 95:
4062 case 96: 4394 case 96:
4063 case 97: 4395 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4396 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4397 break;
4067 case 100: 4398 case 100:
4068 case 101: /* set bright bg color */ 4399 case 101: /* set bright bg color */
4069 case 102: 4400 case 102:
4070 case 103: 4401 case 103:
4071 case 104: 4402 case 104:
4072 case 105: 4403 case 105:
4073 case 106: 4404 case 106:
4074 case 107: 4405 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4407 break;
4078#endif 4408#endif
4079
4080 } 4409 }
4081 } 4410 }
4082} 4411}
4083/*}}} */ 4412/*}}} */
4084 4413
… …
4088{ 4417{
4089 unicode_t ch, cmd = cmd_getc (); 4418 unicode_t ch, cmd = cmd_getc ();
4090 4419
4091 if (cmd == 'Q') 4420 if (cmd == 'Q')
4092 { /* query graphics */ 4421 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4422 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4423 return;
4095 } 4424 }
4096 /* swallow other graphics sequences until terminating ':' */ 4425 /* swallow other graphics sequences until terminating ':' */
4097 do 4426 do
4098 ch = cmd_getc (); 4427 ch = cmd_getc ();
… …
4108 */ 4437 */
4109void 4438void
4110rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4111{ 4440{
4112 va_list arg_ptr; 4441 va_list arg_ptr;
4113 unsigned char buf[256]; 4442 char buf[256];
4114 4443
4115 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4446 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4447 tt_write (buf, strlen (buf));
4119} 4448}
4120 4449
4121/* ---------------------------------------------------------------------- */ 4450/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4451/* 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. 4452 * or generated by us in response to a query ESC sequence.
4124 */ 4453 */
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455
4125void 4456void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4458{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4459 if (pty.pty < 0)
4460 return;
4129 4461
4130 if (len) 4462 if (v_buflen == 0)
4463 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4465
4466 if ((unsigned int)written == len)
4467 return;
4468
4469 data += written;
4470 len -= written;
4131 { 4471 }
4472
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474
4475 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len;
4477
4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479}
4480
4481void rxvt_term::pty_write ()
4482{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484
4485 if (written > 0)
4486 {
4487 v_buflen -= written;
4488
4132 if (v_buflen == 0) 4489 if (v_buflen == 0)
4133 { 4490 {
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); 4491 free (v_buffer);
4161 v_buffer = 0; 4492 v_buffer = 0;
4162 v_buflen = 0; 4493 v_buflen = 0;
4163 4494
4164 pty_ev.set (EVENT_READ); 4495 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; 4496 return;
4177 } 4497 }
4498
4499 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4500 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ);
4179} 4503}
4180 4504
4181/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
4182 4506

Diff Legend

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