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.290 by root, Sat Jan 28 20:41:38 2006 UTC

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

Diff Legend

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