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.364 by ayin, Mon Nov 12 14:53:13 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#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 + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
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
817void 1046void
818rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
819{ 1048{
820 SET_R (this); 1049 make_current ();
821 SET_LOCALE (locale);
822 1050
823 display->flush (); 1051 display->flush ();
824 1052
825 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
827} 1055}
828 1056
829void 1057void
830rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
831{ 1059{
832 SET_R (this); 1060 make_current ();
833 SET_LOCALE (locale);
834 1061
835 refresh_limit = 1;
836 refresh_count = 0; 1062 refresh_count = 0;
837 flush (); 1063 flush ();
838} 1064}
839 1065
840#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
841void 1067void
842rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
843{ 1069{
844 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
845 want_refresh = 1; 1071 want_refresh = 1;
846
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);
860 } 1083 }
861} 1084}
862#endif 1085#endif
863 1086
864#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
865void 1088void
866rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
867{ 1090{
868 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1; 1093 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
874 } 1095 w.stop ();
875} 1096}
876#endif 1097#endif
877 1098
878#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
879void 1100void
880rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
881{ 1102{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 { 1104 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1; 1106 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 } 1107 }
1108 else
1109 w.stop ();
889} 1110}
890#endif 1111#endif
891 1112
892#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
893void 1114void
894rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
895{ 1116{
896 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1120 {
900 refresh_type |= SMOOTH_REFRESH; 1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
901 want_refresh = 1; 1124 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 }
1126 else
1127 w.stop ();
1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
903 } 1147 }
904} 1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
905#endif 1154#endif
906 1155
907bool 1156bool
908rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
909{ 1158{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1160
912 if (CBUFSIZ == n) 1161 if (CBUFSIZ == n)
913 { 1162 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1164 n = 0;
916 } 1165 }
917 1166
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
921 1170
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
923 1172
924 if (n > 0) 1173 if (r > 0)
925 { 1174 {
926 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
927 return true; 1176 return true;
928 } 1177 }
929 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
930 destroy (); 1190 destroy ();
931 1191 }
1192
932 return false; 1193 return false;
933} 1194}
934 1195
935void 1196void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
937{ 1198{
938 SET_R (this); 1199 make_current ();
939 SET_LOCALE (locale);
940 1200
941 if (revents & EVENT_WRITE) 1201 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 1202 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1203 while (pty_fill ())
946 if (cmd_parse ()) 1204 if (cmd_parse ())
947 break; 1205 break;
1206
1207 if (revents & ev::WRITE)
1208 pty_write ();
948} 1209}
949 1210
950void 1211void
951rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
952{ 1213{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
954 recolour_cursor (); 1215 recolour_cursor ();
955 1216
956#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1218 hidden_pointer = 0;
958 1219
959 if (Options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
961#endif 1222#endif
962} 1223}
963 1224
964#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
965void 1226void
966rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
967{ 1228{
968 if (! (Options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
969 return; 1230 return;
970 1231
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
972 XFlush (display->display); 1233 XFlush (dpy);
973 1234
974 hidden_pointer = 1; 1235 hidden_pointer = 1;
975} 1236}
976 1237
977void 1238void
978rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
979{ 1240{
980 SET_R (this); 1241 make_current ();
981 SET_LOCALE (locale);
982 1242
983 pointer_blank (); 1243 pointer_blank ();
984} 1244}
985#endif 1245#endif
986 1246
987void 1247void
988rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
989{ 1249{
990 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
991 int x, y; 1251 int x, y;
1252 int code = 32;
992 1253
993 x = ev.x; 1254 x = Pixel2Col (ev.x);
994 y = ev.y; 1255 y = Pixel2Row (ev.y);
995 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify) {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
996 1263
997 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1265 button_number = 3;
1000 }
1001 else 1266 else
1002 { 1267 {
1003 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1270 if (button_number >= 3)
1006 button_number += (64 - 3); 1271 button_number += (64 - 3);
1007 } 1272 }
1008 1273
1009 if (PrivateModes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1010 { 1275 {
1011 /* 1276 /*
1012 * do not report ButtonRelease 1277 * do not report ButtonRelease
1013 * no state info allowed 1278 * no state info allowed
1014 */ 1279 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1294 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1295 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1296#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1297 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1298#endif
1034
1035 } 1299 }
1036 1300
1037#ifdef DEBUG_MOUSEREPORT 1301#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1302 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1303 if (key_state & 16)
1040 fputc ('C', stderr); 1304 fputc ('C', stderr);
1041 if (key_state & 4) 1305 if (key_state & 4)
1042 fputc ('S', stderr); 1306 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1310 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1312 button_number,
1049 x + 1, 1313 x + 1,
1050 y + 1); 1314 y + 1);
1051#else 1315#endif
1316
1052 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1054 (32 + x + 1), 1319 (32 + x + 1),
1055 (32 + y + 1)); 1320 (32 + y + 1));
1056#endif
1057} 1321}
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 1322
1069/*{{{ process an X event */ 1323/*{{{ process an X event */
1070void 1324void
1071rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1072{ 1326{
1073 SET_R (this); 1327 make_current ();
1074 SET_LOCALE (locale);
1075 1328
1076#if defined(CURSOR_BLINK) 1329 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 1330
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1331 if (ev.xany.window == vt
1086 } 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1333 && 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; 1334 return;
1106#endif
1107 1335
1336 // for XQueryPointer
1108 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1339 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 1340
1161 switch (ev.type) 1341 switch (ev.type)
1162 { 1342 {
1163 case KeyPress: 1343 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1344 key_press (ev.xkey);
1165 lookup_key (ev.xkey);
1166
1167 break; 1345 break;
1168 1346
1169 case KeyRelease: 1347 case KeyRelease:
1170 { 1348 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; 1349 break;
1221 }
1222 1350
1223 case ButtonPress: 1351 case ButtonPress:
1224 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1225 break; 1353 break;
1226 1354
… …
1228 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1229 break; 1357 break;
1230 1358
1231 case ClientMessage: 1359 case ClientMessage:
1232 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1361 && !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 { 1362 {
1242 /* Get Dnd data */ 1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1243 Atom ActualType; 1364 {
1244 int ActualFormat; 1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1245 unsigned char *data; 1366 {
1246 unsigned long Size, RemainingBytes; 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1247 1368 {
1248 XGetWindowProperty (display->display, display->root, 1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1249 xa[XA_DNDSELECTION], 1370 destroy ();
1250 0L, 1000000L, 1371 }
1251 False, AnyPropertyType, 1372#if ENABLE_EWMH
1252 &ActualType, &ActualFormat, 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1253 &Size, &RemainingBytes, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1254 &data); 1376 &ev);
1255 XChangeProperty (display->display, display->root, 1377#endif
1256 XA_CUT_BUFFER0, XA_STRING, 1378 }
1257 8, PropModeReplace, 1379 }
1258 data, STRLEN (data)); 1380#if ENABLE_XEMBED
1259 XFree (data); 1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1382 {
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1388#endif
1262 } 1389 }
1263#endif /* OFFIX_DND */
1264 break;
1265
1266 case MappingNotify:
1267 XRefreshKeyboardMapping (&ev.xmapping);
1268 break; 1390 break;
1269 1391
1270 /* 1392 /*
1271 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1272 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1291 break; 1413 break;
1292 } 1414 }
1293 break; 1415 break;
1294 1416
1295 case FocusIn: 1417 case FocusIn:
1296 if (!TermWin.focus) 1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1421 focus_in ();
1422 break;
1423
1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0])
1297 { 1436 {
1298 TermWin.focus = 1; 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1438 ;
1300#ifdef USE_XIM 1439
1301 if (Input_Context != NULL) 1440 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 { 1441 {
1311 PixColors = PixColorsFocused; 1442 seen_resize = 1;
1312 set_colorfgbg (); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1444 }
1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1316#endif 1450#endif
1317 1451 }
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1318 } 1453 }
1319 break; 1454 break;
1320 1455
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: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1461
1380 break; 1462 break;
1381 1463
1382 case SelectionClear: 1464 case SelectionClear:
1383 selection_clear (); 1465 selection_clear ();
1384 break; 1466 break;
1385 1467
1386 case SelectionNotify: 1468 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1469 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1471 break;
1391 1472
1392 case SelectionRequest: 1473 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1394 break; 1475 break;
1395 1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1481#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break;
1484
1396 case UnmapNotify: 1485 case UnmapNotify:
1397 TermWin.mapped = 0; 1486 mapped = 0;
1398#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1400#endif 1489#endif
1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1401 break; 1491 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 1492
1416 case GraphicsExpose: 1493 case GraphicsExpose:
1417 case Expose: 1494 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1495 if (ev.xany.window == vt)
1419 { 1496 {
1420 do 1497 do
1498 {
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1424 1503
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1505
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1430 1510 }
1431 scr_refresh (refresh_type); 1511 want_refresh = 1;
1432 } 1512 }
1433 else 1513 else
1434 { 1514 {
1435 XEvent unused_event; 1515 XEvent unused_event;
1436 1516
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1438 ; 1518 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1520 ;
1441 1521
1442 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1443 { 1523 {
1444 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1445 scrollbar_show (0); 1525 scrollbar_show (0);
1446 } 1526 }
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 } 1527 }
1457 break; 1528 break;
1458 1529
1459 case MotionNotify: 1530 case MotionNotify:
1460#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1532 if (hidden_pointer)
1462 pointer_unblank (); 1533 pointer_unblank ();
1463#endif 1534#endif
1464#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1465 if (isMenuBarWindow (ev.xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1537 mouse_report (ev.xbutton);
1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1539 break;
1540
1541 if (ev.xany.window == vt)
1466 { 1542 {
1467 menubar_control (ev.xbutton); 1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1545 ; // 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))) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1547 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1479 ; 1549 ;
1480 1550
1481 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (dpy, vt,
1482 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1555 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1559 {
1490#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1493#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1575 {
1497 int dist; 1576 int dist;
1498 1577
1499 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1501 */ 1580 */
1502 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.active)
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1504 1583
1505 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1507 */ 1586 */
1508 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1590
1513 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1515 { 1593 {
1516 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1518 } 1596 }
1519 else 1597 else
1520 { 1598 {
1521 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1600 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1601 }
1602
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1527 MIN_IT (scroll_selection_lines, 1606 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1529 } 1608 }
1530 else 1609 else
1531 { 1610 {
1532 /* we are within the text window, so we 1611 /* we are within the text window, so we
1533 * shouldn't be scrolling 1612 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1614 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1537 } 1616 }
1538#endif 1617#endif
1539#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1540
1541 } 1619 }
1542#endif 1620#endif
1543
1544 } 1621 }
1545 } 1622 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1624 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1549 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1550 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1551 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1633 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1635 scrollbar_size ());
1557 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1636 want_refresh = 1;
1559 scrollbar_show (1); 1637 scrollbar_show (1);
1560 } 1638 }
1561 break; 1639 break;
1562 } 1640 }
1563}
1564 1641
1565#if TRANSPARENT 1642#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again ();
1652 }
1653#endif
1654
1655#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 {
1658 if (ev.type == MotionNotify
1659 || ev.type == ButtonPress
1660 || ev.type == ButtonRelease)
1661 if (hidden_pointer)
1662 pointer_unblank ();
1663
1664 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank ();
1666 }
1667#endif
1668}
1669
1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM
1681 if (Input_Context != NULL)
1682 {
1683 IMSetPosition ();
1684 XSetICFocus (Input_Context);
1685 }
1686#endif
1687#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1690#endif
1691#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade])
1693 {
1694 pix_colors = pix_colors_focused;
1695 scr_recolour ();
1696 }
1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1708 }
1709}
1710
1711void
1712rxvt_term::focus_out ()
1713{
1714 if (focus)
1715 {
1716 focus = 0;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1720
1721#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf)
1723 {
1724 iso14755buf = 0;
1725# if ISO_14755
1726 scr_overlay_off ();
1727# endif
1728 }
1729#endif
1730#if USE_XIM
1731 if (Input_Context != NULL)
1732 XUnsetICFocus (Input_Context);
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.stop ();
1737
1738 hidden_cursor = 0;
1739#endif
1740#if OFF_FOCUS_FADING
1741 if (rs[Rs_fade])
1742 {
1743 pix_colors = pix_colors_unfocused;
1744 scr_recolour ();
1745 }
1746#endif
1747 }
1748}
1749
1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1566void 1764void
1567rxvt_term::rootwin_cb (XEvent &ev) 1765rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1766{
1569 SET_R (this); 1767 make_current ();
1570 SET_LOCALE (locale);
1571 1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1572 switch (ev.type) 1774 switch (ev.type)
1573 { 1775 {
1574 case PropertyNotify: 1776 case PropertyNotify:
1575 /* 1777 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1577 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1578 */ 1780 */
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]) 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1583 return; 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1584 1783 {
1585 /* FALLTHROUGH */ 1784 bgPixmap.set_root_pixmap ();
1586 case ReparentNotify: 1785 update_background ();
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1786 }
1588 want_refresh = want_full_refresh = 1;
1589 break; 1787 break;
1590 } 1788 }
1789# endif
1591} 1790}
1592#endif 1791#endif
1593 1792
1594void 1793void
1595rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1596{ 1795{
1597 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1598 1797
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1799
1600 if (!bypass_keystate) 1800 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1602 /* 1803 /*
1603 * VT window processing of button press 1804 * VT window processing of button press
1604 */ 1805 */
1605 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1606 { 1807 {
1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1811#if ISO_14755
1812 // 5.4
1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1814 {
1815 iso14755_54 (ev.x, ev.y);
1816 return;
1817 }
1818#endif
1819
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1820 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1821
1608 if (reportmode) 1822 if (reportmode)
1609 { 1823 {
1610 /* mouse report from vt window */ 1824 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1825 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1826 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1827#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1828 if (ev.button == MEvent.button && clickintime)
1615 { 1829 {
1616 /* same button, within alloted time */ 1830 /* same button, within alloted time */
1617 MEvent.clicks++; 1831 MEvent.clicks++;
1832
1618 if (MEvent.clicks > 1) 1833 if (MEvent.clicks > 1)
1619 { 1834 {
1620 /* only report double clicks */ 1835 /* only report double clicks */
1621 MEvent.clicks = 2; 1836 MEvent.clicks = 2;
1622 mouse_report (ev); 1837 mouse_report (ev);
… …
1641 } 1856 }
1642 else 1857 else
1643 { 1858 {
1644 if (ev.button != MEvent.button) 1859 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1860 MEvent.clicks = 0;
1861
1646 switch (ev.button) 1862 switch (ev.button)
1647 { 1863 {
1648 case Button1: 1864 case Button1:
1865 /* allow meta + click to select rectangular areas */
1866 /* should be done in screen.C */
1867#if ENABLE_FRILLS
1868 selection.rect = !!(ev.state & ModMetaMask);
1869#else
1870 selection.rect = false;
1871#endif
1872
1649 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1875 {
1652 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1654 else 1878 else
1655 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1894 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1895 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1896 selection_rotate (ev.x, ev.y);
1673 else 1897 else
1674 selection_extend (ev.x, ev.y, 1); 1898 selection_extend (ev.x, ev.y, 1);
1899
1675 MEvent.button = Button3; 1900 MEvent.button = Button3;
1676 break; 1901 break;
1677 } 1902 }
1678 } 1903 }
1904
1679 MEvent.time = ev.time; 1905 MEvent.time = ev.time;
1680 return; 1906 return;
1681 } 1907 }
1682 1908
1683 /* 1909 /*
… …
1749 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1750 } 1976 }
1751 if (upordown) 1977 if (upordown)
1752 { 1978 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1755#endif 1981#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1)) 1982 if (scr_page (upordown < 0 ? UP : DN, 1))
1757 { 1983 {
1758 if (upordown < 0) 1984 if (upordown < 0)
1759 scrollBar.setUp (); 1985 scrollBar.setUp ();
… …
1794 case Button3: 2020 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2021 if (scrollBar.style != R_SB_XTERM)
1796 { 2022 {
1797 if (scrollbar_above_slider (ev.y)) 2023 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2024# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2025 scr_page (UP, nrow - 1);
1800# else 2026# else
1801 scr_page (UP, TermWin.nrow / 4); 2027 scr_page (UP, nrow / 4);
1802# endif 2028# endif
1803 else if (scrollbar_below_slider (ev.y)) 2029 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2030# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2031 scr_page (DN, nrow - 1);
1806# else 2032# else
1807 scr_page (DN, TermWin.nrow / 4); 2033 scr_page (DN, nrow / 4);
1808# endif 2034# endif
1809 else 2035 else
1810 scrollBar.setMotion (); 2036 scrollBar.setMotion ();
1811 } 2037 }
1812 else 2038 else
1813 { 2039 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2040 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2041 (nrow
1816 * scrollbar_position (ev.y) 2042 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2043 / scrollbar_size ()));
1818 } 2044 }
1819 2045
1820 break; 2046 break;
1821 } 2047 }
1822 } 2048 }
2049
1823 return; 2050 return;
1824 } 2051 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2052}
1833 2053
1834void 2054void
1835rxvt_term::button_release (XButtonEvent &ev) 2055rxvt_term::button_release (XButtonEvent &ev)
1836{ 2056{
1837 int reportmode = 0; 2057 int reportmode = 0;
1838 2058
1839 csrO = 0; /* reset csr Offset */ 2059 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2060 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2061 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2062
1843 if (scrollbar_isUpDn ()) 2063 if (scrollbar_isUpDn ())
1844 { 2064 {
1845 scrollBar.setIdle (); 2065 scrollBar.setIdle ();
1846 scrollbar_show (0); 2066 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2067 }
2068
1852#ifdef SELECTION_SCROLLING 2069#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2070 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
1855#endif 2072#endif
2073
1856 if (ev.window == TermWin.vt) 2074 if (ev.window == vt)
1857 { 2075 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2077 return;
2078
2079#if ISO_14755
2080 // 5.4
2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2082 return;
2083#endif
2084
1858 if (reportmode) 2085 if (reportmode)
1859 { 2086 {
1860 /* mouse report from vt window */ 2087 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
1877 mouse_report (ev); 2104 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2106 return;
1880 } 2107 }
2108
1881 /* 2109 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2111 * when overriding mouse reporting
1884 */ 2112 */
1885 if (PrivateModes & PrivMode_mouse_report 2113 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2114 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2115 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2116 selection_extend (ev.x, ev.y, 0);
1889 2117
1890 switch (ev.button) 2118 switch (ev.button)
1891 { 2119 {
1892 case Button1: 2120 case Button1:
1893 case Button3: 2121 case Button3:
1894 selection_make (ev.time); 2122 selection_make (ev.time);
1895 break; 2123 break;
2124
1896 case Button2: 2125 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1898 break; 2128 break;
2129
1899#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
1900 case Button4: 2131 case Button4:
1901 case Button5: 2132 case Button5:
1902 { 2133 {
1903 int i; 2134 int i;
… …
1905 2136
1906 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
1907 2138
1908 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1909 i = 1; 2140 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2141 else if (option (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1912 else 2143 else
1913 i = 5; 2144 i = 5;
1914 2145
1915# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1917 { 2148 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2152
1922 if (slip_wheel_ev.at < NOW) 2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924
1925 slip_wheel_ev.start ();
1926 } 2154 }
1927 else 2155 else
1928 { 2156 {
1929# endif 2157# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2158 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2159 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 2160# ifdef MOUSE_SLIP_WHEELING
1943 } 2161 }
1944#endif 2162# endif
1945 } 2163 }
1946 break; 2164 break;
1947#endif 2165#endif
1948 } 2166 }
1949 } 2167 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2168}
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 2169
2432/*}}} */ 2170/*}}} */
2433 2171
2434bool 2172bool
2435rxvt_term::cmd_parse () 2173rxvt_term::cmd_parse ()
2436{ 2174{
2437 bool flag = false; 2175 bool flag = false;
2438 unicode_t ch = NOCHAR; 2176 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2177 char *seq_begin; // remember start of esc-sequence here
2440 2178
2441 for (;;) 2179 for (;;)
2442 { 2180 {
2443 if (ch == NOCHAR) 2181 if (ch == NOCHAR)
2444 { 2182 {
2445 seq_begin = cmdbuf_ptr; 2183 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2184 ch = next_char ();
2447 }
2448 2185
2449 if (ch == NOCHAR) // TODO: improve 2186 if (ch == NOCHAR)
2450 break; 2187 break;
2188 }
2451 2189
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2190 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2191 {
2192 if (!seen_input)
2193 {
2194 seen_input = 1;
2195 // many badly-written programs (e.g. jed) contain a race condition:
2196 // they first read the screensize and then install a SIGWINCH handler.
2197 // some window managers resize the window early, and these programs
2198 // then sometimes get the size wrong.
2199 // unfortunately other programs are even more buggy and dislike
2200 // being sent SIGWINCH, so only do it when we were in fact being
2201 // resized.
2202 if (seen_resize && cmd_pid)
2203 kill (-cmd_pid, SIGWINCH);
2204 }
2205
2454 /* Read a text string from the input buffer */ 2206 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2207 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2208 bool refreshnow = false;
2457 int nlines = 0; 2209 int nlines = 0;
2458 unicode_t *str = buf; 2210 wchar_t *str = buf;
2211 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2212
2460 for (;;) 2213 for (;;)
2461 { 2214 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2215 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2216 break;
2464 2217
2465 *str++ = ch; 2218 *str++ = ch;
2466 2219
2467 if (ch == C0_LF) 2220 if (ch == C0_LF || str >= eol)
2468 { 2221 {
2222 if (ch == C0_LF)
2469 nlines++; 2223 nlines++;
2224
2470 refresh_count++; 2225 refresh_count++;
2471 2226
2472 if (!(Options & Opt_jumpScroll) 2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2228 {
2229 refresh_count = 0;
2230
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2232 {
2475 refreshnow = true; 2233 refreshnow = true;
2476 ch = NOCHAR; 2234 ch = NOCHAR;
2477 break; 2235 break;
2236 }
2478 } 2237 }
2479 2238
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2239 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2240 if (nlines >= nrow - 1)
2482 { 2241 {
2242 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2243 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2244 scr_add_lines (buf, str - buf, nlines);
2245
2484 nlines = 0; 2246 nlines = 0;
2485 str = buf; 2247 str = buf;
2248 eol = str + min (ncol, UBUFSIZ);
2486 } 2249 }
2487 }
2488 2250
2489 if (str >= buf + UBUFSIZ) 2251 if (str >= eol)
2490 { 2252 {
2253 if (eol >= buf + UBUFSIZ)
2254 {
2491 ch = NOCHAR; 2255 ch = NOCHAR;
2492 break; 2256 break;
2257 }
2258 else
2259 eol = min (eol + ncol, buf + UBUFSIZ);
2260 }
2261
2493 } 2262 }
2494 2263
2495 seq_begin = cmdbuf_ptr; 2264 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2265 ch = next_char ();
2497 } 2266 }
2498 2267
2268 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2269 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2270 scr_add_lines (buf, str - buf, nlines);
2500 2271
2501 /* 2272 /*
2502 * If there have been a lot of new lines, then update the screen 2273 * 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. 2274 * 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 2275 * if skipScroll is enabled.
2505 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2276 */
2507 if (refreshnow) 2277 if (refreshnow)
2508 { 2278 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++;
2511 else
2512 {
2513 flag = true; 2279 flag = true;
2514 scr_refresh (refresh_type); 2280 scr_refresh ();
2515 } 2281 want_refresh = 1;
2516 } 2282 }
2517 2283
2518 } 2284 }
2519 else 2285 else
2520 { 2286 {
… …
2534 } 2300 }
2535 2301
2536 return flag; 2302 return flag;
2537} 2303}
2538 2304
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 2305// read the next character
2549unicode_t 2306wchar_t
2550rxvt_term::next_char () 2307rxvt_term::next_char () NOTHROW
2551{ 2308{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2309 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2310 {
2554 // assume 7-bit to be ascii ALWAYS 2311 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2312 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2313 return *cmdbuf_ptr++;
2557 2314
2558 wchar_t wc; 2315 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2316 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2317
2561 if (len == (size_t)-2) 2318 if (len == (size_t)-2)
2562 { 2319 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2320 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2321 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2322 break;
2566 } 2323 }
2567 2324
2568 if (len == (size_t)-1) 2325 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2326 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2327
2571 // assume wchar == unicode 2328 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2329 cmdbuf_ptr += len;
2573 return wc; 2330 return wc & UNICODE_MASK;
2574 } 2331 }
2575 2332
2576 return NOCHAR; 2333 return NOCHAR;
2577} 2334}
2335
2336// read the next octet
2337uint32_t
2338rxvt_term::next_octet () NOTHROW
2339{
2340 return cmdbuf_ptr < cmdbuf_endp
2341 ? (unsigned char)*cmdbuf_ptr++
2342 : NOCHAR;
2343}
2344
2345static class out_of_input out_of_input;
2578 2346
2579/* rxvt_cmd_getc () - Return next input character */ 2347/* rxvt_cmd_getc () - Return next input character */
2580/* 2348/*
2581 * Return the next input character after first passing any keyboard input 2349 * Return the next input character after first passing any keyboard input
2582 * to the command. 2350 * to the command.
2583 */ 2351 */
2584unicode_t 2352wchar_t
2585rxvt_term::cmd_getc () 2353rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2354{
2587 unicode_t c = next_char (); 2355 wchar_t c = next_char ();
2588 2356
2589 if (c == NOCHAR) 2357 if (c == NOCHAR)
2590 throw out_of_input; 2358 throw out_of_input;
2591 2359
2592 return c; 2360 return c;
2593} 2361}
2594 2362
2595unicode_t 2363uint32_t
2596rxvt_term::cmd_get8 () 2364rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2365{
2598 unicode_t c = next_octet (); 2366 uint32_t c = next_octet ();
2599 2367
2600 if (c == NOCHAR) 2368 if (c == NOCHAR)
2601 throw out_of_input; 2369 throw out_of_input;
2602 2370
2603 return c; 2371 return c;
… …
2667 { 2435 {
2668 if ((buf[len++] = cmd_getc ()) == 'i') 2436 if ((buf[len++] = cmd_getc ()) == 'i')
2669 break; /* done = 1 */ 2437 break; /* done = 1 */
2670 } 2438 }
2671 } 2439 }
2672 2440
2673 for (i = 0; i < len; i++) 2441 for (i = 0; i < len; i++)
2674 if (putc (buf[i], fd) == EOF) 2442 if (putc (buf[i], fd) == EOF)
2675 { 2443 {
2676 done = 1; 2444 done = 1;
2677 break; 2445 break;
… …
2703 case C0_ESC: 2471 case C0_ESC:
2704 process_escape_seq (); 2472 process_escape_seq ();
2705 break; 2473 break;
2706 case C0_ENQ: /* terminal Status */ 2474 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2475 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2476 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2477 else
2711 tt_write ((unsigned char *)VT100_ANS, 2478 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2479 break;
2714 case C0_BEL: /* bell */ 2480 case C0_BEL: /* bell */
2715 scr_bell (); 2481 scr_bell ();
2716 break; 2482 break;
2717 case C0_BS: /* backspace */ 2483 case C0_BS: /* backspace */
… …
2741 process_dcs_seq (); 2507 process_dcs_seq ();
2742 break; 2508 break;
2743 case 0x9b: /* CSI */ 2509 case 0x9b: /* CSI */
2744 process_csi_seq (); 2510 process_csi_seq ();
2745 break; 2511 break;
2746 case 0x9d: /* CSI */ 2512 case 0x9d: /* OSC */
2747 process_osc_seq (); 2513 process_osc_seq ();
2748 break; 2514 break;
2749#endif 2515#endif
2750 } 2516 }
2751} 2517}
… …
2816void 2582void
2817rxvt_term::process_escape_seq () 2583rxvt_term::process_escape_seq ()
2818{ 2584{
2819 unicode_t ch = cmd_getc (); 2585 unicode_t ch = cmd_getc ();
2820 2586
2821 if (PrivateModes & PrivMode_vt52) 2587 if (priv_modes & PrivMode_vt52)
2822 { 2588 {
2823 process_escape_vt52 (ch); 2589 process_escape_vt52 (ch);
2824 return; 2590 return;
2825 } 2591 }
2826 2592
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2607 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2608 break;
2843 case '+': 2609 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2610 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2611 break;
2846#ifndef NO_FRILLS 2612#if !ENABLE_MINIMAL
2847 case '6': 2613 case '6':
2848 scr_backindex (); 2614 scr_backindex ();
2849 break; 2615 break;
2850#endif 2616#endif
2851 case '7': 2617 case '7':
2852 scr_cursor (SAVE); 2618 scr_cursor (SAVE);
2853 break; 2619 break;
2854 case '8': 2620 case '8':
2855 scr_cursor (RESTORE); 2621 scr_cursor (RESTORE);
2856 break; 2622 break;
2857#ifndef NO_FRILLS 2623#if !ENABLE_MINIMAL
2858 case '9': 2624 case '9':
2859 scr_forwardindex (); 2625 scr_forwardindex ();
2860 break; 2626 break;
2861#endif 2627#endif
2862 case '=': 2628 case '=':
… …
2872 break; 2638 break;
2873 2639
2874 /* 8.3.87: NEXT LINE */ 2640 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 2641 case C1_NEL: /* ESC E */
2876 { 2642 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 2643 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 2644 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 2645 }
2880 break; 2646 break;
2881 2647
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 2648 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 2649 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 2671 process_dcs_seq ();
2906 break; 2672 break;
2907 2673
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2674 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 2675 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 2676 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 2677 break; /* steal obsolete ESC [ c */
2913 2678
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2679 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 2680 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 2681 process_csi_seq ();
… …
2978rxvt_term::process_csi_seq () 2743rxvt_term::process_csi_seq ()
2979{ 2744{
2980 unicode_t ch, priv, i; 2745 unicode_t ch, priv, i;
2981 unsigned int nargs, p; 2746 unsigned int nargs, p;
2982 int n, ndef; 2747 int n, ndef;
2983 int arg[ESC_ARGS]; 2748 int arg[ESC_ARGS] = { };
2984 2749
2985 for (nargs = ESC_ARGS; nargs > 0;) 2750 nargs = 0;
2986 arg[--nargs] = 0;
2987 2751
2988 priv = 0; 2752 priv = 0;
2989 ch = cmd_getc (); 2753 ch = cmd_getc ();
2990 if (ch >= '<' && ch <= '?') 2754 if (ch >= '<' && ch <= '?')
2991 { /* '<' '=' '>' '?' */ 2755 { /* '<' '=' '>' '?' */
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 2789 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 2790 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 2791 if (arg[p] == -1)
3028 arg[p] = ndef; 2792 arg[p] = ndef;
3029 2793
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 /* 2794 /*
3038 * private mode handling 2795 * private mode handling
3039 */ 2796 */
3040 if (priv) 2797 if (priv)
3041 { 2798 {
3042 switch (priv) 2799 switch (priv)
3043 { 2800 {
3044 case '>': 2801 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 2802 if (ch == CSI_DA) /* secondary device attributes */
2803 {
2804 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2805 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2806 //
2807 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2808 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2809 // versions.
2810 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2811 tt_printf ("\033[>%d;95;0c", 'U');
2812 }
3047 break; 2813 break;
3048 case '?': 2814 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 2816 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 2817 break;
… …
3156 2922
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2923 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 2924 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 2925 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2926 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2927 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 2928 break;
3163 2929
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2930 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 2931 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 2932 break;
3168 2933
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2934 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 2935 process_sgr_mode (nargs, arg);
3171 break; 2936 break;
… …
3178 break; 2943 break;
3179 case 6: /* CPR requested */ 2944 case 6: /* CPR requested */
3180 scr_report_position (); 2945 scr_report_position ();
3181 break; 2946 break;
3182 case 7: /* unofficial extension */ 2947 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 2948 if (option (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2949 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 2950 break;
3186 case 8: /* unofficial extension */ 2951 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2952 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 2953 break;
3189 } 2954 }
… …
3225 break; 2990 break;
3226 2991
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 2992 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 2993 if (arg[0] == 4)
3229 scr_insert_mode (0); 2994 scr_insert_mode (0);
2995 else if (arg[0] == 20)
2996 priv_modes &= ~PrivMode_LFNL;
3230 break; 2997 break;
3231 2998
3232 case CSI_SM: /* 8.3.126: SET MODE */ 2999 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3000 if (arg[0] == 4)
3234 scr_insert_mode (1); 3001 scr_insert_mode (1);
3002 else if (arg[0] == 20)
3003 priv_modes |= PrivMode_LFNL;
3235 break; 3004 break;
3236 3005
3237 /* 3006 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3007 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3008 */
… …
3251 break; 3020 break;
3252 case CSI_75: 3021 case CSI_75:
3253 scr_cursor (RESTORE); 3022 scr_cursor (RESTORE);
3254 break; 3023 break;
3255 3024
3256#ifndef NO_FRILLS 3025#if !ENABLE_MINIMAL
3257 case CSI_74: 3026 case CSI_74:
3258 process_window_ops (arg, nargs); 3027 process_window_ops (arg, nargs);
3259 break; 3028 break;
3260#endif 3029#endif
3261 3030
… …
3268 break; 3037 break;
3269 } 3038 }
3270} 3039}
3271/*}}} */ 3040/*}}} */
3272 3041
3273#ifndef NO_FRILLS 3042#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3043/* ARGSUSED */
3275void 3044void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3045rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3046{
3278 int x, y; 3047 int x, y;
3279 XWindowAttributes wattr; 3048 XWindowAttributes wattr;
3280 Window wdummy; 3049 Window wdummy;
3050
3051 dLocal (Display *, dpy);
3281 3052
3282 if (nargs == 0) 3053 if (nargs == 0)
3283 return; 3054 return;
3284 3055
3285 switch (args[0]) 3056 switch (args[0])
3286 { 3057 {
3287 /* 3058 /*
3288 * commands 3059 * commands
3289 */ 3060 */
3290 case 1: /* deiconify window */ 3061 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3062 XMapWindow (dpy, parent[0]);
3292 break; 3063 break;
3293 case 2: /* iconify window */ 3064 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3065 XIconifyWindow (dpy, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3066 break;
3297 case 3: /* set position (pixels) */ 3067 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3068 XMoveWindow (dpy, parent[0], args[1], args[2]);
3299 break; 3069 break;
3300 case 4: /* set size (pixels) */ 3070 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3071 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3072 break;
3303 case 5: /* raise window */ 3073 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3074 XRaiseWindow (dpy, parent[0]);
3305 break; 3075 break;
3306 case 6: /* lower window */ 3076 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3077 XLowerWindow (dpy, parent[0]);
3308 break; 3078 break;
3309 case 7: /* refresh window */ 3079 case 7: /* refresh window */
3310 scr_touch (true); 3080 scr_touch (true);
3311 break; 3081 break;
3312 case 8: /* set size (chars) */ 3082 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3083 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3084 (unsigned int) (args[1] * fheight));
3315 break; 3085 break;
3316 3086
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3087 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3088 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3089 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3090 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3091 (unsigned int) (args[1] * fheight));
3322 break; 3092 break;
3323
3324 3093
3325 /* 3094 /*
3326 * reports - some output format copied from XTerm 3095 * reports - some output format copied from XTerm
3327 */ 3096 */
3328 case 11: /* report window state */ 3097 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3098 XGetWindowAttributes (dpy, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3099 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3100 break;
3332 case 13: /* report window position */ 3101 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3102 XGetWindowAttributes (dpy, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3103 XTranslateCoordinates (dpy, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3104 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3105 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3106 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3107 break;
3339 case 14: /* report window size (pixels) */ 3108 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3110 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3111 break;
3343 case 18: /* report text area size (chars) */ 3112 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3113 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3114 break;
3346 case 19: /* report window size (chars) */ 3115 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3116 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3117 break;
3349 case 20: /* report icon label */ 3118 case 20: /* report icon label */
3350 { 3119 {
3351 char *s; 3120 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3121 XGetIconName (dpy, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3122 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3123 XFree (s);
3355 } 3124 }
3356 break; 3125 break;
3357 case 21: /* report window title */ 3126 case 21: /* report window title */
3358 { 3127 {
3359 char *s; 3128 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3129 XFetchName (dpy, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3130 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3131 XFree (s);
3363 } 3132 }
3364 break; 3133 break;
3365 } 3134 }
3366} 3135}
… …
3369/*----------------------------------------------------------------------*/ 3138/*----------------------------------------------------------------------*/
3370/* 3139/*
3371 * get input up until STRING TERMINATOR (or BEL) 3140 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3141 * ends_how is terminator used. returned input must be free()'d
3373 */ 3142 */
3374unsigned char * 3143char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3144rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3145{
3377 unicode_t prev = 0, ch; 3146 unicode_t ch;
3147 bool seen_esc = false;
3378 unsigned int n = 0; 3148 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3149 wchar_t string[STRING_MAX];
3381 3150
3382 while ((ch = cmd_getc ()) != NOCHAR) 3151 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3152 {
3384 if (prev == C0_ESC) 3153 if (seen_esc)
3385 { 3154 {
3386 if (ch == 0x5c) /* 7bit ST */ 3155 if (ch == 0x5c) /* 7bit ST */
3387 break; 3156 break;
3388 else 3157 else
3389 return NULL; 3158 return NULL;
3390 } 3159 }
3160 else if (ch == C0_ESC)
3161 {
3162 seen_esc = true;
3163 continue;
3164 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3165 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3166 break;
3167 else if (ch == C0_SYN)
3168 ch = cmd_get8 ();
3393 else if (ch < 0x20) 3169 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3170 return NULL; /* other control character - exit */
3395 3171
3396 if (n >= sizeof (string) - 1) 3172 seen_esc = false;
3173
3174 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3175 // stop at some sane length
3398 return NULL; 3176 return NULL;
3399 3177
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
3406 string[n++] = prev = ch; 3178 string[n++] = ch;
3407 } 3179 }
3408 3180
3409 string[n++] = '\0'; 3181 string[n++] = '\0';
3410 3182
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3183 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3184
3416 return s; 3185 return rxvt_wcstombs (string);
3417} 3186}
3418 3187
3419/*----------------------------------------------------------------------*/ 3188/*----------------------------------------------------------------------*/
3420/* 3189/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3190 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3191 */
3423void 3192void
3424rxvt_term::process_dcs_seq () 3193rxvt_term::process_dcs_seq ()
3425{ 3194{
3426 unsigned char *s; 3195 char *s;
3427 unicode_t eh; 3196 unicode_t eh;
3428 3197
3429 /* 3198 /*
3430 * Not handled yet 3199 * Not handled yet
3431 */ 3200 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3219 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3220 arg = arg * 10 + (ch - '0');
3452 3221
3453 if (ch == ';') 3222 if (ch == ';')
3454 { 3223 {
3455 unsigned char *s = get_to_st (eh); 3224 char *s = get_to_st (eh);
3456 3225
3457 if (s) 3226 if (s)
3458 { 3227 {
3459 process_xterm_seq (arg, (char *)s, eh); 3228 process_xterm_seq (arg, s, eh);
3460 free (s); 3229 free (s);
3461 } 3230 }
3462 } 3231 }
3463} 3232}
3464 3233
3465void 3234void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3235rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3236{
3468 if (str[0] == '?' && !str[1]) 3237 if (str[0] == '?' && !str[1])
3469 { 3238 {
3470 unsigned short r, g, b; 3239 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3240 pix_colors_focused[color].get (c);
3241
3242#if XFT
3243 if (c.a != rgba::MAX_CC)
3244 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3245 else
3246#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3247 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3248 }
3474 else 3249 else
3475 set_window_color (color, str); 3250 set_window_color (color, str);
3476} 3251}
3477 3252
3478/* 3253/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3254 * 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 */ 3255 */
3503void 3256void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3257rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3258{
3506 int changed = 0;
3507 int color; 3259 int color;
3508 char *buf, *name; 3260 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3261 bool query = str[0] == '?' && !str[1];
3262 int saveop = op;
3263
3264 dLocal (Display *, dpy);
3510 3265
3511 assert (str != NULL); 3266 assert (str != NULL);
3267
3268 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3269 return;
3270
3512 switch (op) 3271 switch (op)
3513 { 3272 {
3514 case XTerm_name: 3273 case XTerm_name:
3515 set_title (str); 3274 set_title (str);
3516 /* FALLTHROUGH */ 3275 /* FALLTHROUGH */
… …
3521 set_title (str); 3280 set_title (str);
3522 break; 3281 break;
3523 case XTerm_property: 3282 case XTerm_property:
3524 if (str[0] == '?') 3283 if (str[0] == '?')
3525 { 3284 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3285 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3286 Atom actual_type;
3528 int actual_format; 3287 int actual_format;
3529 unsigned long nitems; 3288 unsigned long nitems;
3530 unsigned long bytes_after; 3289 unsigned long bytes_after;
3531 unsigned char *value = 0; 3290 unsigned char *value = 0;
3532 const char *str = ""; 3291 const char *str = "";
3533 3292
3534 if (prop 3293 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3294 && XGetWindowProperty (dpy, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3295 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3296 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3297 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3298 && actual_type != None
3540 && actual_format == 8) 3299 && actual_format == 8)
3541 str = (const char *)(value); 3300 str = (const char *)(value);
3542 3301
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3302 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3303
3545 XFree (value); 3304 XFree (value);
3546 } 3305 }
3547 else 3306 else
3548 { 3307 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3308 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3309
3551 if (eq) 3310 if (eq)
3552 { 3311 {
3553 *eq = 0; 3312 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3313 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 } 3314 }
3559 else 3315 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3316 XDeleteProperty (dpy, parent[0],
3561 display->atom (str)); 3317 display->atom (str));
3562 } 3318 }
3563 break; 3319 break;
3564 3320
3565 case XTerm_Color: 3321 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3322 for (buf = (char *)str; buf && *buf;)
3567 { 3323 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3324 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3325 break;
3570 3326
3571 *name++ = '\0'; 3327 *name++ = '\0';
3572 color = atoi (buf); 3328 color = atoi (buf) + minCOLOR;
3573 3329
3574 if (color < 0 || color >= TOTAL_COLORS) 3330 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3331 break;
3576 3332
3577 if ((buf = STRCHR (name, ';')) != NULL) 3333 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3334 *buf++ = '\0';
3579 3335
3580 if (name[0] == '?' && !name[1]) 3336 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 } 3337 }
3589 break; 3338 break;
3590 case XTerm_Color00: 3339 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3340 process_color_seq (op, Color_fg, str, resp);
3592 break; 3341 break;
3593 case XTerm_Color01: 3342 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3343 process_color_seq (op, Color_bg, str, resp);
3595 break; 3344 break;
3596#ifndef NO_CURSORCOLOR 3345#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3346 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3347 process_color_seq (op, Color_cursor, str, resp);
3599 break; 3348 break;
3600#endif 3349#endif
3601 case XTerm_Color_pointer_fg: 3350 case XTerm_Color_pointer_fg:
3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3351 process_color_seq (op, Color_pointer_fg, str, resp);
3603 break; 3352 break;
3604 case XTerm_Color_pointer_bg: 3353 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3354 process_color_seq (op, Color_pointer_bg, str, resp);
3606 break; 3355 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3356#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: 3357 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3358 process_color_seq (op, Color_RV, str, resp);
3616 break; 3359 break;
3360 case Rxvt_Color_BD:
3361 case URxvt_Color_BD:
3362 process_color_seq (op, Color_BD, str, resp);
3363 break;
3364 case Rxvt_Color_UL:
3365 case URxvt_Color_UL:
3366 process_color_seq (op, Color_UL, str, resp);
3367 break;
3368 case URxvt_Color_IT:
3369 process_color_seq (op, Color_IT, str, resp);
3370 break;
3617#endif 3371#endif
3372#if ENABLE_TRANSPARENCY
3373 case URxvt_Color_tint:
3374 process_color_seq (op, Color_tint, str, resp);
3375 {
3376 bool changed = false;
3377 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3379 else
3380 changed = bgPixmap.unset_tint ();
3381 if (changed)
3382 update_background ();
3383 }
3618 3384
3385 break;
3386#endif
3387
3388#if BG_IMAGE_FROM_FILE
3619 case XTerm_Pixmap: 3389 case Rxvt_Pixmap:
3620 if (*str != ';') 3390 if (!strcmp (str, "?"))
3621 { 3391 {
3622#if XPM_BACKGROUND 3392 char str[256];
3623 scale_pixmap (""); /* reset to default scaling */ 3393
3624 set_bgPixmap (str); /* change pixmap */ 3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3625#endif 3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3626 scr_touch (true); 3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST);
3627 } 3398 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3399 else
3629 { 3400 {
3401 int changed = 0;
3402
3403 if (*str != ';')
3404 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */
3408 changed++;
3409 str = strchr (str, ';');
3410 if (str == NULL)
3411 bgPixmap.set_defaultGeometry ();
3412 }
3413 while (str)
3414 {
3630 str++; 3415 str++;
3631#if XPM_BACKGROUND 3416 if (bgPixmap.set_geometry (str))
3632 changed += scale_pixmap (str); 3417 changed++;
3633#endif 3418 str = strchr (str, ';');
3634 3419 }
3420 if (changed)
3421 update_background ();
3635 } 3422 }
3636 if (changed)
3637 {
3638#ifdef XPM_BACKGROUND
3639 resize_pixmap ();
3640#endif
3641 scr_touch (true);
3642 }
3643 break; 3423 break;
3424#endif
3644 3425
3645 case XTerm_restoreFG: 3426 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3427 set_window_color (Color_fg, str);
3647 break; 3428 break;
3648 case XTerm_restoreBG: 3429 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3430 set_window_color (Color_bg, str);
3650 break; 3431 break;
3651 3432
3652 case XTerm_logfile: 3433 case XTerm_logfile:
3653 // TODO, when secure mode? 3434 // TODO, when secure mode?
3654 break; 3435 break;
3655 3436
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 3437#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3438 case Rxvt_dumpscreen: /* no error notices */
3698 { 3439 {
3699 int fd; 3440 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3441 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3442 {
3702 scr_dump (fd); 3443 scr_dump (fd);
3703 close (fd); 3444 close (fd);
3704 } 3445 }
3705 } 3446 }
3447 break;
3448#endif
3449 case XTerm_font:
3450 op = URxvt_font;
3451 case URxvt_font:
3452#if ENABLE_STYLES
3453 case URxvt_boldFont:
3454 case URxvt_italicFont:
3455 case URxvt_boldItalicFont:
3456#endif
3457 if (query)
3458 tt_printf ("\33]%d;%-.250s%c", saveop,
3459 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3460 ? fontset[op - URxvt_font]->fontdesc : "",
3461 resp);
3462 else
3463 {
3464 const char *&res = rs[Rs_font + (op - URxvt_font)];
3465
3466 res = strdup (str);
3467 allocated.push_back ((void *)res);
3468 set_fonts ();
3469 }
3470 break;
3471
3472 case URxvt_version:
3473 if (query)
3474 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3475 op,
3476 rs[Rs_name], VERSION[0], VERSION[2],
3477 resp);
3478 break;
3479
3480#if !ENABLE_MINIMAL
3481 case URxvt_locale:
3482 if (query)
3483 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3484 else
3485 {
3486 set_locale (str);
3487 pty->set_utf8_mode (enc_utf8);
3488 init_xlocale ();
3489 }
3490 break;
3491
3492 case URxvt_view_up:
3493 case URxvt_view_down:
3494 {
3495 int lines = atoi (str);
3496
3497 if (lines)
3498 scr_page (op == URxvt_view_up ? UP : DN, lines);
3499 else
3500 scr_erase_savelines ();
3501 }
3502
3503 break;
3504#endif
3505
3506#if ENABLE_PERL
3507 case URxvt_perl:
3508 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3509 ; // no responses yet
3706 break; 3510 break;
3707#endif 3511#endif
3708 } 3512 }
3709} 3513}
3710/*----------------------------------------------------------------------*/ 3514/*----------------------------------------------------------------------*/
… …
3724{ 3528{
3725 int state; 3529 int state;
3726 3530
3727 if (mode == 's') 3531 if (mode == 's')
3728 { 3532 {
3729 SavedModes |= (PrivateModes & bit); 3533 SavedModes |= (priv_modes & bit);
3730 return -1; 3534 return -1;
3731 } 3535 }
3732 else 3536 else
3733 { 3537 {
3734 if (mode == 'r') 3538 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3539 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3540 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3541 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3542 PrivMode (state, bit);
3739 } 3543 }
3740 3544
3741 return state; 3545 return state;
3742} 3546}
3743 3547
3744/* we're not using priv _yet_ */ 3548/* we're not using priv _yet_ */
3745void 3549void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3550rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 3551{
3748 unsigned int i, j; 3552 unsigned int i, j;
3749 int state; 3553 int state;
3750 3554
3751 static const struct 3555 static const struct
3752 { 3556 {
3753 const int argval; 3557 const int argval;
3754 const unsigned long bit; 3558 const unsigned long bit;
3755 }
3756
3757 argtopriv[] = { 3559 } argtopriv[] = {
3758 { 1, PrivMode_aplCUR }, 3560 { 1, PrivMode_aplCUR },
3759 { 2, PrivMode_vt52 }, 3561 { 2, PrivMode_vt52 },
3760 { 3, PrivMode_132 }, 3562 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3563 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3564 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3565 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3566 { 7, PrivMode_Autowrap },
3567 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3568 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3569 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 3570 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 3571#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3572 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3573#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3574 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3575 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3576 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3577 // 45 margin bell NYI
3779 // 46 start logging 3578 // 46 start logging
… …
3782#ifndef NO_BACKSPACE_KEY 3581#ifndef NO_BACKSPACE_KEY
3783 { 67, PrivMode_BackSpace }, 3582 { 67, PrivMode_BackSpace },
3784#endif 3583#endif
3785 { 1000, PrivMode_MouseX11 }, 3584 { 1000, PrivMode_MouseX11 },
3786 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3787 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3586 { 1002, PrivMode_MouseBtnEvent },
3788 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3587 { 1003, PrivMode_MouseAnyEvent },
3789 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3790 { 1011, PrivMode_Keypress }, // rxvt extension 3589 { 1011, PrivMode_Keypress }, // rxvt extension
3791 // 1035 enable modifiers for alt, numlock NYI 3590 // 1035 enable modifiers for alt, numlock NYI
3792 // 1036 send ESC for meta keys NYI 3591 // 1036 send ESC for meta keys NYI
3793 // 1037 send DEL for keypad delete NYI 3592 // 1037 send DEL for keypad delete NYI
… …
3819 } 3618 }
3820 3619
3821 /* extra handling for values with state unkept */ 3620 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3621 switch (arg[i])
3823 { 3622 {
3623#if ENABLE_STYLES
3624 case 1021:
3625 set_option (Opt_intensityStyles, mode);
3626
3627 scr_touch (true);
3628 break;
3629#endif
3824 case 1048: /* alternative cursor save */ 3630 case 1048: /* alternative cursor save */
3631 case 1049:
3825 if (Options & Opt_secondaryScreen) 3632 if (option (Opt_secondaryScreen))
3826 if (mode == 0) 3633 if (mode == 0)
3827 scr_cursor (RESTORE); 3634 scr_cursor (RESTORE);
3828 else if (mode == 1) 3635 else if (mode == 1)
3829 scr_cursor (SAVE); 3636 scr_cursor (SAVE);
3830 break; 3637 break;
… …
3841 * within VT52 mode 3648 * within VT52 mode
3842 */ 3649 */
3843 PrivMode (1, PrivMode_vt52); 3650 PrivMode (1, PrivMode_vt52);
3844 break; 3651 break;
3845 case 3: /* 80/132 */ 3652 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 3653 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3654 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 3655 break;
3849 case 4: /* smooth scrolling */ 3656 case 4: /* smooth scrolling */
3850 if (state) 3657 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 3658 break;
3855 case 5: /* reverse video */ 3659 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 3660 scr_rvideo_mode (state);
3857 break; 3661 break;
3858 case 6: /* relative/absolute origins */ 3662 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 3666 scr_autowrap (state);
3863 break; 3667 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 3668 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 3669 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 3670 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3868 break; 3672 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 3673#ifdef scrollBar_esc
3877 case scrollBar_esc: 3674 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 3675 if (scrollbar_mapping (state))
3879 { 3676 {
3880 resize_all_windows (0, 0, 0); 3677 resize_all_windows (0, 0, 0);
… …
3892 break; 3689 break;
3893 /* case 66: - application key pad */ 3690 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 3691 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 3692 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3898 break; 3695 break;
3899#if 0 3696#if 0
3900 case 1001: 3697 case 1001:
3901 break; /* X11 mouse highlighting */ 3698 break; /* X11 mouse highlighting */
3902#endif 3699#endif
3700 case 1002:
3701 case 1003:
3702 if (state) {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask;
3706 } else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 3711 set_option (Opt_scrollTtyOutput, !state);
3908 break; 3712 break;
3909 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 3714 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 3715 break;
3915 case 1047: /* secondary screen w/ clearing last */ 3716 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 3717 if (option (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 3719 scr_erase_screen (2);
3919 scr_change_screen (state); 3720 scr_change_screen (state);
3920 break; 3721 break;
3921 case 1049: /* secondary screen w/ clearing first */ 3722 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 3723 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 3724 if (option (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 3726 scr_erase_screen (2);
3926 break; 3727 break;
3927 default: 3728 default:
3928 break; 3729 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 3755 rendset = 0, rendstyle = ~RS_None;
3955 break; 3756 break;
3956 case 1: 3757 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 3758 rendset = 1, rendstyle = RS_Bold;
3958 break; 3759 break;
3959 //case 2: // faint or second colour 3760 //case 2: // low intensity
3761 case 3:
3762 rendset = 1, rendstyle = RS_Italic;
3763 break;
3960 case 4: 3764 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 3765 rendset = 1, rendstyle = RS_Uline;
3962 break; 3766 break;
3963 case 5: // slowly blinking 3767 case 5: // slowly blinking
3964 case 6: // rapidly blinking 3768 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 3780 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 3781 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 3782 //...
3979 //case 19: // ninth alt font 3783 //case 19: // ninth alt font
3980 //case 20: // gothic 3784 //case 20: // gothic
3981 case 21: // disable bold, faint 3785 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 3786 rendset = 0, rendstyle = RS_Bold;
3983 break; 3787 break;
3984 case 22: 3788 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 3789 rendset = 0, rendstyle = RS_Bold;
3986 break; 3790 break;
3987 //case 23: disable italic 3791 case 23: // disable italic
3792 rendset = 0, rendstyle = RS_Italic;
3793 break;
3988 case 24: 3794 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 3795 rendset = 0, rendstyle = RS_Uline;
3990 break; 3796 break;
3991 case 25: 3797 case 25:
3798 rendset = 0, rendstyle = RS_Blink;
3799 break;
3800 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 3801 rendset = 0, rendstyle = RS_Blink;
3993 break; 3802 break;
3994 case 27: 3803 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 3804 rendset = 0, rendstyle = RS_RVid;
3996 break; 3805 break;
… …
4014 case 35: 3823 case 35:
4015 case 36: 3824 case 36:
4016 case 37: 3825 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3826 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 3827 break;
4019#ifdef TTY_256COLOR 3828 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 3829 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 3830 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3831 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 3832 i += 2;
4025 } 3833 }
4026 break; 3834 break;
4027#endif
4028 case 39: /* default fg */ 3835 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 3836 scr_color (Color_fg, Color_fg);
4030 break; 3837 break;
4031 3838
4032 case 40: 3839 case 40:
… …
4037 case 45: 3844 case 45:
4038 case 46: 3845 case 46:
4039 case 47: 3846 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 3848 break;
4042#ifdef TTY_256COLOR 3849 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 3850 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 3851 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 3853 i += 2;
4048 } 3854 }
4049 break; 3855 break;
4050#endif
4051 case 49: /* default bg */ 3856 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
4053 break; 3858 break;
4054 3859
4055#ifndef NO_BRIGHTCOLOR 3860 //case 50: // not variable spacing
3861
3862#if !ENABLE_MINIMAL
4056 case 90: 3863 case 90:
4057 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
4058 case 92: 3865 case 92:
4059 case 93: 3866 case 93:
4060 case 94: 3867 case 94:
4061 case 95: 3868 case 95:
4062 case 96: 3869 case 96:
4063 case 97: 3870 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3871 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 3872 break;
4067 case 100: 3873 case 100:
4068 case 101: /* set bright bg color */ 3874 case 101: /* set bright bg color */
4069 case 102: 3875 case 102:
4070 case 103: 3876 case 103:
4071 case 104: 3877 case 104:
4072 case 105: 3878 case 105:
4073 case 106: 3879 case 106:
4074 case 107: 3880 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3881 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 3882 break;
4078#endif 3883#endif
4079
4080 } 3884 }
4081 } 3885 }
4082} 3886}
4083/*}}} */ 3887/*}}} */
4084 3888
… …
4088{ 3892{
4089 unicode_t ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
4090 3894
4091 if (cmd == 'Q') 3895 if (cmd == 'Q')
4092 { /* query graphics */ 3896 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 3898 return;
4095 } 3899 }
4096 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4097 do 3901 do
4098 ch = cmd_getc (); 3902 ch = cmd_getc ();
… …
4108 */ 3912 */
4109void 3913void
4110rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
4111{ 3915{
4112 va_list arg_ptr; 3916 va_list arg_ptr;
4113 unsigned char buf[256]; 3917 char buf[256];
4114 3918
4115 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 3921 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 3922 tt_write (buf, strlen (buf));
4119} 3923}
4120 3924
4121/* ---------------------------------------------------------------------- */ 3925/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 3926/* 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. 3927 * or generated by us in response to a query ESC sequence.
4124 */ 3928 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930
4125void 3931void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 3933{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
4129 3936
4130 if (len) 3937 if (pty->pty < 0)
3938 return;
3939
3940 if (v_buflen == 0)
3941 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943
3944 if ((unsigned int)written == len)
3945 return;
3946
3947 data += written;
3948 len -= written;
4131 { 3949 }
3950
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3952
3953 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len;
3955
3956 pty_ev.set (ev::READ | ev::WRITE);
3957}
3958
3959void rxvt_term::pty_write ()
3960{
3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3962
3963 if (written > 0)
3964 {
3965 v_buflen -= written;
3966
4132 if (v_buflen == 0) 3967 if (v_buflen == 0)
4133 { 3968 {
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); 3969 free (v_buffer);
4161 v_buffer = 0; 3970 v_buffer = 0;
4162 v_buflen = 0;
4163 3971
4164 pty_ev.set (EVENT_READ); 3972 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; 3973 return;
4177 } 3974 }
3975
3976 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 3977 }
3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3979 pty_ev.set (ev::READ);
4179} 3980}
4180 3981
4181/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4182 3983

Diff Legend

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