ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC

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

Diff Legend

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