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

Diff Legend

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