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

Diff Legend

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