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

Diff Legend

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