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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.378 by root, Fri Dec 14 02:27:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2007 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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61 67
62#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
63 69
64#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
89 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
91 97
92 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
113 XK_Escape, 0x238b, 118 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 119 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 120 XK_Print, 0x2399,
116 121
117 XK_space, 0x2423, 122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 130 XK_KP_Space, 0x2422,
131#endif
119 0, 132 0,
120}; 133};
121 134
122void 135void
123rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
124{ 137{
125 x = Pixel2Col (x); 138 x = Pixel2Col (x);
126 y = Pixel2Row (y); 139 y = Pixel2Row (y);
127 140
128 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 143 return;
131 144
132 for (;;) 145 for (;;)
133 { 146 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
135 150
136 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
137 { 152 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 153 iso14755_51 (l.t[x], l.r[x], x, y);
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
141 break; 155 break;
142 } 156 }
143 157
144 x--; 158 x--;
145 } 159 }
146
147} 160}
148#endif
149 161
150#if ENABLE_OVERLAY
151void 162void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 164{
154 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 167 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 168 int len;
158 169
170 fname = rxvt_utf8towcs (f->name);
171
159#if ENABLE_COMBINING 172# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
161 { 174 {
162 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
165 } 178 }
166 else 179 else
167#endif 180# endif
168 { 181 {
169 ch2 = ch; 182 ch2 = ch;
170 183
171 alloc = 0; 184 alloc = 0;
172 chr = &ch2; 185 chr = &ch2;
173 len = 1; 186 len = 1;
174 } 187 }
175 188
176 int width = strlen (f->name); 189 char attr[80]; // plenty
177 190
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
179 213
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 215
182 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
183 { 217 {
… …
186 ch = *chr++; 220 ch = *chr++;
187 221
188 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
191#if !UNICODE3 225# if !UNICODE3
192 if (ch >= 0x10000) 226 if (ch >= 0x10000)
193 ch = 0xfffd; 227 ch = 0xfffd;
194#endif 228# endif
195 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
196 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
197 } 233 }
198 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 241 scr_overlay_set (0, len + 1, fname);
200 242
243 free (fname);
244
201#if ENABLE_COMBINING 245# if ENABLE_COMBINING
202 if (alloc) 246 if (alloc)
203 delete [] alloc; 247 delete [] alloc;
204#endif 248# endif
205} 249}
206#endif 250#endif
207 251
208void 252void
209rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
226 mb[0] = ch[0]; 270 mb[0] = ch[0];
227 len = 1; 271 len = 1;
228 } 272 }
229 273
230 if (len > 0) 274 if (len > 0)
231 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
232 else 276 else
233 scr_bell (); 277 scr_bell ();
234 } 278 }
235 279
236 iso14755buf = 0; 280 iso14755buf = 0;
… …
253 297
254 return -1; 298 return -1;
255} 299}
256#endif 300#endif
257 301
258/*{{{ Convert the keypress event into a string */
259void 302void
260rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
261{ 304{
262 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
263 unsigned int newlen; 306 unsigned int newlen;
264 KeySym keysym; 307 KeySym keysym;
265#ifdef DEBUG_CMD
266 static int debug_key = 1; /* accessible by a debugger only */
267#endif
268 int valid_keysym; 308 int valid_keysym;
269 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
270 315
271 /* 316 /*
272 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
274 * 319 *
275 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
276 */ 321 */
277 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
280 325
281 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
282 { 327 {
283 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
292 Status status_return; 337 Status status_return;
293 338
294#if 0 339#if 0
295#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
296 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
298 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
299 else 344 else
300#endif 345#endif
301#endif 346#endif
302 { 347 {
… …
304 349
305 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
309 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
312 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 360 SET_LOCALE (locale);
314 361
315 if (status_return == XLookupChars 362 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
337 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
338 } 385 }
339 else 386 else
340#endif 387#endif
341 { 388 {
342 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
343 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
344 } 391 }
345 392
346 if (valid_keysym) 393 if (valid_keysym)
347 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
348 if (TermWin.saveLines) 400 if (saveLines)
349 { 401 {
350#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 403 if (!ctrl && !meta)
352#else 404#else
353 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
354#endif 406#endif
355 { 407 {
356 int lnsppg; 408 int lnsppg;
357 409
358#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 412#else
361 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
362#endif 414#endif
363 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
364 { 416 {
365 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
366 return; 418 return;
… …
394 scr_move_to (0, 1); 446 scr_move_to (0, 1);
395 return; 447 return;
396 } 448 }
397 else if (keysym == XK_End) 449 else if (keysym == XK_End)
398 { 450 {
399 scr_move_to (1, 0); 451 scr_move_to (1, 1);
400 return; 452 return;
401 } 453 }
402 } 454 }
403#endif 455#endif
404 } 456 }
… …
415 { 467 {
416 switch (keysym) 468 switch (keysym)
417 { 469 {
418 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
421 return; 473 return;
422#if TODO // TODO 474#if TODO
423 /* rxvt extras */ 475 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 477 change_font (FONT_UP);
426 return; 478 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
444 { 496 {
445 commit_iso14755 (); 497 commit_iso14755 ();
446 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
447# if ISO_14755 499# if ISO_14755
448 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
449# endif 509# endif
450 return; 510 return;
451 } 511 }
452 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
453 { 513 {
… …
458# endif 518# endif
459 return; 519 return;
460 } 520 }
461 else 521 else
462 { 522 {
463# if ENABLE_OVERLAY 523# if ISO_14755
464 scr_overlay_off (); 524 scr_overlay_off ();
465# endif 525# endif
466 iso14755buf = 0; 526 iso14755buf = 0;
467 } 527 }
468 } 528 }
469 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
470 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
471 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
472 { 532 {
473 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
474# if ENABLE_OVERLAY 534# if ISO_14755
475 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
476 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
477# endif 537# endif
478 } 538 }
479#endif 539#endif
480 540
481#ifdef PRINTPIPE 541#ifdef PRINTPIPE
482 if (keysym == XK_Print) 542 if (keysym == XK_Print)
483 { 543 {
484 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
485 return; 545 return;
486 } 546 }
487#endif 547#endif
488 548
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 550 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 { 551 {
494 unsigned int l; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
495 const unsigned char *kbuf0; 553 newlen = 1;
496 554#ifdef XK_KP_Home
497 kbuf0 = (Keysym_map[keysym & 0xFF]); 555 static const KeySym keypadtrans[] = {
498 l = (unsigned int)*kbuf0++; 556 XK_KP_7, // XK_KP_Home
499 557 XK_KP_4, // XK_KP_Left
500 /* escape prefix */ 558 XK_KP_8, // XK_KP_Up
501 if (meta 559 XK_KP_6, // XK_KP_Right
502# ifdef META8_OPTION 560 XK_KP_2, // XK_KP_Down
503 && meta_char == C0_ESC 561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
504# endif 567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
505 ) 570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
506 { 573 {
507 const unsigned char ch = C0_ESC; 574 unsigned int index = keysym - XK_KP_Home;
508 tt_write (&ch, 1); 575 keysym = kp ? keypadtrans[index] : XK_Home + index;
509 } 576 }
510 577 else if (keysym == XK_KP_Insert)
511 tt_write (kbuf0, l); 578 keysym = kp ? XK_KP_0 : XK_Insert;
512 return; 579#ifndef NO_DELETE_KEY
513 } 580 else if (keysym == XK_KP_Delete)
514 else 581 keysym = kp ? XK_KP_Decimal : XK_Delete;
515#endif 582#endif
516 { 583#endif
517 newlen = 1;
518 switch (keysym) 584 switch (keysym)
519 { 585 {
520#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
521 case XK_BackSpace: 587 case XK_BackSpace:
522 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
524 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
525 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
526 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
527 } 593 }
528 else 594 else
529 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
530 break; 596 break;
531#endif 597#endif
532#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
533 case XK_Delete: 599 case XK_Delete:
534 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
535 break; 601 break;
536#endif 602#endif
537 case XK_Tab: 603 case XK_Tab:
538 if (shft) 604 if (shft)
539 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
549#endif 615#endif
550 newlen = 0; 616 newlen = 0;
551 } 617 }
552 break; 618 break;
553 619
554#ifdef XK_KP_Left
555 case XK_KP_Up: /* \033Ox or standard */
556 case XK_KP_Down: /* \033Or or standard */
557 case XK_KP_Right: /* \033Ov or standard */
558 case XK_KP_Left: /* \033Ot or standard */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033OZ");
562 kbuf[2] = "txvr"[keysym - XK_KP_Left];
563 break;
564 }
565 else
566 /* translate to std. cursor key */
567 keysym = XK_Left + (keysym - XK_KP_Left);
568 /* FALLTHROUGH */
569#endif
570 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
571 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
572 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
573 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
574 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
584 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
585 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
586 break; 636 break;
587 637
588#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
589# ifdef XK_KP_Prior
590 case XK_KP_Prior:
591 /* allow shift to override */
592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
593 {
594 strcpy (kbuf, "\033Oy");
595 break;
596 }
597 /* FALLTHROUGH */
598# endif
599 case XK_Prior: 639 case XK_Prior:
600 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
601 break; 641 break;
602# ifdef XK_KP_Next
603 case XK_KP_Next:
604 /* allow shift to override */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033Os");
608 break;
609 }
610 /* FALLTHROUGH */
611# endif
612 case XK_Next: 642 case XK_Next:
613 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
614 break; 644 break;
615#endif 645#endif
616 case XK_KP_Enter: 646 case XK_KP_Enter:
617 /* allow shift to override */ 647 /* allow shift to override */
618 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
619 { 649 {
620 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
621 break; 651 break;
622 } 652 }
623 653
… …
635 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
636 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
637 } 667 }
638 break; 668 break;
639 669
640#ifdef XK_KP_Begin
641 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou");
643 break;
644
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif
653 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
657 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
673 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
674 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
675 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
676 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
677 /* allow shift to override */ 694 /* allow shift to override */
678 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
679 { 696 {
680 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
681 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
682 } 699 }
683 else 700 else
… …
688 break; 705 break;
689 706
690 case XK_Find: 707 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
692 break; 709 break;
710
693 case XK_Insert: 711 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
695 break; 713 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 715 case DXK_Remove:
… …
701 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
702 break; 720 break;
703 case XK_Select: 721 case XK_Select:
704 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
705 break; 723 break;
706#ifdef XK_KP_End
707 case XK_KP_End:
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oq");
712 break;
713 }
714 /* FALLTHROUGH */
715#endif
716 case XK_End: 724 case XK_End:
717 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
718 break; 726 break;
719#ifdef XK_KP_Home
720 case XK_KP_Home:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Ow");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
729 case XK_Home: 727 case XK_Home:
730 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
731 break; 729 break;
732 730
733#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
787#undef FKEY 785#undef FKEY
788 default: 786 default:
789 newlen = 0; 787 newlen = 0;
790 break; 788 break;
791 } 789 }
790
792 if (newlen) 791 if (newlen)
793 len = strlen (kbuf); 792 len = strlen (kbuf);
794 } 793 }
795 794
796 /* 795 /*
… …
805 else if (ctrl && keysym == XK_minus) 804 else if (ctrl && keysym == XK_minus)
806 { 805 {
807 len = 1; 806 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
810 else 814 else
811 { 815 {
812#ifdef META8_OPTION 816#ifdef META8_OPTION
813 /* set 8-bit on */ 817 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
815 { 819 {
816 unsigned char *ch; 820 char *ch;
817 821
818 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
819 *ch |= 0x80; 823 *ch |= 0x80;
820 824
821 meta = 0; 825 meta = 0;
… …
823#endif 827#endif
824 /* nil */ ; 828 /* nil */ ;
825 } 829 }
826 } 830 }
827 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
828 if (len <= 0) 835 if (len <= 0)
829 return; /* not mapped */ 836 return; /* not mapped */
830 837
831 if (options & Opt_scrollTtyKeypress) 838 if (option (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 839 if (view_start)
833 { 840 {
834 TermWin.view_start = 0; 841 view_start = 0;
835 want_refresh = 1; 842 want_refresh = 1;
836 } 843 }
837 844
838 /* 845 /*
839 * these modifications only affect the static keybuffer 846 * these modifications only affect the static keybuffer
… …
854#ifdef META8_OPTION 861#ifdef META8_OPTION
855 && meta_char == C0_ESC 862 && meta_char == C0_ESC
856#endif 863#endif
857 ) 864 )
858 { 865 {
859 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
860 tt_write (&ch, 1); 867 tt_write (&ch, 1);
861 } 868 }
862 869
863#if defined(DEBUG_CMD)
864 /* Display keyboard buffer contents */
865 unsigned char *p;
866 int i;
867
868 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
869 for (i = 0, p = kbuf; i < len; i++, p++)
870 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
871 fprintf (stderr, "'\n");
872#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
874} 871}
875/*}}} */
876 872
877#if (MENUBAR_MAX) 873void
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 874rxvt_term::key_release (XKeyEvent &ev)
879/* attempt to `write' count to the input buffer */ 875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
950#if defined (KEYSYM_RESOURCE)
880unsigned int 951unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
882{ 953{
883 unsigned int n, s; 954 unsigned int n, s;
884 955
885 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
905 976
906 cmd_parse (); 977 cmd_parse ();
907 978
908 return 0; 979 return 0;
909} 980}
910#endif /* MENUBAR_MAX */ 981#endif
911 982
912void 983void
913rxvt_term::flush () 984rxvt_term::flush ()
914{ 985{
915 flush_ev.stop (); 986 flush_ev.stop ();
916 987
917#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
918 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
919 { 990 {
920 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
921 scr_clear ();
922 scr_touch (false); 992 scr_touch (false);
923 } 993 }
924#endif 994#endif
925 995
926 if (want_refresh) 996 if (want_refresh)
927 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
928 scr_refresh (refresh_type); 1036 scr_refresh ();
929 scrollbar_show (1); 1037 scrollbar_show (1);
930#ifdef USE_XIM 1038#ifdef USE_XIM
931 IMSendSpot (); 1039 IMSendSpot ();
932#endif 1040#endif
933 } 1041 }
934 1042
935 display->flush (); 1043 display->flush ();
936} 1044}
937 1045
938void 1046void
939rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
940{ 1048{
941 SET_R (this); 1049 make_current ();
942 SET_LOCALE (locale);
943 1050
944 display->flush (); 1051 display->flush ();
945 1052
946 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
947 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
948} 1055}
949 1056
950void 1057void
951rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
952{ 1059{
953 SET_R (this); 1060 make_current ();
954 SET_LOCALE (locale);
955 1061
956 refresh_limit = 1;
957 refresh_count = 0; 1062 refresh_count = 0;
958 flush (); 1063 flush ();
959} 1064}
960 1065
961#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
962void 1067void
963rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
964{ 1069{
965 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
966 want_refresh = 1; 1071 want_refresh = 1;
967
968 w.start (w.at + BLINK_INTERVAL);
969} 1072}
970#endif 1073#endif
971 1074
972#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
973void 1076void
974rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
975{ 1078{
976 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
977 { 1080 {
978 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
979 want_refresh = 1; 1082 want_refresh = 1;
980 w.start (w.at + TEXT_BLINK_INTERVAL);
981 } 1083 }
1084 else
1085 w.stop ();
982} 1086}
983#endif 1087#endif
984 1088
985#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
986void 1090void
987rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
988{ 1092{
989 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
990 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
991 {
992 refresh_type |= SMOOTH_REFRESH;
993 want_refresh = 1; 1095 want_refresh = 1;
994 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
995 } 1097 w.stop ();
996} 1098}
997#endif 1099#endif
998 1100
999#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1000void 1102void
1001rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1002{ 1104{
1003 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1004 { 1106 {
1005 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1108 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 } 1109 }
1110 else
1111 w.stop ();
1010} 1112}
1011#endif 1113#endif
1012 1114
1013#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1014void 1116void
1015rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1016{ 1118{
1017 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1120 : scr_page (UP, mouse_slip_wheel_speed))
1020 {
1021 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1121 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1122
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1024 } 1124 {
1125 mouse_slip_wheel_speed = 0;
1126 w.stop ();
1127 }
1025} 1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1147 }
1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
1026#endif 1154#endif
1027 1155
1028bool 1156bool
1029rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
1030{ 1158{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1160
1033 if (CBUFSIZ == n) 1161 if (CBUFSIZ == n)
1034 { 1162 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0; 1164 n = 0;
1037 } 1165 }
1038 1166
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1042 1170
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1044 1172
1045 if (n > 0) 1173 if (r > 0)
1046 { 1174 {
1047 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
1048 return true; 1176 return true;
1049 } 1177 }
1050 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
1051 destroy (); 1190 destroy ();
1052 1191 }
1192
1053 return false; 1193 return false;
1054} 1194}
1055 1195
1056void 1196void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1058{ 1198{
1059 SET_R (this); 1199 make_current ();
1060 SET_LOCALE (locale);
1061 1200
1062 if (revents & EVENT_WRITE) 1201 if (revents & ev::READ)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1203 while (pty_fill ())
1067 if (cmd_parse ()) 1204 if (cmd_parse ())
1068 break; 1205 break;
1206
1207 if (revents & ev::WRITE)
1208 pty_write ();
1069} 1209}
1070 1210
1071void 1211void
1072rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1073{ 1213{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1075 recolour_cursor (); 1215 recolour_cursor ();
1076 1216
1077#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1218 hidden_pointer = 0;
1079 1219
1080 if (options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1082#endif 1222#endif
1083} 1223}
1084 1224
1085#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1086void 1226void
1087rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1088{ 1228{
1089 if (! (options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1090 return; 1230 return;
1091 1231
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1093 XFlush (display->display); 1233 XFlush (dpy);
1094 1234
1095 hidden_pointer = 1; 1235 hidden_pointer = 1;
1096} 1236}
1097 1237
1098void 1238void
1099rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1100{ 1240{
1101 SET_R (this); 1241 make_current ();
1102 SET_LOCALE (locale);
1103 1242
1104 pointer_blank (); 1243 pointer_blank ();
1105} 1244}
1106#endif 1245#endif
1107 1246
1108void 1247void
1109rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1110{ 1249{
1111 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1112 int x, y; 1251 int x, y;
1252 int code = 32;
1113 1253
1114 x = ev.x; 1254 x = Pixel2Col (ev.x);
1115 y = ev.y; 1255 y = Pixel2Row (ev.y);
1116 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1117 1264
1118 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1119 button_number = 3; 1266 button_number = 3;
1120 else 1267 else
1121 { 1268 {
… …
1167 x + 1, 1314 x + 1,
1168 y + 1); 1315 y + 1);
1169#endif 1316#endif
1170 1317
1171 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1172 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1173 (32 + x + 1), 1320 (32 + x + 1),
1174 (32 + y + 1)); 1321 (32 + y + 1));
1175} 1322}
1176
1177#ifdef USING_W11LIB
1178void
1179rxvt_W11_process_x_event (XEvent *ev)
1180{
1181 rxvt_t *r = rxvt_get_r ();
1182
1183 x_cb (*ev);
1184}
1185#endif
1186 1323
1187/*{{{ process an X event */ 1324/*{{{ process an X event */
1188void 1325void
1189rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1190{ 1327{
1191 SET_R (this); 1328 make_current ();
1192 SET_LOCALE (locale);
1193 1329
1194#if defined(CURSOR_BLINK) 1330 dLocal (Display *, dpy);
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1196 {
1197 if (hidden_cursor)
1198 {
1199 hidden_cursor = 0;
1200 want_refresh = 1;
1201 }
1202 1331
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1332 if (ev.xany.window == vt
1204 } 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1205#endif 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1335 return;
1206 1336
1207#if defined(POINTER_BLANK) 1337 // for XQueryPointer
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1209 {
1210 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease)
1213 if (hidden_pointer)
1214 pointer_unblank ();
1215
1216 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank ();
1218 }
1219#endif
1220
1221 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1340 unsigned int unused_mask;
1224 1341
1225 switch (ev.type) 1342 switch (ev.type)
1226 { 1343 {
1227 case KeyPress: 1344 case KeyPress:
1228#if ISO_14755 1345 key_press (ev.xkey);
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
1231 lookup_key (ev.xkey);
1232
1233 break; 1346 break;
1234 1347
1235 case KeyRelease: 1348 case KeyRelease:
1236 { 1349 key_release (ev.xkey);
1237#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1238 KeySym ks;
1239
1240 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1241#endif
1242
1243#if ENABLE_FRILLS || ISO_14755
1244 // ISO 14755 support
1245 if (iso14755buf)
1246 if (iso14755buf & ISO_14755_52)
1247 {
1248# if ENABLE_OVERLAY
1249 scr_overlay_off ();
1250# endif
1251# if ISO_14755
1252 // iso14755 part 5.2 handling: release time
1253 // first: controls
1254 if ((ev.xkey.state & ControlMask)
1255 && ((ks >= 0x40 && ks <= 0x5f)
1256 || (ks >= 0x61 && ks <= 0x7f)))
1257 {
1258 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1259 commit_iso14755 ();
1260 return; // case-break;
1261 }
1262
1263 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1264 if (i[0] == ks)
1265 {
1266 iso14755buf = ISO_14755_51 | i[1];
1267 commit_iso14755 ();
1268 return; // case-break;
1269 }
1270
1271 scr_bell ();
1272# endif
1273 iso14755buf = 0;
1274 break;
1275 }
1276 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281 if (iso14755buf & ISO_14755_51)
1282 commit_iso14755 ();
1283#if ISO_14755
1284 else if (iso14755buf & ISO_14755_STARTED)
1285 {
1286 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1287
1288 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1289 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1290 }
1291# endif
1292 else
1293 iso14755buf = 0;
1294 }
1295#endif
1296
1297#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1298 if (!(ev.xkey.state & ControlMask))
1299 slip_wheel_ev.stop ();
1300 else if (ks == XK_Control_L || ks == XK_Control_R)
1301 mouse_slip_wheel_speed = 0;
1302#endif
1303 break; 1350 break;
1304 }
1305 1351
1306 case ButtonPress: 1352 case ButtonPress:
1307 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1308 break; 1354 break;
1309 1355
… …
1311 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1312 break; 1358 break;
1313 1359
1314 case ClientMessage: 1360 case ClientMessage:
1315 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1317 destroy ();
1318#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink))
1324 { 1363 {
1325 /* Get Dnd data */ 1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1326 Atom ActualType; 1365 {
1327 int ActualFormat; 1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1328 unsigned char *data; 1367 {
1329 unsigned long Size, RemainingBytes; 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1330 1369 {
1331 XGetWindowProperty (display->display, display->root, 1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1332 xa[XA_DNDSELECTION], 1371 destroy ();
1333 0L, 1000000L, 1372 }
1334 False, AnyPropertyType, 1373#if ENABLE_EWMH
1335 &ActualType, &ActualFormat, 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1336 &Size, &RemainingBytes, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1337 &data); 1377 &ev);
1338 XChangeProperty (display->display, display->root, 1378#endif
1339 XA_CUT_BUFFER0, XA_STRING, 1379 }
1340 8, PropModeReplace, 1380 }
1341 data, strlen (data)); 1381#if ENABLE_XEMBED
1342 XFree (data); 1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 {
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1389#endif
1345 } 1390 }
1346#endif /* OFFIX_DND */
1347 break;
1348
1349 case MappingNotify:
1350 XRefreshKeyboardMapping (&ev.xmapping);
1351 break; 1391 break;
1352 1392
1353 /* 1393 /*
1354 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1355 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1374 break; 1414 break;
1375 } 1415 }
1376 break; 1416 break;
1377 1417
1378 case FocusIn: 1418 case FocusIn:
1379 if (!TermWin.focus) 1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1422 focus_in ();
1423 break;
1424
1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1429 focus_out ();
1430 break;
1431
1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0])
1380 { 1437 {
1381 TermWin.focus = 1; 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 { 1439 ;
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401 1440
1402 }
1403 break;
1404
1405 case FocusOut:
1406 if (TermWin.focus)
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0])
1438 {
1439 int height, width;
1440
1441 do
1442 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1448
1449 if (szHint.width != width || szHint.height != height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1442 {
1451 seen_resize = 1; 1443 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1445 }
1454 1446 else
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent)
1457 { 1447 {
1458 check_our_parents (); 1448#ifdef HAVE_BG_PIXMAP
1459 if (am_transparent) 1449 if (bgPixmap.window_position_sensitive ())
1460 want_refresh = want_full_refresh = 1; 1450 update_background ();
1451#endif
1461 } 1452 }
1462#endif 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1454 }
1464 break; 1455 break;
1465 1456
1466 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1462
1471 break; 1463 break;
1472 1464
1473 case SelectionClear: 1465 case SelectionClear:
1474 selection_clear (); 1466 selection_clear ();
1475 break; 1467 break;
1476 1468
1477 case SelectionNotify: 1469 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1472 break;
1482 1473
1483 case SelectionRequest: 1474 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1485 break; 1476 break;
1486 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start ();
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1487 case UnmapNotify: 1486 case UnmapNotify:
1488 TermWin.mapped = 0; 1487 mapped = 0;
1489#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1491#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1492 break;
1493
1494 case MapNotify:
1495 TermWin.mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 break;
1500
1501#ifdef TRANSPARENT
1502 case ReparentNotify:
1503 rootwin_cb (ev);
1504 break;
1505#endif /* TRANSPARENT */
1506 1493
1507 case GraphicsExpose: 1494 case GraphicsExpose:
1508 case Expose: 1495 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1496 if (ev.xany.window == vt)
1510 { 1497 {
1511 do 1498 do
1499 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1504
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1506
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1521 1511 }
1522 scr_refresh (refresh_type); 1512 want_refresh = 1;
1523 } 1513 }
1524 else 1514 else
1525 { 1515 {
1526 XEvent unused_event; 1516 XEvent unused_event;
1527 1517
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1519 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1521 ;
1532 1522
1533 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1534 { 1524 {
1535 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1536 scrollbar_show (0); 1526 scrollbar_show (0);
1537 } 1527 }
1538#ifdef MENUBAR
1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540 menubar_expose ();
1541#endif
1542
1543#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0])
1545 XClearWindow (display->display, ev.xany.window);
1546#endif
1547 } 1528 }
1548 break; 1529 break;
1549 1530
1550 case MotionNotify: 1531 case MotionNotify:
1551#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1552 if (hidden_pointer) 1533 if (hidden_pointer)
1553 pointer_unblank (); 1534 pointer_unblank ();
1554#endif 1535#endif
1555#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1556 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1557 {
1558 menubar_control (ev.xbutton); 1538 mouse_report (ev.xbutton);
1559 break;
1560 }
1561#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1540 break;
1564 1541
1565 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1566 { 1543 {
1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1546 ; // nop
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1548 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1570 ; 1550 ;
1571 1551
1572 XQueryPointer (display->display, TermWin.vt, 1552 XQueryPointer (dpy, vt,
1573 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1556 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1589#endif 1569#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1570 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1571 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1572
1593#ifdef SELECTION_SCROLLING 1573#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1574 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1575 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1576 {
1597 int dist; 1577 int dist;
1598 1578
1599 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1601 */ 1581 */
1602 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.is_active ())
1603 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1604 1584
1605 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1606 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1607 */ 1587 */
1608 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1589 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1590 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1591
1612 /* calc number of lines to scroll */ 1592 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1593 if (ev.xbutton.y < int_bwidth)
1614 { 1594 {
1615 scroll_selection_dir = UP; 1595 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1596 dist = int_bwidth - ev.xbutton.y;
1617 } 1597 }
1618 else 1598 else
1619 { 1599 {
1620 scroll_selection_dir = DN; 1600 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1601 dist = ev.xbutton.y - (int_bwidth + height);
1622 } 1602 }
1623 1603
1624 scroll_selection_lines = Pixel2Height (dist) 1604 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1605 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1606 + 1;
1627 MIN_IT (scroll_selection_lines, 1607 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1608 SELECTION_SCROLL_MAX_LINES);
1629 } 1609 }
1630 else 1610 else
1631 { 1611 {
1632 /* we are within the text window, so we 1612 /* we are within the text window, so we
1633 * shouldn't be scrolling 1613 * shouldn't be scrolling
1634 */ 1614 */
1635 if (sel_scroll_ev.active)
1636 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1637 } 1616 }
1638#endif 1617#endif
1639#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1640 } 1619 }
1641#endif 1620#endif
1642 } 1621 }
1643 } 1622 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1624 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1647 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1648 ; 1627 ;
1649 1628
1650 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1651 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1633 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1656 scrollbar_size ()); 1635 scrollbar_size ());
1657 scr_refresh (refresh_type);
1658 refresh_limit = 0; 1636 want_refresh = 1;
1659 scrollbar_show (1); 1637 scrollbar_show (1);
1660 } 1638 }
1661 break; 1639 break;
1662 } 1640 }
1663}
1664 1641
1665#if TRANSPARENT 1642#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again ();
1652 }
1653#endif
1654
1655#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 {
1658 if (ev.type == MotionNotify
1659 || ev.type == ButtonPress
1660 || ev.type == ButtonRelease)
1661 if (hidden_pointer)
1662 pointer_unblank ();
1663
1664 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank ();
1666 }
1667#endif
1668}
1669
1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM
1681 if (Input_Context != NULL)
1682 {
1683 IMSetPosition ();
1684 XSetICFocus (Input_Context);
1685 }
1686#endif
1687#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.again ();
1690#endif
1691#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade])
1693 {
1694 pix_colors = pix_colors_focused;
1695 scr_recolour ();
1696 }
1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1708 }
1709}
1710
1711void
1712rxvt_term::focus_out ()
1713{
1714 if (focus)
1715 {
1716 focus = 0;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1720
1721#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf)
1723 {
1724 iso14755buf = 0;
1725# if ISO_14755
1726 scr_overlay_off ();
1727# endif
1728 }
1729#endif
1730#if USE_XIM
1731 if (Input_Context != NULL)
1732 XUnsetICFocus (Input_Context);
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.stop ();
1737
1738 hidden_cursor = 0;
1739#endif
1740#if OFF_FOCUS_FADING
1741 if (rs[Rs_fade])
1742 {
1743 pix_colors = pix_colors_unfocused;
1744 scr_recolour ();
1745 }
1746#endif
1747 }
1748}
1749
1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1666void 1764void
1667rxvt_term::rootwin_cb (XEvent &ev) 1765rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1766{
1669 SET_R (this); 1767 make_current ();
1670 SET_LOCALE (locale);
1671 1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1672 switch (ev.type) 1774 switch (ev.type)
1673 { 1775 {
1674 case PropertyNotify: 1776 case PropertyNotify:
1675 /* 1777 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1678 */ 1780 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1683 return; 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1684 1783 {
1685 /* FALLTHROUGH */ 1784 bgPixmap.set_root_pixmap ();
1686 case ReparentNotify: 1785 update_background ();
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 }
1688 want_refresh = want_full_refresh = 1;
1689 break; 1787 break;
1690 } 1788 }
1789# endif
1691} 1790}
1692#endif 1791#endif
1693 1792
1694void 1793void
1695rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1696{ 1795{
1697 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1698 1797
1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1799
1700 if (!bypass_keystate) 1800 if (!bypass_keystate)
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1802
1703 /* 1803 /*
1704 * VT window processing of button press 1804 * VT window processing of button press
1705 */ 1805 */
1706 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1707 { 1807 {
1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1708#if ISO_14755 1811#if ISO_14755
1709 // 5.4 1812 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1814 {
1712 iso14755_54 (ev.x, ev.y); 1815 iso14755_54 (ev.x, ev.y);
… …
1724#ifdef MOUSE_REPORT_DOUBLECLICK 1827#ifdef MOUSE_REPORT_DOUBLECLICK
1725 if (ev.button == MEvent.button && clickintime) 1828 if (ev.button == MEvent.button && clickintime)
1726 { 1829 {
1727 /* same button, within alloted time */ 1830 /* same button, within alloted time */
1728 MEvent.clicks++; 1831 MEvent.clicks++;
1832
1729 if (MEvent.clicks > 1) 1833 if (MEvent.clicks > 1)
1730 { 1834 {
1731 /* only report double clicks */ 1835 /* only report double clicks */
1732 MEvent.clicks = 2; 1836 MEvent.clicks = 2;
1733 mouse_report (ev); 1837 mouse_report (ev);
… …
1745 mouse_report (ev); 1849 mouse_report (ev);
1746 } 1850 }
1747#else 1851#else
1748 MEvent.button = ev.button; 1852 MEvent.button = ev.button;
1749 mouse_report (ev); 1853 mouse_report (ev);
1750#endif /* MOUSE_REPORT_DOUBLECLICK */ 1854#endif /* MOUSE_REPORT_DOUBLECLICK */
1751 1855
1752 } 1856 }
1753 else 1857 else
1754 { 1858 {
1755 if (ev.button != MEvent.button) 1859 if (ev.button != MEvent.button)
… …
1759 { 1863 {
1760 case Button1: 1864 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1865 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1866 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1867#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1868 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1869#else
1766 selection.rect = false; 1870 selection.rect = false;
1767#endif 1871#endif
1768 1872
1769 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1771 { 1875 {
1772 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1773 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1774 else 1878 else
1775 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
… …
1849 tt_printf ("\033[5~"); 1953 tt_printf ("\033[5~");
1850 break; 1954 break;
1851 } 1955 }
1852 } 1956 }
1853 else 1957 else
1854#endif /* NO_SCROLLBAR_REPORT */ 1958#endif /* NO_SCROLLBAR_REPORT */
1855 1959
1856 { 1960 {
1857 char upordown = 0; 1961 char upordown = 0;
1858 1962
1859 if (scrollBar.style == R_SB_NEXT) 1963 if (scrollBar.style == R_SB_NEXT)
1860 { 1964 {
1861 if (scrollbarnext_upButton (ev.y)) 1965 if (scrollbarnext_upButton (ev.y))
1862 upordown = -1; /* up */ 1966 upordown = -1; /* up */
… …
1868 if (scrollbarrxvt_upButton (ev.y)) 1972 if (scrollbarrxvt_upButton (ev.y))
1869 upordown = -1; /* up */ 1973 upordown = -1; /* up */
1870 else if (scrollbarrxvt_dnButton (ev.y)) 1974 else if (scrollbarrxvt_dnButton (ev.y))
1871 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1872 } 1976 }
1977
1873 if (upordown) 1978 if (upordown)
1874 { 1979 {
1875#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ())
1876 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1877#endif 1983#endif
1878 if (scr_page (upordown < 0 ? UP : DN, 1)) 1984 if (scr_page (upordown < 0 ? UP : DN, 1))
1879 { 1985 {
1880 if (upordown < 0) 1986 if (upordown < 0)
1881 scrollBar.setUp (); 1987 scrollBar.setUp ();
… …
1916 case Button3: 2022 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 2023 if (scrollBar.style != R_SB_XTERM)
1918 { 2024 {
1919 if (scrollbar_above_slider (ev.y)) 2025 if (scrollbar_above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 2027 scr_page (UP, nrow - 1);
1922# else 2028# else
1923 scr_page (UP, TermWin.nrow / 4); 2029 scr_page (UP, nrow / 4);
1924# endif 2030# endif
1925 else if (scrollbar_below_slider (ev.y)) 2031 else if (scrollbar_below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 2032# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2033 scr_page (DN, nrow - 1);
1928# else 2034# else
1929 scr_page (DN, TermWin.nrow / 4); 2035 scr_page (DN, nrow / 4);
1930# endif 2036# endif
1931 else 2037 else
1932 scrollBar.setMotion (); 2038 scrollBar.setMotion ();
1933 } 2039 }
1934 else 2040 else
1935 { 2041 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2042 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2043 (nrow
1938 * scrollbar_position (ev.y) 2044 * scrollbar_position (ev.y)
1939 / scrollbar_size ())); 2045 / scrollbar_size ()));
1940 } 2046 }
1941 2047
1942 break; 2048 break;
1943 } 2049 }
1944 } 2050 }
2051
1945 return; 2052 return;
1946 } 2053 }
1947#if MENUBAR
1948 /*
1949 * Menubar window processing of button press
1950 */
1951 if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2054}
1955 2055
1956void 2056void
1957rxvt_term::button_release (XButtonEvent &ev) 2057rxvt_term::button_release (XButtonEvent &ev)
1958{ 2058{
… …
1964 2064
1965 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1966 { 2066 {
1967 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1968 scrollbar_show (0); 2068 scrollbar_show (0);
1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1970 refresh_type &= ~SMOOTH_REFRESH;
1971#endif
1972 } 2069 }
1973 2070
1974#ifdef SELECTION_SCROLLING 2071#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
1977#endif 2073#endif
1978 2074
1979 if (ev.window == TermWin.vt) 2075 if (ev.window == vt)
1980 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
1981#if ISO_14755 2080#if ISO_14755
1982 // 5.4 2081 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2083 return;
1985#endif 2084#endif
2085
1986 if (reportmode) 2086 if (reportmode)
1987 { 2087 {
1988 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1989 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1990 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2001 mouse_report (ev); 2101 mouse_report (ev);
2002 } 2102 }
2003#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2004 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2005 mouse_report (ev); 2105 mouse_report (ev);
2006#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2007 return; 2107 return;
2008 } 2108 }
2009 2109
2010 /* 2110 /*
2011 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2020 { 2120 {
2021 case Button1: 2121 case Button1:
2022 case Button3: 2122 case Button3:
2023 selection_make (ev.time); 2123 selection_make (ev.time);
2024 break; 2124 break;
2125
2025 case Button2: 2126 case Button2:
2026 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2027 break; 2129 break;
2130
2028#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2029 case Button4: 2132 case Button4:
2030 case Button5: 2133 case Button5:
2031 { 2134 {
2032 int i; 2135 int i;
… …
2034 2137
2035 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2036 2139
2037 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2038 i = 1; 2141 i = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2142 else if (option (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2041 else 2144 else
2042 i = 5; 2145 i = 5;
2043 2146
2044# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2046 { 2149 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050 2153
2051 if (slip_wheel_ev.at < NOW) 2154 if (!slip_wheel_ev.is_active ())
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2053
2054 slip_wheel_ev.start ();
2055 } 2156 }
2056 else 2157 else
2057 { 2158 {
2058# endif 2159# endif
2059# ifdef JUMP_MOUSE_WHEEL
2060 scr_page (v, i); 2160 scr_page (v, i);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1); 2161 scrollbar_show (1);
2063# else
2064 while (i--)
2065 {
2066 scr_page (v, 1);
2067 scr_refresh (SMOOTH_REFRESH);
2068 scrollbar_show (1);
2069 }
2070# endif
2071# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2072 } 2163 }
2073#endif 2164# endif
2074 } 2165 }
2075 break; 2166 break;
2076#endif 2167#endif
2077 } 2168 }
2078 } 2169 }
2079#ifdef MENUBAR
2080 else if (isMenuBarWindow (ev.window))
2081 menubar_control (ev);
2082#endif
2083} 2170}
2084
2085#ifdef TRANSPARENT
2086#if TINTING
2087/* taken from aterm-0.4.2 */
2088
2089typedef uint32_t RUINT32T;
2090
2091void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2092{
2093 int sh_r, sh_g, sh_b;
2094 RUINT32T mask_r, mask_g, mask_b;
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i;
2099
2100 Visual* visual = display->visual;
2101
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103
2104 /* for convenience */
2105 mask_r = visual->red_mask;
2106 mask_g = visual->green_mask;
2107 mask_b = visual->blue_mask;
2108
2109 /* boring lookup table pre-initialization */
2110 switch (srcImage->bits_per_pixel) {
2111 case 15:
2112 if ((mask_r != 0x7c00) ||
2113 (mask_g != 0x03e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+32;
2120 sh_r = 10;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 16:
2125 if ((mask_r != 0xf800) ||
2126 (mask_g != 0x07e0) ||
2127 (mask_b != 0x001f))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2130 lookup_r = lookup;
2131 lookup_g = lookup+32;
2132 lookup_b = lookup+32+64;
2133 sh_r = 11;
2134 sh_g = 5;
2135 sh_b = 0;
2136 break;
2137 case 24:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 case 32:
2151 if ((mask_r != 0xff0000) ||
2152 (mask_g != 0x00ff00) ||
2153 (mask_b != 0x0000ff))
2154 return;
2155 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2156 lookup_r = lookup;
2157 lookup_g = lookup+256;
2158 lookup_b = lookup+256+256;
2159 sh_r = 16;
2160 sh_g = 8;
2161 sh_b = 0;
2162 break;
2163 default:
2164 return; /* we do not support this color depth */
2165 }
2166
2167 /* prepare limits for color transformation (each channel is handled separately) */
2168 if (shade < 0) {
2169 shade = -shade;
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = 65535-rm;
2174 lower_lim_g = 65535-gm;
2175 lower_lim_b = 65535-bm;
2176
2177 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2178 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2179 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2180
2181 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2182 } else {
2183 if (shade < 0) shade = 0;
2184 if (shade > 100) shade = 100;
2185
2186 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2187
2188 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2189 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2190 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2191 }
2192
2193 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2194 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2195 {
2196 unsigned int tmp;
2197
2198 tmp = lower_lim_r;
2199 lower_lim_r = lower_lim_b;
2200 lower_lim_b = tmp;
2201
2202 tmp = upper_lim_r;
2203 upper_lim_r = upper_lim_b;
2204 upper_lim_b = tmp;
2205 }
2206
2207 /* fill our lookup tables */
2208 for (i = 0; i <= mask_r>>sh_r; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2212 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2213 lookup_r[i] = (tmp/65535)<<sh_r;
2214 }
2215 for (i = 0; i <= mask_g>>sh_g; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2219 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2220 lookup_g[i] = (tmp/65535)<<sh_g;
2221 }
2222 for (i = 0; i <= mask_b>>sh_b; i++)
2223 {
2224 RUINT32T tmp;
2225 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2226 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2227 lookup_b[i] = (tmp/65535)<<sh_b;
2228 }
2229
2230 /* apply table to input image (replacing colors by newly calculated ones) */
2231 switch (srcImage->bits_per_pixel)
2232 {
2233 case 15:
2234 {
2235 unsigned short *p1, *pf, *p, *pl;
2236 p1 = (unsigned short *) srcImage->data;
2237 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2238 while (p1 < pf)
2239 {
2240 p = p1;
2241 pl = p1 + srcImage->width;
2242 for (; p < pl; p++)
2243 {
2244 *p = lookup_r[(*p & 0x7c00)>>10] |
2245 lookup_g[(*p & 0x03e0)>> 5] |
2246 lookup_b[(*p & 0x001f)];
2247 }
2248 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2249 }
2250 break;
2251 }
2252 case 16:
2253 {
2254 unsigned short *p1, *pf, *p, *pl;
2255 p1 = (unsigned short *) srcImage->data;
2256 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2257 while (p1 < pf)
2258 {
2259 p = p1;
2260 pl = p1 + srcImage->width;
2261 for (; p < pl; p++)
2262 {
2263 *p = lookup_r[(*p & 0xf800)>>11] |
2264 lookup_g[(*p & 0x07e0)>> 5] |
2265 lookup_b[(*p & 0x001f)];
2266 }
2267 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2268 }
2269 break;
2270 }
2271 case 24:
2272 {
2273 unsigned char *p1, *pf, *p, *pl;
2274 p1 = (unsigned char *) srcImage->data;
2275 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width * 3;
2280 for (; p < pl; p += 3)
2281 {
2282 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2283 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2284 p[2] = lookup_r[(p[2] & 0x0000ff)];
2285 }
2286 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2287 }
2288 break;
2289 }
2290 case 32:
2291 {
2292 RUINT32T *p1, *pf, *p, *pl;
2293 p1 = (RUINT32T *) srcImage->data;
2294 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2295
2296 while (p1 < pf)
2297 {
2298 p = p1;
2299 pl = p1 + srcImage->width;
2300 for (; p < pl; p++)
2301 {
2302 *p = lookup_r[(*p & 0xff0000)>>16] |
2303 lookup_g[(*p & 0x00ff00)>> 8] |
2304 lookup_b[(*p & 0x0000ff)] |
2305 (*p & ~0xffffff);
2306 }
2307 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2308 }
2309 break;
2310 }
2311 }
2312
2313 free (lookup);
2314}
2315#endif
2316
2317/*
2318 * Check our parents are still who we think they are.
2319 * Do transparency updates if required
2320 */
2321int
2322rxvt_term::check_our_parents ()
2323{
2324 int i, pchanged, aformat, have_pixmap, rootdepth;
2325 unsigned long nitems, bytes_after;
2326 Atom atype;
2327 unsigned char *prop = NULL;
2328 Window root, oldp, *list;
2329 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr;
2331
2332 pchanged = 0;
2333
2334 if (!(options & Opt_transparent))
2335 return pchanged; /* Don't try any more */
2336
2337 XGetWindowAttributes (display->display, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth;
2339
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2341
2342 if (rootdepth != wattr.depth)
2343 {
2344 if (am_transparent)
2345 {
2346 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0;
2349 }
2350
2351 return pchanged; /* Don't try any more */
2352 }
2353
2354 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False);
2356
2357 /*
2358 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that.
2361 */
2362 i = (xa[XA_XROOTPMAPID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success);
2366
2367 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success);
2372
2373 if (!i || prop == NULL
2374#if TINTING
2375 || !rs[Rs_color + Color_tint]
2376#endif
2377 )
2378 have_pixmap = 0;
2379 else
2380 {
2381 have_pixmap = 1;
2382 rootpixmap = *(Pixmap *)prop;
2383 XFree (prop);
2384 }
2385
2386 if (have_pixmap)
2387 {
2388 /*
2389 * Copy display->root pixmap transparency
2390 */
2391 int sx, sy, nx, ny;
2392 unsigned int nw, nh;
2393 Window cr;
2394 XImage *image;
2395 GC gc;
2396 XGCValues gcvalue;
2397
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2399 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height;
2402 nx = ny = 0;
2403
2404 if (sx < 0)
2405 {
2406 nw += sx;
2407 nx = -sx;
2408 sx = 0;
2409 }
2410
2411 if (sy < 0)
2412 {
2413 nh += sy;
2414 ny = -sy;
2415 sy = 0;
2416 }
2417
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2420 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */
2425 allowedxerror = 0;
2426
2427 if (image == NULL)
2428 {
2429 if (am_transparent && am_pixmap_trans)
2430 {
2431 pchanged = 1;
2432 if (TermWin.pixmap != None)
2433 {
2434 XFreePixmap (display->display, TermWin.pixmap);
2435 TermWin.pixmap = None;
2436 }
2437 }
2438
2439 am_pixmap_trans = 0;
2440 }
2441 else
2442 {
2443 if (TermWin.pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap);
2445
2446#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint))
2448 {
2449 unsigned short rm, gm, bm;
2450 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2451
2452 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2453
2454 ShadeXImage (display, image, shade, rm, gm, bm);
2455 }
2456#endif
2457
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2459 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc);
2464 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]);
2467
2468 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1;
2470
2471 am_transparent = am_pixmap_trans = 1;
2472 }
2473 }
2474
2475 if (!am_pixmap_trans)
2476 {
2477 unsigned int n;
2478 /*
2479 * InheritPixmap transparency
2480 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2482 {
2483 oldp = TermWin.parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2485 &TermWin.parent[i], &list, &n);
2486 XFree (list);
2487
2488 if (TermWin.parent[i] == display->root)
2489 {
2490 if (oldp != None)
2491 pchanged = 1;
2492
2493 break;
2494 }
2495
2496 if (oldp != TermWin.parent[i])
2497 pchanged = 1;
2498 }
2499
2500 n = 0;
2501
2502 if (pchanged)
2503 {
2504 for (; n < (unsigned int)i; n++)
2505 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2510 break;
2511 }
2512 }
2513 }
2514
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */
2521 }
2522 else
2523 {
2524#if WAIT_FOR_WM
2525 /* wait (an arbitrary period) for the WM to do its thing
2526 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1);
2528#endif
2529 for (n = 0; n < (unsigned int)i; n++)
2530 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]);
2533 }
2534
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2536 am_transparent = 1;
2537 }
2538
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None;
2541 }
2542
2543 if (scrollBar.win)
2544 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle ();
2547 scrollbar_show (0);
2548 }
2549
2550 return pchanged;
2551}
2552#endif
2553 2171
2554/*}}} */ 2172/*}}} */
2555 2173
2556bool 2174bool
2557rxvt_term::cmd_parse () 2175rxvt_term::cmd_parse ()
2558{ 2176{
2559 bool flag = false; 2177 bool flag = false;
2560 unicode_t ch = NOCHAR; 2178 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2179 char *seq_begin; // remember start of esc-sequence here
2562 2180
2563 for (;;) 2181 for (;;)
2564 { 2182 {
2565 if (ch == NOCHAR) 2183 if (ch == NOCHAR)
2566 { 2184 {
2567 seq_begin = cmdbuf_ptr; 2185 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2186 ch = next_char ();
2569 }
2570 2187
2571 if (ch == NOCHAR) // TODO: improve 2188 if (ch == NOCHAR)
2572 break; 2189 break;
2190 }
2573 2191
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2192 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 { 2193 {
2576 if (!seen_input) 2194 if (!seen_input)
2577 { 2195 {
… …
2581 // some window managers resize the window early, and these programs 2199 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2200 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2201 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2202 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2203 // resized.
2586 if (seen_resize) 2204 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2205 kill (-cmd_pid, SIGWINCH);
2588 } 2206 }
2589 2207
2590 /* Read a text string from the input buffer */ 2208 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2209 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2210 bool refreshnow = false;
2593 int nlines = 0; 2211 int nlines = 0;
2594 unicode_t *str = buf; 2212 wchar_t *str = buf;
2213 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2214
2596 for (;;) 2215 for (;;)
2597 { 2216 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2217 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2218 break;
2600 2219
2601 *str++ = ch; 2220 *str++ = ch;
2602 2221
2603 if (ch == C0_LF) 2222 if (ch == C0_LF || str >= eol)
2604 { 2223 {
2224 if (ch == C0_LF)
2605 nlines++; 2225 nlines++;
2226
2606 refresh_count++; 2227 refresh_count++;
2607 2228
2608 if (!(options & Opt_jumpScroll) 2229 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2610 { 2230 {
2231 refresh_count = 0;
2232
2233 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2234 {
2611 refreshnow = true; 2235 refreshnow = true;
2612 ch = NOCHAR; 2236 ch = NOCHAR;
2613 break; 2237 break;
2238 }
2614 } 2239 }
2615 2240
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2241 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2242 if (nlines >= nrow - 1)
2618 { 2243 {
2244 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2245 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2619 scr_add_lines (buf, nlines, str - buf); 2246 scr_add_lines (buf, str - buf, nlines);
2247
2620 nlines = 0; 2248 nlines = 0;
2621 str = buf; 2249 str = buf;
2250 eol = str + min (ncol, UBUFSIZ);
2622 } 2251 }
2623 }
2624 2252
2625 if (str >= buf + UBUFSIZ) 2253 if (str >= eol)
2626 { 2254 {
2255 if (eol >= buf + UBUFSIZ)
2256 {
2627 ch = NOCHAR; 2257 ch = NOCHAR;
2628 break; 2258 break;
2259 }
2260 else
2261 eol = min (eol + ncol, buf + UBUFSIZ);
2262 }
2263
2629 } 2264 }
2630 2265
2631 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2267 ch = next_char ();
2633 } 2268 }
2634 2269
2270 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2271 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2635 scr_add_lines (buf, nlines, str - buf); 2272 scr_add_lines (buf, str - buf, nlines);
2636 2273
2637 /* 2274 /*
2638 * If there have been a lot of new lines, then update the screen 2275 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2276 * What the heck we'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2277 * if skipScroll is enabled.
2641 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2278 */
2643 if (refreshnow) 2279 if (refreshnow)
2644 { 2280 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++;
2647 else
2648 {
2649 flag = true; 2281 flag = true;
2650 scr_refresh (refresh_type); 2282 scr_refresh ();
2651 } 2283 want_refresh = 1;
2652 } 2284 }
2653 2285
2654 } 2286 }
2655 else 2287 else
2656 { 2288 {
… …
2670 } 2302 }
2671 2303
2672 return flag; 2304 return flag;
2673} 2305}
2674 2306
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character 2307// read the next character
2685unicode_t 2308wchar_t
2686rxvt_term::next_char () 2309rxvt_term::next_char () NOTHROW
2687{ 2310{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2311 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2312 {
2690 // assume 7-bit to be ascii ALWAYS 2313 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2314 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2315 return *cmdbuf_ptr++;
2693 2316
2694 wchar_t wc; 2317 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2318 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2319
2697 if (len == (size_t)-2) 2320 if (len == (size_t)-2)
2698 { 2321 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2322 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2323 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2324 break;
2702 } 2325 }
2703 2326
2704 if (len == (size_t)-1) 2327 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2328 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2329
2707 // assume wchar == unicode 2330 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2331 cmdbuf_ptr += len;
2709 return wc; 2332 return wc & UNICODE_MASK;
2710 } 2333 }
2711 2334
2712 return NOCHAR; 2335 return NOCHAR;
2713} 2336}
2337
2338// read the next octet
2339uint32_t
2340rxvt_term::next_octet () NOTHROW
2341{
2342 return cmdbuf_ptr < cmdbuf_endp
2343 ? (unsigned char)*cmdbuf_ptr++
2344 : NOCHAR;
2345}
2346
2347static class out_of_input out_of_input;
2714 2348
2715/* rxvt_cmd_getc () - Return next input character */ 2349/* rxvt_cmd_getc () - Return next input character */
2716/* 2350/*
2717 * Return the next input character after first passing any keyboard input 2351 * Return the next input character after first passing any keyboard input
2718 * to the command. 2352 * to the command.
2719 */ 2353 */
2720unicode_t 2354wchar_t
2721rxvt_term::cmd_getc () 2355rxvt_term::cmd_getc () THROW ((class out_of_input))
2722{ 2356{
2723 unicode_t c = next_char (); 2357 wchar_t c = next_char ();
2724 2358
2725 if (c == NOCHAR) 2359 if (c == NOCHAR)
2726 throw out_of_input; 2360 throw out_of_input;
2727 2361
2728 return c; 2362 return c;
2729} 2363}
2730 2364
2731unicode_t 2365uint32_t
2732rxvt_term::cmd_get8 () 2366rxvt_term::cmd_get8 () THROW ((class out_of_input))
2733{ 2367{
2734 unicode_t c = next_octet (); 2368 uint32_t c = next_octet ();
2735 2369
2736 if (c == NOCHAR) 2370 if (c == NOCHAR)
2737 throw out_of_input; 2371 throw out_of_input;
2738 2372
2739 return c; 2373 return c;
… …
2803 { 2437 {
2804 if ((buf[len++] = cmd_getc ()) == 'i') 2438 if ((buf[len++] = cmd_getc ()) == 'i')
2805 break; /* done = 1 */ 2439 break; /* done = 1 */
2806 } 2440 }
2807 } 2441 }
2808 2442
2809 for (i = 0; i < len; i++) 2443 for (i = 0; i < len; i++)
2810 if (putc (buf[i], fd) == EOF) 2444 if (putc (buf[i], fd) == EOF)
2811 { 2445 {
2812 done = 1; 2446 done = 1;
2813 break; 2447 break;
… …
2815 } 2449 }
2816 } 2450 }
2817 2451
2818 pclose_printer (fd); 2452 pclose_printer (fd);
2819} 2453}
2820#endif /* PRINTPIPE */ 2454#endif /* PRINTPIPE */
2821/*}}} */ 2455/*}}} */
2822 2456
2823/* *INDENT-OFF* */ 2457/* *INDENT-OFF* */
2824enum { 2458enum {
2825 C1_40 = 0x40, 2459 C1_40 = 0x40,
… …
2839 case C0_ESC: 2473 case C0_ESC:
2840 process_escape_seq (); 2474 process_escape_seq ();
2841 break; 2475 break;
2842 case C0_ENQ: /* terminal Status */ 2476 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 2477 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2478 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 2479 else
2847 tt_write ((unsigned char *)VT100_ANS, 2480 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 2481 break;
2850 case C0_BEL: /* bell */ 2482 case C0_BEL: /* bell */
2851 scr_bell (); 2483 scr_bell ();
2852 break; 2484 break;
2853 case C0_BS: /* backspace */ 2485 case C0_BS: /* backspace */
… …
2877 process_dcs_seq (); 2509 process_dcs_seq ();
2878 break; 2510 break;
2879 case 0x9b: /* CSI */ 2511 case 0x9b: /* CSI */
2880 process_csi_seq (); 2512 process_csi_seq ();
2881 break; 2513 break;
2882 case 0x9d: /* CSI */ 2514 case 0x9d: /* OSC */
2883 process_osc_seq (); 2515 process_osc_seq ();
2884 break; 2516 break;
2885#endif 2517#endif
2886 } 2518 }
2887} 2519}
… …
2977 scr_charset_set (2, (unsigned int)cmd_getc ()); 2609 scr_charset_set (2, (unsigned int)cmd_getc ());
2978 break; 2610 break;
2979 case '+': 2611 case '+':
2980 scr_charset_set (3, (unsigned int)cmd_getc ()); 2612 scr_charset_set (3, (unsigned int)cmd_getc ());
2981 break; 2613 break;
2982#if ENABLE_FRILLS 2614#if !ENABLE_MINIMAL
2983 case '6': 2615 case '6':
2984 scr_backindex (); 2616 scr_backindex ();
2985 break; 2617 break;
2986#endif 2618#endif
2987 case '7': 2619 case '7':
2988 scr_cursor (SAVE); 2620 scr_cursor (SAVE);
2989 break; 2621 break;
2990 case '8': 2622 case '8':
2991 scr_cursor (RESTORE); 2623 scr_cursor (RESTORE);
2992 break; 2624 break;
2993#if ENABLE_FRILLS 2625#if !ENABLE_MINIMAL
2994 case '9': 2626 case '9':
2995 scr_forwardindex (); 2627 scr_forwardindex ();
2996 break; 2628 break;
2997#endif 2629#endif
2998 case '=': 2630 case '=':
… …
3008 break; 2640 break;
3009 2641
3010 /* 8.3.87: NEXT LINE */ 2642 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 2643 case C1_NEL: /* ESC E */
3012 { 2644 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 2645 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 2646 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3015 } 2647 }
3016 break; 2648 break;
3017 2649
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 2650 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 2651 case C1_ESA: /* ESC G */
… …
3041 process_dcs_seq (); 2673 process_dcs_seq ();
3042 break; 2674 break;
3043 2675
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2676 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 2677 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 2678 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 2679 break; /* steal obsolete ESC [ c */
3049 2680
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2681 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 2682 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 2683 process_csi_seq ();
… …
3114rxvt_term::process_csi_seq () 2745rxvt_term::process_csi_seq ()
3115{ 2746{
3116 unicode_t ch, priv, i; 2747 unicode_t ch, priv, i;
3117 unsigned int nargs, p; 2748 unsigned int nargs, p;
3118 int n, ndef; 2749 int n, ndef;
3119 int arg[ESC_ARGS]; 2750 int arg[ESC_ARGS] = { };
3120 2751
3121 for (nargs = ESC_ARGS; nargs > 0;) 2752 nargs = 0;
3122 arg[--nargs] = 0;
3123 2753
3124 priv = 0; 2754 priv = 0;
3125 ch = cmd_getc (); 2755 ch = cmd_getc ();
3126 if (ch >= '<' && ch <= '?') 2756 if (ch >= '<' && ch <= '?')
2757 {
3127 { /* '<' '=' '>' '?' */ 2758 /* '<' '=' '>' '?' */
3128 priv = ch; 2759 priv = ch;
3129 ch = cmd_getc (); 2760 ch = cmd_getc ();
3130 } 2761 }
3131 2762
3132 /* read any numerical arguments */ 2763 /* read any numerical arguments */
… …
3161 ndef = get_byte_array_bit (csi_defaults, i); 2792 ndef = get_byte_array_bit (csi_defaults, i);
3162 for (p = 0; p < nargs; p++) 2793 for (p = 0; p < nargs; p++)
3163 if (arg[p] == -1) 2794 if (arg[p] == -1)
3164 arg[p] = ndef; 2795 arg[p] = ndef;
3165 2796
3166#ifdef DEBUG_CMD
3167 fprintf (stderr, "CSI ");
3168 for (p = 0; p < nargs; p++)
3169 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3170 fprintf (stderr, "%c\n", ch);
3171#endif
3172
3173 /* 2797 /*
3174 * private mode handling 2798 * private mode handling
3175 */ 2799 */
3176 if (priv) 2800 if (priv)
3177 { 2801 {
3178 switch (priv) 2802 switch (priv)
3179 { 2803 {
3180 case '>': 2804 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 2805 if (ch == CSI_DA) /* secondary device attributes */
2806 {
2807 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2808 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2809 //
2810 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2811 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2812 // versions.
2813 //
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2814 tt_printf ("\033[>%d;95;0c", 'U');
2815 }
3183 break; 2816 break;
3184 case '?': 2817 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 2819 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 2820 break;
… …
3292 2925
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2926 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2929 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2930 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 2931 break;
3299 2932
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2933 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 2934 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 2935 break;
3304 2936
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2937 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 2938 process_sgr_mode (nargs, arg);
3307 break; 2939 break;
… …
3314 break; 2946 break;
3315 case 6: /* CPR requested */ 2947 case 6: /* CPR requested */
3316 scr_report_position (); 2948 scr_report_position ();
3317 break; 2949 break;
3318 case 7: /* unofficial extension */ 2950 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 2951 if (option (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2952 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 2953 break;
3322 case 8: /* unofficial extension */ 2954 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2955 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 2956 break;
… …
3391 break; 3023 break;
3392 case CSI_75: 3024 case CSI_75:
3393 scr_cursor (RESTORE); 3025 scr_cursor (RESTORE);
3394 break; 3026 break;
3395 3027
3396#if ENABLE_FRILLS 3028#if !ENABLE_MINIMAL
3397 case CSI_74: 3029 case CSI_74:
3398 process_window_ops (arg, nargs); 3030 process_window_ops (arg, nargs);
3399 break; 3031 break;
3400#endif 3032#endif
3401 3033
… …
3408 break; 3040 break;
3409 } 3041 }
3410} 3042}
3411/*}}} */ 3043/*}}} */
3412 3044
3413#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3414/* ARGSUSED */ 3046/* ARGSUSED */
3415void 3047void
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3048rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3049{
3418 int x, y; 3050 int x, y;
3419 XWindowAttributes wattr; 3051 XWindowAttributes wattr;
3420 Window wdummy; 3052 Window wdummy;
3053
3054 dLocal (Display *, dpy);
3421 3055
3422 if (nargs == 0) 3056 if (nargs == 0)
3423 return; 3057 return;
3424 3058
3425 switch (args[0]) 3059 switch (args[0])
3426 { 3060 {
3427 /* 3061 /*
3428 * commands 3062 * commands
3429 */ 3063 */
3430 case 1: /* deiconify window */ 3064 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3065 XMapWindow (dpy, parent[0]);
3432 break; 3066 break;
3433 case 2: /* iconify window */ 3067 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3068 XIconifyWindow (dpy, parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3069 break;
3437 case 3: /* set position (pixels) */ 3070 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3071 XMoveWindow (dpy, parent[0], args[1], args[2]);
3439 break; 3072 break;
3440 case 4: /* set size (pixels) */ 3073 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3074 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3075 break;
3443 case 5: /* raise window */ 3076 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3077 XRaiseWindow (dpy, parent[0]);
3445 break; 3078 break;
3446 case 6: /* lower window */ 3079 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3080 XLowerWindow (dpy, parent[0]);
3448 break; 3081 break;
3449 case 7: /* refresh window */ 3082 case 7: /* refresh window */
3450 scr_touch (true); 3083 scr_touch (true);
3451 break; 3084 break;
3452 case 8: /* set size (chars) */ 3085 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3086 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3087 (unsigned int) (args[1] * fheight));
3455 break; 3088 break;
3456 3089
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3090 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3091 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3092 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3093 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3094 (unsigned int) (args[1] * fheight));
3462 break; 3095 break;
3463
3464 3096
3465 /* 3097 /*
3466 * reports - some output format copied from XTerm 3098 * reports - some output format copied from XTerm
3467 */ 3099 */
3468 case 11: /* report window state */ 3100 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3101 XGetWindowAttributes (dpy, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3102 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3103 break;
3472 case 13: /* report window position */ 3104 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3106 XTranslateCoordinates (dpy, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3107 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3108 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3109 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3110 break;
3479 case 14: /* report window size (pixels) */ 3111 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3112 XGetWindowAttributes (dpy, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3113 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3114 break;
3483 case 18: /* report text area size (chars) */ 3115 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3116 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3117 break;
3486 case 19: /* report window size (chars) */ 3118 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3119 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3120 break;
3489 case 20: /* report icon label */ 3121 case 20: /* report icon label */
3490 { 3122 {
3491 char *s; 3123 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3124 XGetIconName (dpy, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3125 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3126 XFree (s);
3495 } 3127 }
3496 break; 3128 break;
3497 case 21: /* report window title */ 3129 case 21: /* report window title */
3498 { 3130 {
3499 char *s; 3131 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3132 XFetchName (dpy, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3133 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3134 XFree (s);
3503 } 3135 }
3504 break; 3136 break;
3505 } 3137 }
3506} 3138}
… …
3509/*----------------------------------------------------------------------*/ 3141/*----------------------------------------------------------------------*/
3510/* 3142/*
3511 * get input up until STRING TERMINATOR (or BEL) 3143 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3144 * ends_how is terminator used. returned input must be free()'d
3513 */ 3145 */
3514unsigned char * 3146char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3147rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3148{
3517 unicode_t seen_esc = 0, ch; 3149 unicode_t ch;
3150 bool seen_esc = false;
3518 unsigned int n = 0; 3151 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3152 wchar_t string[STRING_MAX];
3521 3153
3522 while ((ch = cmd_getc ()) != NOCHAR) 3154 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3155 {
3524 if (seen_esc) 3156 if (seen_esc)
3525 { 3157 {
… …
3528 else 3160 else
3529 return NULL; 3161 return NULL;
3530 } 3162 }
3531 else if (ch == C0_ESC) 3163 else if (ch == C0_ESC)
3532 { 3164 {
3533 seen_esc = 1; 3165 seen_esc = true;
3534 continue; 3166 continue;
3535 } 3167 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3168 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3169 break;
3170 else if (ch == C0_SYN)
3171 ch = cmd_get8 ();
3538 else if (ch < 0x20) 3172 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3173 return NULL; /* other control character - exit */
3540 3174
3541 seen_esc = 0; 3175 seen_esc = false;
3542 3176
3543 if (n >= sizeof (string) - 1) 3177 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3178 // stop at some sane length
3545 return NULL; 3179 return NULL;
3546 3180
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3550 string[n++] = ch; 3181 string[n++] = ch;
3551 } 3182 }
3552 3183
3553 string[n++] = '\0'; 3184 string[n++] = '\0';
3554 3185
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3186 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3187
3560 return s; 3188 return rxvt_wcstombs (string);
3561} 3189}
3562 3190
3563/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3564/* 3192/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3193 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3194 */
3567void 3195void
3568rxvt_term::process_dcs_seq () 3196rxvt_term::process_dcs_seq ()
3569{ 3197{
3570 unsigned char *s; 3198 char *s;
3571 unicode_t eh; 3199 unicode_t eh;
3572 3200
3573 /* 3201 /*
3574 * Not handled yet 3202 * Not handled yet
3575 */ 3203 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3222 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3223 arg = arg * 10 + (ch - '0');
3596 3224
3597 if (ch == ';') 3225 if (ch == ';')
3598 { 3226 {
3599 unsigned char *s = get_to_st (eh); 3227 char *s = get_to_st (eh);
3600 3228
3601 if (s) 3229 if (s)
3602 { 3230 {
3603 process_xterm_seq (arg, (char *)s, eh); 3231 process_xterm_seq (arg, s, eh);
3604 free (s); 3232 free (s);
3605 } 3233 }
3606 } 3234 }
3607} 3235}
3608 3236
3609void 3237void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3238rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3239{
3612 if (str[0] == '?' && !str[1]) 3240 if (str[0] == '?' && !str[1])
3613 { 3241 {
3614 unsigned short r, g, b; 3242 rgba c;
3615 pix_colors_focused[color].get (display, r, g, b); 3243 pix_colors_focused[color].get (c);
3244
3245#if XFT
3246 if (c.a != rgba::MAX_CC)
3247 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3248 else
3249#endif
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3250 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3617 } 3251 }
3618 else 3252 else
3619 set_window_color (color, str); 3253 set_window_color (color, str);
3620} 3254}
3621 3255
3622/* 3256/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3257 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3258 */
3647void 3259void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3260rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3261{
3650 int changed = 0;
3651 int color; 3262 int color;
3652 char *buf, *name; 3263 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3264 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3265 int saveop = op;
3655 3266
3267 dLocal (Display *, dpy);
3268
3656 assert (str != NULL); 3269 assert (str != NULL);
3270
3271 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3272 return;
3273
3657 switch (op) 3274 switch (op)
3658 { 3275 {
3659 case XTerm_name: 3276 case XTerm_name:
3660 set_title (str); 3277 set_title (str);
3661 /* FALLTHROUGH */ 3278 /* FALLTHROUGH */
… …
3666 set_title (str); 3283 set_title (str);
3667 break; 3284 break;
3668 case XTerm_property: 3285 case XTerm_property:
3669 if (str[0] == '?') 3286 if (str[0] == '?')
3670 { 3287 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3288 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3289 Atom actual_type;
3673 int actual_format; 3290 int actual_format;
3674 unsigned long nitems; 3291 unsigned long nitems;
3675 unsigned long bytes_after; 3292 unsigned long bytes_after;
3676 unsigned char *value = 0; 3293 unsigned char *value = 0;
3677 const char *str = ""; 3294 const char *str = "";
3678 3295
3679 if (prop 3296 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3297 && XGetWindowProperty (dpy, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3298 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3299 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3300 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3301 && actual_type != None
3685 && actual_format == 8) 3302 && actual_format == 8)
3686 str = (const char *)(value); 3303 str = (const char *)(value);
3687 3304
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3305 tt_printf ("\033]%d;%s%c", op, str, resp);
3689 3306
3690 XFree (value); 3307 XFree (value);
3691 } 3308 }
3692 else 3309 else
3693 { 3310 {
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3311 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3312
3696 if (eq) 3313 if (eq)
3697 { 3314 {
3698 *eq = 0; 3315 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3316 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3317 }
3704 else 3318 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3319 XDeleteProperty (dpy, parent[0],
3706 display->atom (str)); 3320 display->atom (str));
3707 } 3321 }
3708 break; 3322 break;
3709 3323
3710 case XTerm_Color: 3324 case XTerm_Color:
… …
3712 { 3326 {
3713 if ((name = strchr (buf, ';')) == NULL) 3327 if ((name = strchr (buf, ';')) == NULL)
3714 break; 3328 break;
3715 3329
3716 *name++ = '\0'; 3330 *name++ = '\0';
3717 color = atoi (buf); 3331 color = atoi (buf) + minCOLOR;
3718 3332
3719 if (color < 0 || color >= TOTAL_COLORS) 3333 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3720 break; 3334 break;
3721 3335
3722 if ((buf = strchr (name, ';')) != NULL) 3336 if ((buf = strchr (name, ';')) != NULL)
3723 *buf++ = '\0'; 3337 *buf++ = '\0';
3724 3338
3725 if (name[0] == '?' && !name[1]) 3339 process_color_seq (op, color, name, resp);
3726 {
3727 unsigned short r, g, b;
3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3729 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3730 }
3731 else
3732 set_window_color (color + minCOLOR, name);
3733 } 3340 }
3734 break; 3341 break;
3735 case XTerm_Color00: 3342 case XTerm_Color00:
3736 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3343 process_color_seq (op, Color_fg, str, resp);
3737 break; 3344 break;
3738 case XTerm_Color01: 3345 case XTerm_Color01:
3739 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3346 process_color_seq (op, Color_bg, str, resp);
3740 break; 3347 break;
3741#ifndef NO_CURSORCOLOR 3348#ifndef NO_CURSORCOLOR
3742 case XTerm_Color_cursor: 3349 case XTerm_Color_cursor:
3743 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3350 process_color_seq (op, Color_cursor, str, resp);
3744 break; 3351 break;
3745#endif 3352#endif
3746 case XTerm_Color_pointer_fg: 3353 case XTerm_Color_pointer_fg:
3747 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3354 process_color_seq (op, Color_pointer_fg, str, resp);
3748 break; 3355 break;
3749 case XTerm_Color_pointer_bg: 3356 case XTerm_Color_pointer_bg:
3750 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3357 process_color_seq (op, Color_pointer_bg, str, resp);
3751 break; 3358 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3359#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break;
3762 case XTerm_Color_RV: 3360 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3361 process_color_seq (op, Color_RV, str, resp);
3764 break; 3362 break;
3363 case Rxvt_Color_BD:
3364 case URxvt_Color_BD:
3365 process_color_seq (op, Color_BD, str, resp);
3366 break;
3367 case Rxvt_Color_UL:
3368 case URxvt_Color_UL:
3369 process_color_seq (op, Color_UL, str, resp);
3370 break;
3371 case URxvt_Color_IT:
3372 process_color_seq (op, Color_IT, str, resp);
3373 break;
3765#endif 3374#endif
3766#if TRANSPARENT || TINTING 3375#if ENABLE_TRANSPARENCY
3767 case XTerm_Color_tint: 3376 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3377 process_color_seq (op, Color_tint, str, resp);
3769 check_our_parents (); 3378 {
3770 if (am_transparent) 3379 bool changed = false;
3771 want_full_refresh = want_refresh = 1; 3380 if (ISSET_PIXCOLOR (Color_tint))
3772 break; 3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3773#endif 3382 else
3383 changed = bgPixmap.unset_tint ();
3384 if (changed)
3385 update_background ();
3386 }
3774 3387
3388 break;
3389#endif
3390
3391#if BG_IMAGE_FROM_FILE
3775 case XTerm_Pixmap: 3392 case Rxvt_Pixmap:
3776 if (*str != ';') 3393 if (!strcmp (str, "?"))
3777 { 3394 {
3778#if XPM_BACKGROUND 3395 char str[256];
3779 scale_pixmap (""); /* reset to default scaling */ 3396
3780 set_bgPixmap (str); /* change pixmap */ 3397 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3781#endif 3398 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3782 scr_touch (true); 3399 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3400 process_xterm_seq (XTerm_title, str, CHAR_ST);
3783 } 3401 }
3784 while ((str = strchr (str, ';')) != NULL) 3402 else
3785 { 3403 {
3404 int changed = 0;
3405
3406 if (*str != ';')
3407 {
3408 /* reset to default scaling :*/
3409 bgPixmap.unset_geometry ();
3410 if (bgPixmap.set_file (str)) /* change pixmap */
3411 changed++;
3412 str = strchr (str, ';');
3413 if (str == NULL)
3414 bgPixmap.set_defaultGeometry ();
3415 }
3416 while (str)
3417 {
3786 str++; 3418 str++;
3787#if XPM_BACKGROUND 3419 if (bgPixmap.set_geometry (str))
3788 changed += scale_pixmap (str); 3420 changed++;
3789#endif 3421 str = strchr (str, ';');
3790 3422 }
3423 if (changed)
3424 update_background ();
3791 } 3425 }
3792 if (changed)
3793 {
3794#ifdef XPM_BACKGROUND
3795 resize_pixmap ();
3796#endif
3797 scr_touch (true);
3798 }
3799 break; 3426 break;
3427#endif
3800 3428
3801 case XTerm_restoreFG: 3429 case Rxvt_restoreFG:
3802 set_window_color (Color_fg, str); 3430 set_window_color (Color_fg, str);
3803 break; 3431 break;
3804 case XTerm_restoreBG: 3432 case Rxvt_restoreBG:
3805 set_window_color (Color_bg, str); 3433 set_window_color (Color_bg, str);
3806 break; 3434 break;
3807 3435
3808 case XTerm_logfile: 3436 case XTerm_logfile:
3809 // TODO, when secure mode? 3437 // TODO, when secure mode?
3810 break; 3438 break;
3811 3439
3440#if 0
3441 case Rxvt_dumpscreen: /* no error notices */
3442 {
3443 int fd;
3444 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3445 {
3446 scr_dump (fd);
3447 close (fd);
3448 }
3449 }
3450 break;
3451#endif
3812 case XTerm_font: 3452 case XTerm_font:
3813 op = URxvt_font; 3453 op = URxvt_font;
3814 case URxvt_font: 3454 case URxvt_font:
3815#if ENABLE_STYLES 3455#if ENABLE_STYLES
3816 case URxvt_boldFont: 3456 case URxvt_boldFont:
3817 case URxvt_italicFont: 3457 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3458 case URxvt_boldItalicFont:
3819#endif 3459#endif
3820 if (query) 3460 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3461 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3462 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3463 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3464 resp);
3825 else 3465 else
3826 { 3466 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3467 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3468
… …
3830 allocated.push_back ((void *)res); 3470 allocated.push_back ((void *)res);
3831 set_fonts (); 3471 set_fonts ();
3832 } 3472 }
3833 break; 3473 break;
3834 3474
3835#if ENABLE_FRILLS 3475 case URxvt_version:
3836 case XTerm_locale:
3837 if (query) 3476 if (query)
3477 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3478 op,
3479 rs[Rs_name], VERSION[0], VERSION[2],
3480 resp);
3481 break;
3482
3483#if !ENABLE_MINIMAL
3484 case URxvt_locale:
3485 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3486 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3839 else 3487 else
3840 { 3488 {
3841 set_locale (str); 3489 set_locale (str);
3842# ifdef USE_XIM 3490 pty->set_utf8_mode (enc_utf8);
3843 im_cb (); 3491 init_xlocale ();
3844# endif
3845 } 3492 }
3846 break; 3493 break;
3847#endif
3848 3494
3849#ifdef MENUBAR 3495 case URxvt_view_up:
3850 case XTerm_Menu: 3496 case URxvt_view_down:
3851 if (options & Opt_insecure) 3497 {
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3498 int lines = atoi (str);
3499
3500 if (lines)
3501 scr_page (op == URxvt_view_up ? UP : DN, lines);
3502 else
3503 scr_erase_savelines ();
3504 }
3505
3853 break; 3506 break;
3854#endif 3507#endif
3855#if 0 3508
3856 case XTerm_dumpscreen: /* no error notices */ 3509#if ENABLE_PERL
3857 { 3510 case URxvt_perl:
3858 int fd; 3511 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3512 ; // no responses yet
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break; 3513 break;
3866#endif 3514#endif
3867 } 3515 }
3868} 3516}
3869/*----------------------------------------------------------------------*/ 3517/*----------------------------------------------------------------------*/
… …
3900 return state; 3548 return state;
3901} 3549}
3902 3550
3903/* we're not using priv _yet_ */ 3551/* we're not using priv _yet_ */
3904void 3552void
3905rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3553rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3906{ 3554{
3907 unsigned int i, j; 3555 unsigned int i, j;
3908 int state; 3556 int state;
3909 3557
3910 static const struct 3558 static const struct
3911 { 3559 {
3912 const int argval; 3560 const int argval;
3913 const unsigned long bit; 3561 const unsigned long bit;
3914 }
3915
3916 argtopriv[] = { 3562 } argtopriv[] = {
3917 { 1, PrivMode_aplCUR }, 3563 { 1, PrivMode_aplCUR },
3918 { 2, PrivMode_vt52 }, 3564 { 2, PrivMode_vt52 },
3919 { 3, PrivMode_132 }, 3565 { 3, PrivMode_132 },
3920 { 4, PrivMode_smoothScroll }, 3566 { 4, PrivMode_smoothScroll },
3921 { 5, PrivMode_rVideo }, 3567 { 5, PrivMode_rVideo },
3922 { 6, PrivMode_relOrigin }, 3568 { 6, PrivMode_relOrigin },
3923 { 7, PrivMode_Autowrap }, 3569 { 7, PrivMode_Autowrap },
3924 // 8, bi-directional support mode 3570 // 8, bi-directional support mode
3925 { 9, PrivMode_MouseX10 }, 3571 { 9, PrivMode_MouseX10 },
3926#ifdef menuBar_esc
3927 { menuBar_esc, PrivMode_menuBar },
3928#endif
3929 // 18, 19 printing-related 3572 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor }, 3573 { 25, PrivMode_VisibleCursor },
3931#ifdef scrollBar_esc 3574#ifdef scrollBar_esc
3932 { scrollBar_esc, PrivMode_scrollBar }, 3575 { scrollBar_esc, PrivMode_scrollBar },
3933#endif 3576#endif
… …
3940 { 66, PrivMode_aplKP }, 3583 { 66, PrivMode_aplKP },
3941#ifndef NO_BACKSPACE_KEY 3584#ifndef NO_BACKSPACE_KEY
3942 { 67, PrivMode_BackSpace }, 3585 { 67, PrivMode_BackSpace },
3943#endif 3586#endif
3944 { 1000, PrivMode_MouseX11 }, 3587 { 1000, PrivMode_MouseX11 },
3945 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3588 { 1002, PrivMode_MouseBtnEvent },
3946 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3589 { 1003, PrivMode_MouseAnyEvent },
3947 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3948 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3949 { 1011, PrivMode_Keypress }, // rxvt extension 3591 { 1011, PrivMode_Keypress }, // rxvt extension
3950 // 1035 enable modifiers for alt, numlock NYI 3592 // 1035 enable modifiers for alt, numlock NYI
3951 // 1036 send ESC for meta keys NYI 3593 // 1036 send ESC for meta keys NYI
3952 // 1037 send DEL for keypad delete NYI 3594 // 1037 send DEL for keypad delete NYI
… …
3978 } 3620 }
3979 3621
3980 /* extra handling for values with state unkept */ 3622 /* extra handling for values with state unkept */
3981 switch (arg[i]) 3623 switch (arg[i])
3982 { 3624 {
3625#if ENABLE_STYLES
3626 case 1021:
3627 set_option (Opt_intensityStyles, mode);
3628
3629 scr_touch (true);
3630 break;
3631#endif
3983 case 1048: /* alternative cursor save */ 3632 case 1048: /* alternative cursor save */
3984 case 1049: 3633 case 1049:
3985 if (options & Opt_secondaryScreen) 3634 if (option (Opt_secondaryScreen))
3986 if (mode == 0) 3635 if (mode == 0)
3987 scr_cursor (RESTORE); 3636 scr_cursor (RESTORE);
3988 else if (mode == 1) 3637 else if (mode == 1)
3989 scr_cursor (SAVE); 3638 scr_cursor (SAVE);
3990 break; 3639 break;
… …
4002 */ 3651 */
4003 PrivMode (1, PrivMode_vt52); 3652 PrivMode (1, PrivMode_vt52);
4004 break; 3653 break;
4005 case 3: /* 80/132 */ 3654 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 3655 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3656 set_widthheight (((state ? 132 : 80) * fwidth), height);
4008 break; 3657 break;
4009 case 4: /* smooth scrolling */ 3658 case 4: /* smooth scrolling */
4010 if (state)
4011 options &= ~Opt_jumpScroll;
4012 else
4013 options |= Opt_jumpScroll; 3659 set_option (Opt_jumpScroll, !state);
4014 break; 3660 break;
4015 case 5: /* reverse video */ 3661 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 3662 scr_rvideo_mode (state);
4017 break; 3663 break;
4018 case 6: /* relative/absolute origins */ 3664 case 6: /* relative/absolute origins */
… …
4022 scr_autowrap (state); 3668 scr_autowrap (state);
4023 break; 3669 break;
4024 /* case 8: - auto repeat, can't do on a per window basis */ 3670 /* case 8: - auto repeat, can't do on a per window basis */
4025 case 9: /* X10 mouse reporting */ 3671 case 9: /* X10 mouse reporting */
4026 if (state) /* orthogonal */ 3672 if (state) /* orthogonal */
4027 priv_modes &= ~PrivMode_MouseX11; 3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4028 break; 3674 break;
4029#ifdef menuBar_esc
4030 case menuBar_esc:
4031#ifdef MENUBAR
4032 map_menuBar (state);
4033#endif
4034 break;
4035#endif
4036#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
4037 case scrollBar_esc: 3676 case scrollBar_esc:
4038 if (scrollbar_mapping (state)) 3677 if (scrollbar_mapping (state))
4039 { 3678 {
4040 resize_all_windows (0, 0, 0); 3679 resize_all_windows (0, 0, 0);
… …
4052 break; 3691 break;
4053 /* case 66: - application key pad */ 3692 /* case 66: - application key pad */
4054 /* case 67: - backspace key */ 3693 /* case 67: - backspace key */
4055 case 1000: /* X11 mouse reporting */ 3694 case 1000: /* X11 mouse reporting */
4056 if (state) /* orthogonal */ 3695 if (state) /* orthogonal */
4057 priv_modes &= ~PrivMode_MouseX10; 3696 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4058 break; 3697 break;
4059#if 0
4060 case 1001: 3698 case 1002:
4061 break; /* X11 mouse highlighting */ 3699 case 1003:
4062#endif 3700 if (state)
3701 {
3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3703 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3704 vt_emask_mouse = PointerMotionMask;
3705 }
3706 else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state)
4065 options &= ~Opt_scrollTtyOutput;
4066 else
4067 options |= Opt_scrollTtyOutput; 3711 set_option (Opt_scrollTtyOutput, !state);
4068 break; 3712 break;
4069 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
4070 if (state)
4071 options |= Opt_scrollTtyKeypress; 3714 set_option (Opt_scrollTtyKeypress, state);
4072 else
4073 options &= ~Opt_scrollTtyKeypress;
4074 break; 3715 break;
4075 case 1047: /* secondary screen w/ clearing last */ 3716 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 3717 if (option (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
4078 scr_erase_screen (2); 3719 scr_erase_screen (2);
4079 scr_change_screen (state); 3720 scr_change_screen (state);
4080 break; 3721 break;
4081 case 1049: /* secondary screen w/ clearing first */ 3722 case 1049: /* secondary screen w/ clearing first */
4082 scr_change_screen (state); 3723 scr_change_screen (state);
4083 if (options & Opt_secondaryScreen) 3724 if (option (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4085 scr_erase_screen (2); 3726 scr_erase_screen (2);
4086 break; 3727 break;
4087 default: 3728 default:
4088 break; 3729 break;
… …
4216 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
4217 break; 3858 break;
4218 3859
4219 //case 50: // not variable spacing 3860 //case 50: // not variable spacing
4220 3861
4221#ifndef NO_BRIGHTCOLOR 3862#if !ENABLE_MINIMAL
4222 case 90: 3863 case 90:
4223 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
4224 case 92: 3865 case 92:
4225 case 93: 3866 case 93:
4226 case 94: 3867 case 94:
… …
4238 case 106: 3879 case 106:
4239 case 107: 3880 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3881 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 3882 break;
4242#endif 3883#endif
4243
4244 } 3884 }
4245 } 3885 }
4246} 3886}
4247/*}}} */ 3887/*}}} */
4248 3888
… …
4251rxvt_term::process_graphics () 3891rxvt_term::process_graphics ()
4252{ 3892{
4253 unicode_t ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
4254 3894
4255 if (cmd == 'Q') 3895 if (cmd == 'Q')
3896 {
4256 { /* query graphics */ 3897 /* query graphics */
4257 tt_printf ("\033G0\012"); /* no graphics */ 3898 tt_printf ("\033G0\012"); /* no graphics */
4258 return; 3899 return;
4259 } 3900 }
4260 /* swallow other graphics sequences until terminating ':' */ 3901 /* swallow other graphics sequences until terminating ':' */
4261 do 3902 do
… …
4272 */ 3913 */
4273void 3914void
4274rxvt_term::tt_printf (const char *fmt,...) 3915rxvt_term::tt_printf (const char *fmt,...)
4275{ 3916{
4276 va_list arg_ptr; 3917 va_list arg_ptr;
4277 unsigned char buf[256]; 3918 char buf[256];
4278 3919
4279 va_start (arg_ptr, fmt); 3920 va_start (arg_ptr, fmt);
4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3921 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4281 va_end (arg_ptr); 3922 va_end (arg_ptr);
4282 tt_write (buf, strlen (buf)); 3923 tt_write (buf, strlen (buf));
… …
4284 3925
4285/* ---------------------------------------------------------------------- */ 3926/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 3927/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 3928 * or generated by us in response to a query ESC sequence.
4288 */ 3929 */
3930const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3931
4289void 3932void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3933rxvt_term::tt_write (const char *data, unsigned int len)
4291{ 3934{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3935 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3936 return;
4293 3937
4294 if (len) 3938 if (pty->pty < 0)
3939 return;
3940
3941 if (v_buflen == 0)
3942 {
3943 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3944
3945 if ((unsigned int)written == len)
3946 return;
3947
3948 data += written;
3949 len -= written;
4295 { 3950 }
3951
3952 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3953
3954 memcpy (v_buffer + v_buflen, data, len);
3955 v_buflen += len;
3956
3957 pty_ev.set (ev::READ | ev::WRITE);
3958}
3959
3960void rxvt_term::pty_write ()
3961{
3962 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3963
3964 if (written > 0)
3965 {
3966 v_buflen -= written;
3967
4296 if (v_buflen == 0) 3968 if (v_buflen == 0)
4297 { 3969 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 3970 free (v_buffer);
4325 v_buffer = 0; 3971 v_buffer = 0;
4326 v_buflen = 0;
4327 3972
4328 pty_ev.set (EVENT_READ); 3973 pty_ev.set (ev::READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 3974 return;
4341 } 3975 }
3976
3977 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 3978 }
3979 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3980 pty_ev.set (ev::READ);
4343} 3981}
4344 3982
4345/*----------------------- end-of-file (C source) -----------------------*/ 3983/*----------------------- end-of-file (C source) -----------------------*/
4346 3984

Diff Legend

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