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

Diff Legend

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