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.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

… …
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>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
305{ 416{
306 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
… …
321 */ 432 */
322 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
325 436
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 437 kbuf[0] = 0;
333 438
334#ifdef USE_XIM 439#if USE_XIM
335 if (Input_Context) 440 if (Input_Context)
336 { 441 {
337 Status status_return; 442 Status status_return;
338 443
339#if 0 444#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 515#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 516 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 517#else
413 lnsppg = nrow * 4 / 5; 518 lnsppg = nrow * 4 / 5;
414#endif 519#endif
520 max_it (lnsppg, 1);
521
415 if (keysym == XK_Prior) 522 if (keysym == XK_Prior)
416 { 523 {
417 scr_page (UP, lnsppg); 524 scr_page (lnsppg);
418 return; 525 return;
419 } 526 }
420 else if (keysym == XK_Next) 527 else if (keysym == XK_Next)
421 { 528 {
422 scr_page (DN, lnsppg); 529 scr_page (-lnsppg);
423 return; 530 return;
424 } 531 }
425 } 532 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 533#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 534 if (IS_SCROLL_MOD)
428 { 535 {
429 if (keysym == XK_Up) 536 if (keysym == XK_Up)
430 { 537 {
431 scr_page (UP, 1); 538 scr_page (1);
432 return; 539 return;
433 } 540 }
434 else if (keysym == XK_Down) 541 else if (keysym == XK_Down)
435 { 542 {
436 scr_page (DN, 1); 543 scr_page (-1);
437 return; 544 return;
438 } 545 }
439 } 546 }
440#endif 547#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 548#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 549 if (IS_SCROLL_MOD)
443 { 550 {
444 if (keysym == XK_Home) 551 if (keysym == XK_Home)
445 { 552 {
446 scr_move_to (0, 1); 553 scr_changeview (top_row);
447 return; 554 return;
448 } 555 }
449 else if (keysym == XK_End) 556 else if (keysym == XK_End)
450 { 557 {
451 scr_move_to (1, 1); 558 scr_changeview (0);
452 return; 559 return;
453 } 560 }
454 } 561 }
455#endif 562#endif
456 } 563 }
… …
472 selection_request (ev.time); 579 selection_request (ev.time);
473 return; 580 return;
474#if TODO 581#if TODO
475 /* rxvt extras */ 582 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 583 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 584 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 585 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 586 return;
482#endif 587#endif
483 } 588 }
484 } 589 }
485 } 590 }
486 591
592 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
593 {
594 if (keysym == XK_v)
595 selection_request (ev.time, Sel_Clipboard);
596 else if (selection.len > 0)
597 {
598 free (selection.clip_text);
599 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
600 selection.clip_len = selection.len;
601 selection_grab (CurrentTime, true);
602 }
603
604 return;
605 }
606
487#if ENABLE_FRILLS || ISO_14755 607#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 608 // ISO 14755 support
489 if (shft && ctrl) 609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 610 {
491 int hv; 611 int hv;
492 612
493 if (iso14755buf & ISO_14755_51 613 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 614 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 644 scr_overlay_off ();
525# endif 645# endif
526 iso14755buf = 0; 646 iso14755buf = 0;
527 } 647 }
528 } 648 }
649 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 650 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 651 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 652 if (!(iso14755buf & ISO_14755_STARTED))
532 { 653 {
533 iso14755buf |= ISO_14755_STARTED; 654 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 655# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 656 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 667 }
547#endif 668#endif
548 669
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 670 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 671 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 672 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 673 unsigned int newlen = 1;
553#ifdef XK_KP_Home 674
554 static const KeySym keypadtrans[] = { 675 if (ev.state & ModNumLockMask)
555 XK_KP_7, // XK_KP_Home 676 kp = false;
556 XK_KP_4, // XK_KP_Left 677
557 XK_KP_8, // XK_KP_Up 678 keysym = translate_keypad (keysym, kp);
558 XK_KP_6, // XK_KP_Right 679
559 XK_KP_2, // XK_KP_Down 680 switch (keysym)
560#ifndef UNSHIFTED_SCROLLKEYS 681 {
561 XK_KP_9, // XK_KP_Prior 682#ifndef NO_BACKSPACE_KEY
562 XK_KP_3, // XK_KP_Next 683 case XK_BackSpace:
563#else 684 if (priv_modes & PrivMode_HaveBackSpace)
564 XK_Prior, 685 {
565 XK_Next, 686 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
566#endif 687 ^ !!ctrl) ? '\b' : '\177';
567 XK_KP_1, // XK_KP_End 688 kbuf[1] = '\0';
568 XK_KP_5, // XK_KP_Begin
569 }; 689 }
690 else
691 strcpy (kbuf, rs[Rs_backspace_key]);
692 break;
693#endif
694#ifndef NO_DELETE_KEY
695 case XK_Delete:
696 strcpy (kbuf, rs[Rs_delete_key]);
697 break;
698#endif
699 case XK_Tab:
700 if (shft)
701 strcpy (kbuf, "\033[Z");
702 else
703 {
704#ifdef CTRL_TAB_MAKES_META
705 if (ctrl)
706 meta = 1;
707#endif
708#ifdef MOD4_TAB_MAKES_META
709 if (ev.state & Mod4Mask)
710 meta = 1;
711#endif
712 newlen = 0;
713 }
714 break;
570 715
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 716 case XK_Up: /* "\033[A" */
717 case XK_Down: /* "\033[B" */
718 case XK_Right: /* "\033[C" */
719 case XK_Left: /* "\033[D" */
720 strcpy (kbuf, "\033[Z");
721 kbuf[2] = "DACB"[keysym - XK_Left];
722 /* do Shift first */
723 if (shft)
724 kbuf[2] = "dacb"[keysym - XK_Left];
725 else if (ctrl)
726 {
727 kbuf[1] = 'O';
728 kbuf[2] = "dacb"[keysym - XK_Left];
729 }
730 else if (priv_modes & PrivMode_aplCUR)
731 kbuf[1] = 'O';
732 break;
733
734 case XK_KP_Enter:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033OM");
739 break;
740 }
741
742 /* FALLTHROUGH */
743
744 case XK_Return:
745 if (priv_modes & PrivMode_LFNL)
746 {
747 kbuf[0] = '\015';
748 kbuf[1] = '\012';
749 kbuf[2] = '\0';
750 }
751 else
752 {
753 kbuf[0] = '\015';
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_KP_F1: /* "\033OP" */
759 case XK_KP_F2: /* "\033OQ" */
760 case XK_KP_F3: /* "\033OR" */
761 case XK_KP_F4: /* "\033OS" */
762 strcpy (kbuf, "\033OP");
763 kbuf[2] += (keysym - XK_KP_F1);
764 break;
765
766 case XK_KP_Multiply: /* "\033Oj" : "*" */
767 case XK_KP_Add: /* "\033Ok" : "+" */
768 case XK_KP_Separator: /* "\033Ol" : "," */
769 case XK_KP_Subtract: /* "\033Om" : "-" */
770 case XK_KP_Decimal: /* "\033On" : "." */
771 case XK_KP_Divide: /* "\033Oo" : "/" */
772 case XK_KP_0: /* "\033Op" : "0" */
773 case XK_KP_1: /* "\033Oq" : "1" */
774 case XK_KP_2: /* "\033Or" : "2" */
775 case XK_KP_3: /* "\033Os" : "3" */
776 case XK_KP_4: /* "\033Ot" : "4" */
777 case XK_KP_5: /* "\033Ou" : "5" */
778 case XK_KP_6: /* "\033Ov" : "6" */
779 case XK_KP_7: /* "\033Ow" : "7" */
780 case XK_KP_8: /* "\033Ox" : "8" */
781 case XK_KP_9: /* "\033Oy" : "9" */
782 /* allow shift to override */
783 if (kp)
784 {
785 strcpy (kbuf, "\033Oj");
786 kbuf[2] += (keysym - XK_KP_Multiply);
787 }
788 else
789 {
790 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
791 kbuf[1] = '\0';
792 }
793 break;
794
795 default:
572 { 796 {
573 unsigned int index = keysym - XK_KP_Home; 797 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 798 if (param > 0)
799 sprintf (kbuf,"\033[%d~", param);
800 else
801 newlen = 0;
575 } 802 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 803 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 804 }
789 805
790 if (newlen) 806 if (newlen)
791 len = strlen (kbuf); 807 len = strlen (kbuf);
792 808
809 if (len > 0)
810 {
793 /* 811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
794 * Pass meta for all function keys, if 'meta' option set 824 * Pass meta for all function keys, if 'meta' option set
795 */ 825 */
796#ifdef META8_OPTION 826#ifdef META8_OPTION
797 if (meta && (meta_char == 0x80) && len > 0) 827 if (meta && (meta_char == 0x80))
798 kbuf[len - 1] |= 0x80; 828 kbuf[len - 1] |= 0x80;
799#endif 829#endif
830 }
800 831
801 } 832 }
802 else if (ctrl && keysym == XK_minus) 833 else if (ctrl && keysym == XK_minus)
803 { 834 {
804 len = 1; 835 len = 1;
… …
838 { 869 {
839 view_start = 0; 870 view_start = 0;
840 want_refresh = 1; 871 want_refresh = 1;
841 } 872 }
842 873
843 /*
844 * these modifications only affect the static keybuffer
845 * pass Shift/Control indicators for function keys ending with `~'
846 *
847 * eg,
848 * Prior = "ESC[5~"
849 * Shift+Prior = "ESC[5$"
850 * Ctrl+Prior = "ESC[5^"
851 * Ctrl+Shift+Prior = "ESC[5@"
852 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
853 */
854 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
855 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
856
857 /* escape prefix */ 874 /* escape prefix */
858 if (meta 875 if (meta
859#ifdef META8_OPTION 876#ifdef META8_OPTION
860 && meta_char == C0_ESC 877 && meta_char == C0_ESC
861#endif 878#endif
… …
866 } 883 }
867 884
868 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
869} 886}
870 887
871void 888void ecb_cold
872rxvt_term::key_release (XKeyEvent &ev) 889rxvt_term::key_release (XKeyEvent &ev)
873{ 890{
874#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 891#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
875 KeySym keysym; 892 KeySym keysym;
876 893
… …
896 commit_iso14755 (); 913 commit_iso14755 ();
897 914
898 return; 915 return;
899 } 916 }
900 917
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 918 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
902 if (i[0] == keysym) 919 if (i[0] == keysym)
903 { 920 {
904 iso14755buf = ISO_14755_51 | i[1]; 921 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 (); 922 commit_iso14755 ();
906 923
… …
943 else if (keysym == XK_Control_L || keysym == XK_Control_R) 960 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0; 961 mouse_slip_wheel_speed = 0;
945#endif 962#endif
946} 963}
947 964
948#if defined (KEYSYM_RESOURCE)
949unsigned int
950rxvt_term::cmd_write (const char *str, unsigned int count)
951{
952 unsigned int n, s;
953
954 n = cmdbuf_ptr - cmdbuf_base;
955 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
956
957 if (n > 0 && s < count)
958 {
959 memmove (cmdbuf_base, cmdbuf_ptr,
960 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
961 cmdbuf_ptr = cmdbuf_base;
962 cmdbuf_endp -= n;
963 s += n;
964 }
965
966 if (count > s)
967 {
968 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
969 count = s;
970 }
971
972 for (; count--;)
973 *cmdbuf_endp++ = *str++;
974
975 cmd_parse ();
976
977 return 0;
978}
979#endif
980
981void 965void
982rxvt_term::flush () 966rxvt_term::flush ()
983{ 967{
984 flush_ev.stop (); 968 flush_ev.stop ();
985 969
986#ifdef HAVE_BG_PIXMAP 970#ifdef HAVE_IMG
987 if (bgPixmap.check_clearChanged ()) 971 if (bg_flags & BG_NEEDS_REFRESH)
988 { 972 {
989// scr_clear (true); This needs to be researched further! 973 bg_flags &= ~BG_NEEDS_REFRESH;
990 scr_touch (false); 974 scr_touch (false);
991 } 975 }
992#endif 976#endif
993 977
994 if (want_refresh) 978 if (want_refresh)
… …
1030 } 1014 }
1031 while (row < end_row); 1015 while (row < end_row);
1032 } 1016 }
1033 1017
1034 scr_refresh (); 1018 scr_refresh ();
1035 scrollbar_show (1); 1019 scrollBar.show (1);
1036#ifdef USE_XIM 1020#if USE_XIM
1037 IMSendSpot (); 1021 im_send_spot ();
1038#endif 1022#endif
1039 } 1023 }
1040 1024
1041 display->flush (); 1025 display->flush ();
1042} 1026}
1043 1027
1044/* checks wether a refresh is requested and starts the refresh timer */ 1028/* checks whether a refresh is requested and starts the refresh timer */
1045void 1029void
1046rxvt_term::refresh_check () 1030rxvt_term::refresh_check ()
1047{ 1031{
1048 if (want_refresh && !flush_ev.is_active ()) 1032 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1033 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1059 refresh_count = 0; 1043 refresh_count = 0;
1060 flush (); 1044 flush ();
1061} 1045}
1062 1046
1063#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
1048void
1049rxvt_term::cursor_blink_reset ()
1050{
1051 if (hidden_cursor)
1052 {
1053 hidden_cursor = 0;
1054 want_refresh = 1;
1055 }
1056
1057 if (option (Opt_cursorBlink))
1058 cursor_blink_ev.again ();
1059 else
1060 cursor_blink_ev.stop ();
1061}
1062
1064void 1063void
1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1064rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1066{ 1065{
1067 hidden_cursor = !hidden_cursor; 1066 hidden_cursor = !hidden_cursor;
1068 want_refresh = 1; 1067 want_refresh = 1;
… …
1087 1086
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1088void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1090{
1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1091 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1092 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 { 1093 {
1095 want_refresh = 1; 1094 want_refresh = 1;
1096 refresh_check (); 1095 refresh_check ();
1097 } 1096 }
1098 else 1097 else
… …
1102 1101
1103#ifdef SELECTION_SCROLLING 1102#ifdef SELECTION_SCROLLING
1104void 1103void
1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1104rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1106{ 1105{
1107 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1106 if (scr_page (scroll_selection_lines))
1108 { 1107 {
1109 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1108 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1110 want_refresh = 1; 1109 want_refresh = 1;
1111 refresh_check (); 1110 refresh_check ();
1112 } 1111 }
… …
1117 1116
1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1117#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1119void 1118void
1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1119rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1121{ 1120{
1122 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1121 if (scr_page (mouse_slip_wheel_speed))
1123 { 1122 {
1124 want_refresh = 1; 1123 want_refresh = 1;
1125 refresh_check (); 1124 refresh_check ();
1126 } 1125 }
1127 1126
… …
1142 { 1141 {
1143 // this should really be sched_yield(), but the linux guys thought 1142 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1143 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is 1144 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1145 // allowed by the sus... as is returning ENOSYS.
1146 // since the linux guys additionally thought that breaking the only
1147 // known workaround against their unusable sched_yield hack is cool,
1148 // we just nanosleep a bit and hope for the best.
1147 1149
1148 struct timespec ts = { 0, 0 }; 1150 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1151 nanosleep (&ts, 0);
1150 1152
1151 w.stop (); 1153 w.stop ();
1152 } 1154 }
1153 1155
… …
1156 { 1158 {
1157 } 1159 }
1158} event_handler; 1160} event_handler;
1159#endif 1161#endif
1160 1162
1163/* make sure all the cmd data is at beginning of cmdbuf */
1164void
1165rxvt_term::cmdbuf_reify ()
1166{
1167 if (cmdbuf_ptr == cmdbuf_base)
1168 return;
1169
1170 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1171
1172 memmove (cmdbuf_base, cmdbuf_ptr, used);
1173 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + used;
1175
1176}
1177
1178#if defined (KEYSYM_RESOURCE)
1179void
1180rxvt_term::cmdbuf_append (const char *str, size_t count)
1181{
1182 cmdbuf_reify ();
1183
1184 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1185
1186 if (count > avail)
1187 return;
1188
1189 memcpy (cmdbuf_endp, str, count);
1190 cmdbuf_endp += count;
1191
1192 cmd_parse ();
1193}
1194#endif
1195
1161bool 1196bool
1162rxvt_term::pty_fill () 1197rxvt_term::pty_fill ()
1163{ 1198{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1199 cmdbuf_reify ();
1165 1200
1166 if (CBUFSIZ == n) 1201 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1202
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1203 if (!avail)
1169 n = 0;
1170 } 1204 {
1171 1205 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1206 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1207 cmdbuf_endp = cmdbuf_ptr;
1208 avail = CBUFSIZ;
1209 }
1175 1210
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1211 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1212
1178 if (r > 0) 1213 if (r > 0)
1179 { 1214 {
1180 cmdbuf_endp += r; 1215 cmdbuf_endp += r;
1181 return true; 1216 return true;
… …
1203{ 1238{
1204 make_current (); 1239 make_current ();
1205 1240
1206 if (revents & ev::READ) 1241 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1242 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1243 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1244 cmd_parse ();
1210 break;
1211 1245
1212 if (revents & ev::WRITE) 1246 if (revents & ev::WRITE)
1213 pty_write (); 1247 pty_write ();
1214 1248
1215 refresh_check (); 1249 refresh_check ();
1216} 1250}
1217 1251
1218void 1252void ecb_cold
1219rxvt_term::pointer_unblank () 1253rxvt_term::pointer_unblank ()
1220{ 1254{
1221 XDefineCursor (dpy, vt, TermWin_cursor); 1255 XDefineCursor (dpy, vt, TermWin_cursor);
1222 recolour_cursor (); 1256 recolour_cursor ();
1223 1257
… …
1228 pointer_ev.start (pointerBlankDelay); 1262 pointer_ev.start (pointerBlankDelay);
1229#endif 1263#endif
1230} 1264}
1231 1265
1232#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1233void 1267void ecb_cold
1234rxvt_term::pointer_blank () 1268rxvt_term::pointer_blank ()
1235{ 1269{
1236 if (!option (Opt_pointerBlank)) 1270 if (!option (Opt_pointerBlank))
1237 return; 1271 return;
1238 1272
… …
1240 XFlush (dpy); 1274 XFlush (dpy);
1241 1275
1242 hidden_pointer = 1; 1276 hidden_pointer = 1;
1243} 1277}
1244 1278
1245void 1279void ecb_cold
1246rxvt_term::pointer_cb (ev::timer &w, int revents) 1280rxvt_term::pointer_cb (ev::timer &w, int revents)
1247{ 1281{
1248 make_current (); 1282 make_current ();
1249 1283
1250 pointer_blank (); 1284 pointer_blank ();
… …
1256{ 1290{
1257 int button_number, key_state = 0; 1291 int button_number, key_state = 0;
1258 int x, y; 1292 int x, y;
1259 int code = 32; 1293 int code = 32;
1260 1294
1261 x = Pixel2Col (ev.x); 1295 x = Pixel2Col (ev.x) + 1;
1262 y = Pixel2Row (ev.y); 1296 y = Pixel2Row (ev.y) + 1;
1297
1263 if (ev.type == MotionNotify) 1298 if (ev.type == MotionNotify)
1264 { 1299 {
1265 if (x == mouse_row && y == mouse_col) 1300 if (x == mouse_row && y == mouse_col)
1266 return; 1301 return;
1302
1267 mouse_row = x; 1303 mouse_row = x;
1268 mouse_col = y; 1304 mouse_col = y;
1269 code += 32; 1305 code += 32;
1270 } 1306 }
1271 1307
… …
1274 else 1310 else
1275 { 1311 {
1276 button_number = MEvent.button - Button1; 1312 button_number = MEvent.button - Button1;
1277 /* add 0x3D for wheel events, like xterm does */ 1313 /* add 0x3D for wheel events, like xterm does */
1278 if (button_number >= 3) 1314 if (button_number >= 3)
1279 button_number += (64 - 3); 1315 button_number += 64 - 3;
1280 } 1316 }
1281 1317
1282 if (priv_modes & PrivMode_MouseX10) 1318 if (priv_modes & PrivMode_MouseX10)
1283 { 1319 {
1284 /* 1320 /*
… …
1316 fputc ('A', stderr); 1352 fputc ('A', stderr);
1317 if (key_state & 32) 1353 if (key_state & 32)
1318 fputc ('2', stderr); 1354 fputc ('2', stderr);
1319 fprintf (stderr, "]: <%d>, %d/%d\n", 1355 fprintf (stderr, "]: <%d>, %d/%d\n",
1320 button_number, 1356 button_number,
1321 x + 1, 1357 x,
1322 y + 1); 1358 y);
1323#endif 1359#endif
1324 1360
1361#if ENABLE_FRILLS
1362 if (priv_modes & PrivMode_ExtMouseRight)
1363 tt_printf ("\033[%d;%d;%dM",
1364 code + button_number + key_state,
1365 x,
1366 y);
1367 else if (priv_modes & PrivMode_ExtModeMouse)
1368 tt_printf ("\033[M%c%lc%lc",
1369 code + button_number + key_state,
1370 wint_t (32 + x),
1371 wint_t (32 + y));
1372 else
1373#endif
1325 tt_printf ("\033[M%c%c%c", 1374 tt_printf ("\033[M%c%c%c",
1326 (code + button_number + key_state), 1375 code + button_number + key_state,
1327 (32 + x + 1), 1376 32 + x,
1328 (32 + y + 1)); 1377 32 + y);
1329} 1378}
1330 1379
1331/*{{{ process an X event */ 1380/*{{{ process an X event */
1332void 1381void ecb_hot
1333rxvt_term::x_cb (XEvent &ev) 1382rxvt_term::x_cb (XEvent &ev)
1334{ 1383{
1335 make_current (); 1384 make_current ();
1336 1385
1337 dLocal (Display *, dpy); 1386 dLocal (Display *, dpy);
… …
1435 && ev.xfocus.mode != NotifyGrab) 1484 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1485 focus_out ();
1437 break; 1486 break;
1438 1487
1439 case ConfigureNotify: 1488 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1443 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent)
1444 { 1490 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 1492 ;
1493
1494 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1495
1496 bool moved = false;
1497#ifdef HAVE_BG_PIXMAP
1498 if (bg_window_position_sensitive ())
1499 {
1500 want_position_change = true;
1501 if (bg_img == 0)
1502 moved = true;
1503 }
1504#endif
1505
1506 if (want_position_change)
1507 {
1508 int x, y;
1509
1510 if (ev.xconfigure.send_event)
1511 {
1512 x = ev.xconfigure.x;
1513 y = ev.xconfigure.y;
1514 }
1515 else
1516 get_window_origin (x, y);
1517
1518 if (x != parent_x || y != parent_y)
1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 moved = true;
1524 }
1525 }
1447 1526
1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1528 {
1450 seen_resize = 1; 1529 seen_resize = 1;
1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1531 }
1453 else 1532 else
1454 { 1533 {
1455#ifdef HAVE_BG_PIXMAP 1534#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped) 1535 if (moved)
1459 update_background (); 1536 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif 1537#endif
1464 } 1538 }
1465 1539
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1540 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1541 }
1468 break; 1542 break;
1469 1543
1470 case PropertyNotify: 1544 case PropertyNotify:
1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1476 break; 1546 break;
1477 1547
1478 case SelectionClear: 1548 case SelectionClear:
1479 selection_clear (); 1549 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480 break;
1481
1482 case SelectionNotify:
1483 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 break; 1550 break;
1486 1551
1487 case SelectionRequest: 1552 case SelectionRequest:
1488 selection_send (ev.xselectionrequest); 1553 selection_send (ev.xselectionrequest);
1489 break; 1554 break;
1490 1555
1491 case MapNotify: 1556 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP 1557#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a 1558 // This is needed at startup for the case of no window manager
1494 * non-reparenting window manager. In those cases we never get first 1559 // or a non-reparenting window manager and also because we
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1560 // defer bg image updates if the window is not mapped. The
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does 1561 // short delay is to optimize for multiple ConfigureNotify
1497 * reparenting. 1562 // events at startup when the window manager reparents the
1498 * We should not render background immidiately, as there could be several 1563 // window, so as to perform the computation after we have
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1564 // received all of them.
1500 * by scheduling background redraw as soon as we can, but giving a short 1565 if (bg_img == 0)
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025); 1566 update_background_ev.start (0.025);
1507#endif 1567#endif
1508 mapped = 1; 1568 mapped = 1;
1509#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1510 text_blink_ev.start (); 1570 text_blink_ev.start ();
… …
1525 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1526 { 1586 {
1527 do 1587 do
1528 { 1588 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1531 } 1591 }
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1592 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1533 1593
1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1594 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1535 1595
1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 { 1597 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, false);
1540 } 1600 }
1541 1601
1542 want_refresh = 1; 1602 want_refresh = 1;
1543 } 1603 }
1544 else 1604 else
… …
1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1551 ; 1611 ;
1552 1612
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1613 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1614 {
1555 scrollBar.state = STATE_IDLE; 1615 scrollBar.state = SB_STATE_IDLE;
1556 scrollbar_show (0); 1616 scrollBar.show (0);
1557 } 1617 }
1558 } 1618 }
1559 break; 1619 break;
1560 1620
1561 case MotionNotify: 1621 case MotionNotify:
… …
1602 1662
1603#ifdef SELECTION_SCROLLING 1663#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < int_bwidth 1664 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1665 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1666 {
1667 page_dirn scroll_selection_dir;
1607 int dist; 1668 int dist;
1608 1669
1609 /* don't clobber the current delay if we are 1670 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1671 * already in the middle of scrolling.
1611 */ 1672 */
… …
1626 dist = int_bwidth - ev.xbutton.y; 1687 dist = int_bwidth - ev.xbutton.y;
1627 } 1688 }
1628 else 1689 else
1629 { 1690 {
1630 scroll_selection_dir = DN; 1691 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (int_bwidth + height); 1692 dist = ev.xbutton.y - (int_bwidth + vt_height);
1632 } 1693 }
1633 1694
1634 scroll_selection_lines = Pixel2Height (dist) 1695 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1696 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1697 + 1;
1637 min_it (scroll_selection_lines, 1698 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1699 SELECTION_SCROLL_MAX_LINES);
1700 scroll_selection_lines *= scroll_selection_dir;
1639 } 1701 }
1640 else 1702 else
1641 { 1703 {
1642 /* we are within the text window, so we 1704 /* we are within the text window, so we
1643 * shouldn't be scrolling 1705 * shouldn't be scrolling
… …
1648#ifdef MOUSE_THRESHOLD 1710#ifdef MOUSE_THRESHOLD
1649 } 1711 }
1650#endif 1712#endif
1651 } 1713 }
1652 } 1714 }
1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1715 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1654 { 1716 {
1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1656 MotionNotify, &ev)) 1718 MotionNotify, &ev))
1657 ; 1719 ;
1658 1720
1659 XQueryPointer (dpy, scrollBar.win, 1721 XQueryPointer (dpy, scrollBar.win,
1660 &unused_root, &unused_child, 1722 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1723 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1724 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1725 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1726 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1727 scrollBar.size ());
1666 want_refresh = 1; 1728 want_refresh = 1;
1667 scrollbar_show (1); 1729 scrollBar.show (1);
1668 } 1730 }
1669 break; 1731 break;
1670 } 1732 }
1671 1733
1672#if defined(CURSOR_BLINK) 1734#if defined(CURSOR_BLINK)
1673 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1735 if (ev.type == KeyPress)
1674 {
1675 if (hidden_cursor)
1676 {
1677 hidden_cursor = 0;
1678 want_refresh = 1;
1679 }
1680
1681 cursor_blink_ev.again (); 1736 cursor_blink_reset ();
1682 }
1683#endif 1737#endif
1684 1738
1685#if defined(POINTER_BLANK) 1739#if defined(POINTER_BLANK)
1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1740 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1687 { 1741 {
… …
1697#endif 1751#endif
1698 1752
1699 refresh_check (); 1753 refresh_check ();
1700} 1754}
1701 1755
1702void 1756#if ENABLE_FRILLS
1757void ecb_cold
1758rxvt_term::set_urgency (bool enable)
1759{
1760 if (enable == urgency_hint)
1761 return;
1762
1763 if (XWMHints *h = XGetWMHints (dpy, parent))
1764 {
1765 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1766 XSetWMHints (dpy, parent, h);
1767 urgency_hint = enable;
1768 XFree (h);
1769 }
1770}
1771#endif
1772
1773void ecb_cold
1703rxvt_term::focus_in () 1774rxvt_term::focus_in ()
1704{ 1775{
1705 if (!focus) 1776 if (!focus)
1706 { 1777 {
1707 focus = 1; 1778 focus = 1;
1708 want_refresh = 1; 1779 want_refresh = 1;
1709 1780
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711
1712#if USE_XIM 1781#if USE_XIM
1713 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1714 { 1783 {
1715 IMSetPosition (); 1784 im_set_position ();
1716 XSetICFocus (Input_Context); 1785 XSetICFocus (Input_Context);
1717 } 1786 }
1718#endif 1787#endif
1719#if CURSOR_BLINK 1788#if CURSOR_BLINK
1720 if (option (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
… …
1727 scr_recolour (); 1796 scr_recolour ();
1728 } 1797 }
1729#endif 1798#endif
1730#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1732 { 1801 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1802#endif
1740 }
1741}
1742 1803
1743void 1804 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1805 }
1806}
1807
1808void ecb_cold
1744rxvt_term::focus_out () 1809rxvt_term::focus_out ()
1745{ 1810{
1746 if (focus) 1811 if (focus)
1747 { 1812 {
1748 focus = 0; 1813 focus = 0;
1749 want_refresh = 1; 1814 want_refresh = 1;
1750 1815
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816#if ENABLE_FRILLS
1752 1817 if (option (Opt_urgentOnBell))
1818 set_urgency (0);
1819#endif
1753#if ENABLE_FRILLS || ISO_14755 1820#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1821 if (iso14755buf)
1755 { 1822 {
1756 iso14755buf = 0; 1823 iso14755buf = 0;
1757# if ISO_14755 1824# if ISO_14755
… …
1774 { 1841 {
1775 pix_colors = pix_colors_unfocused; 1842 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1843 scr_recolour ();
1777 } 1844 }
1778#endif 1845#endif
1779 }
1780}
1781 1846
1782void 1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1848 }
1849}
1850
1851void ecb_cold
1783rxvt_term::update_fade_color (unsigned int idx) 1852rxvt_term::update_fade_color (unsigned int idx)
1784{ 1853{
1785#if OFF_FOCUS_FADING 1854#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade]) 1855 if (rs[Rs_fade])
1787 { 1856 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1860 }
1792#endif 1861#endif
1793} 1862}
1794 1863
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL 1864#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1796void 1865void ecb_hot
1797rxvt_term::rootwin_cb (XEvent &ev) 1866rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1867{
1799 make_current (); 1868 make_current ();
1800 1869
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1870 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1871 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1872 return;
1804 1873
1805# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1874 switch (ev.type)
1807 { 1875 {
1808 case PropertyNotify: 1876 case PropertyNotify:
1809 /* 1877 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1878 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1879 * use the property to determine the pixmap. We use it later on.
1812 */ 1880 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1881 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1882 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1883 {
1816 bgPixmap.set_root_pixmap (); 1884#if BG_IMAGE_FROM_ROOT
1885 if (option (Opt_transparent))
1886 {
1887 rxvt_img::new_from_root (this)->replace (root_img);
1817 update_background (); 1888 update_background ();
1889 }
1890#endif
1891 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1818 } 1892 }
1819 1893
1820 break; 1894 break;
1821 } 1895 }
1822# endif
1823 1896
1824 refresh_check (); 1897 refresh_check ();
1825} 1898}
1826#endif 1899#endif
1827 1900
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1933 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1934 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1935#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1936 if (ev.button == MEvent.button && clickintime)
1864 { 1937 {
1865 /* same button, within alloted time */ 1938 /* same button, within allowed time */
1866 MEvent.clicks++; 1939 MEvent.clicks++;
1867 1940
1868 if (MEvent.clicks > 1) 1941 if (MEvent.clicks > 1)
1869 { 1942 {
1870 /* only report double clicks */ 1943 /* only report double clicks */
… …
1951 if (scrollBar.upButton (ev.y)) 2024 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */ 2025 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y)) 2026 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */ 2027 direction = DN; /* down */
1955 2028
1956 scrollBar.state = STATE_IDLE; 2029 scrollBar.state = SB_STATE_IDLE;
1957 /* 2030 /*
1958 * Rxvt-style scrollbar: 2031 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 2032 * move up if mouse is above slider
1960 * move dn if mouse is below slider 2033 * move dn if mouse is below slider
1961 * 2034 *
… …
2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2073 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2074#endif
2002 if (scr_page (direction, 1)) 2075 if (scr_page (direction, 1))
2003 { 2076 {
2004 if (direction == UP) 2077 if (direction == UP)
2005 scrollBar.state = STATE_UP; 2078 scrollBar.state = SB_STATE_UP;
2006 else 2079 else
2007 scrollBar.state = STATE_DOWN; 2080 scrollBar.state = SB_STATE_DOWN;
2008 } 2081 }
2009 } 2082 }
2010 else 2083 else
2011 switch (ev.button) 2084 switch (ev.button)
2012 { 2085 {
2013 case Button2: 2086 case Button2:
2014 switch (scrollBar.align) 2087 switch (scrollBar.align)
2015 { 2088 {
2016 case R_SB_ALIGN_TOP: 2089 case SB_ALIGN_TOP:
2017 csrO = 0; 2090 csrO = 0;
2018 break; 2091 break;
2019 case R_SB_ALIGN_CENTRE: 2092 case SB_ALIGN_CENTRE:
2020 csrO = (scrollBar.bot - scrollBar.top) / 2; 2093 csrO = (scrollBar.bot - scrollBar.top) / 2;
2021 break; 2094 break;
2022 case R_SB_ALIGN_BOTTOM: 2095 case SB_ALIGN_BOTTOM:
2023 csrO = scrollBar.bot - scrollBar.top; 2096 csrO = scrollBar.bot - scrollBar.top;
2024 break; 2097 break;
2025 } 2098 }
2026 2099
2027 if (scrollBar.style == R_SB_XTERM 2100 if (scrollBar.style == SB_STYLE_XTERM
2028 || scrollbar_above_slider (ev.y) 2101 || scrollBar.above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2102 || scrollBar.below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2103 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2031 2104
2032 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2033 break; 2106 break;
2034 2107
2035 case Button1: 2108 case Button1:
2036 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2109 if (scrollBar.align == SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2110 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2111 /* FALLTHROUGH */
2039 2112
2040 case Button3: 2113 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2114 if (scrollBar.style != SB_STYLE_XTERM)
2042 { 2115 {
2043 if (scrollbar_above_slider (ev.y)) 2116 if (scrollBar.above_slider (ev.y))
2044# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2045 scr_page (UP, nrow - 1); 2118 scr_page (UP, nrow - 1);
2046# else 2119# else
2047 scr_page (UP, nrow / 4); 2120 scr_page (UP, nrow / 4);
2048# endif 2121# endif
2049 else if (scrollbar_below_slider (ev.y)) 2122 else if (scrollBar.below_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2123# ifdef RXVT_SCROLL_FULL
2051 scr_page (DN, nrow - 1); 2124 scr_page (DN, nrow - 1);
2052# else 2125# else
2053 scr_page (DN, nrow / 4); 2126 scr_page (DN, nrow / 4);
2054# endif 2127# endif
2055 else 2128 else
2056 scrollBar.state = STATE_MOTION; 2129 scrollBar.state = SB_STATE_MOTION;
2057 } 2130 }
2058 else 2131 else
2059 { 2132 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2133 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2134 (nrow
2062 * scrollbar_position (ev.y) 2135 * scrollBar.position (ev.y)
2063 / scrollbar_size ())); 2136 / scrollBar.size ()));
2064 } 2137 }
2065 2138
2066 break; 2139 break;
2067 } 2140 }
2068 } 2141 }
… …
2078 2151
2079 csrO = 0; /* reset csr Offset */ 2152 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2153 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2154 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2155
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2156 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2084 { 2157 {
2085 scrollBar.state = STATE_IDLE; 2158 scrollBar.state = SB_STATE_IDLE;
2086 scrollbar_show (0); 2159 scrollBar.show (0);
2087 } 2160 }
2088 2161
2089#ifdef SELECTION_SCROLLING 2162#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2163 sel_scroll_ev.stop();
2091#endif 2164#endif
… …
2140 case Button3: 2213 case Button3:
2141 selection_make (ev.time); 2214 selection_make (ev.time);
2142 break; 2215 break;
2143 2216
2144 case Button2: 2217 case Button2:
2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2218 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2219 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2220 break;
2148 2221
2149#ifdef MOUSE_WHEEL 2222#ifdef MOUSE_WHEEL
2150 case Button4: 2223 case Button4:
2151 case Button5: 2224 case Button5:
2152 { 2225 {
2153 int i; 2226 int lines;
2154 page_dirn v; 2227 page_dirn dirn;
2155 2228
2156 v = ev.button == Button4 ? UP : DN; 2229 dirn = ev.button == Button4 ? UP : DN;
2157 2230
2158 if (ev.state & ShiftMask) 2231 if (ev.state & ShiftMask)
2159 i = 1; 2232 lines = 1;
2160 else if (option (Opt_mouseWheelScrollPage)) 2233 else if (option (Opt_mouseWheelScrollPage))
2161 i = nrow - 1; 2234 lines = nrow - 1;
2162 else 2235 else
2163 i = 5; 2236 lines = 5;
2164 2237
2165# ifdef MOUSE_SLIP_WHEELING 2238# ifdef MOUSE_SLIP_WHEELING
2166 if (ev.state & ControlMask) 2239 if (ev.state & ControlMask)
2167 { 2240 {
2168 mouse_slip_wheel_speed += v ? -1 : 1; 2241 mouse_slip_wheel_speed += dirn;
2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2242 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2171 2243
2172 if (!slip_wheel_ev.is_active ()) 2244 if (!slip_wheel_ev.is_active ())
2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2245 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2174 } 2246 }
2175 else 2247 else
2176# endif 2248# endif
2177 { 2249 {
2178 scr_page (v, i); 2250 scr_page (dirn, lines);
2179 scrollbar_show (1); 2251 scrollBar.show (1);
2180 } 2252 }
2181 } 2253 }
2182 break; 2254 break;
2183#endif 2255#endif
2184 } 2256 }
2185 } 2257 }
2186} 2258}
2187 2259
2188/*}}} */ 2260/*}}} */
2189 2261
2190bool 2262void ecb_hot
2191rxvt_term::cmd_parse () 2263rxvt_term::cmd_parse ()
2192{ 2264{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2265 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2266 char *seq_begin; // remember start of esc-sequence here
2196 2267
2197 for (;;) 2268 for (;;)
2198 { 2269 {
2199 if (ch == NOCHAR) 2270 if (ecb_unlikely (ch == NOCHAR))
2200 { 2271 {
2201 seq_begin = cmdbuf_ptr; 2272 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2273 ch = next_char ();
2203 2274
2204 if (ch == NOCHAR) 2275 if (ch == NOCHAR)
2205 break; 2276 break;
2206 } 2277 }
2207 2278
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2279 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2280 {
2210 if (!seen_input) 2281 if (ecb_unlikely (!seen_input))
2211 { 2282 {
2212 seen_input = 1; 2283 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2284 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2285 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2286 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2299 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2300 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2301
2231 for (;;) 2302 for (;;)
2232 { 2303 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2304 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2305 break;
2235 2306
2236 *str++ = ch; 2307 *str++ = ch;
2237 2308
2238 if (ch == C0_LF || str >= eol) 2309 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2310 {
2240 if (ch == C0_LF) 2311 if (ch == C0_LF)
2241 nlines++; 2312 nlines++;
2242 2313
2243 refresh_count++; 2314 refresh_count++;
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2363 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2364 * if skipScroll is enabled.
2294 */ 2365 */
2295 if (refreshnow) 2366 if (refreshnow)
2296 { 2367 {
2297 flag = true;
2298 scr_refresh (); 2368 scr_refresh ();
2299 want_refresh = 1; 2369 want_refresh = 1;
2300 } 2370 }
2301
2302 } 2371 }
2303 else 2372 else
2304 { 2373 {
2305 try 2374 try
2306 { 2375 {
… …
2314 } 2383 }
2315 2384
2316 ch = NOCHAR; 2385 ch = NOCHAR;
2317 } 2386 }
2318 } 2387 }
2319
2320 return flag;
2321} 2388}
2322 2389
2323// read the next character 2390// read the next character
2324wchar_t 2391wchar_t ecb_hot
2325rxvt_term::next_char () NOTHROW 2392rxvt_term::next_char () NOTHROW
2326{ 2393{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2394 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2395 {
2329 // assume 7-bit to be ascii ALWAYS 2396 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2397 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2398 return *cmdbuf_ptr++;
2332 2399
2333 wchar_t wc; 2400 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2401 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2402
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2406 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2407 break;
2341 } 2408 }
2342 2409
2343 if (len == (size_t)-1) 2410 if (len == (size_t)-1)
2411 {
2412 mbstate.reset (); // reset now undefined conversion state
2413 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2414 // in which case we "erroneously" return the next byte which might be valid.
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2415 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2416 }
2345 2417
2346 // assume wchar == unicode 2418 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2419 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2420 return wc & UNICODE_MASK;
2349 } 2421 }
2350 2422
2351 return NOCHAR; 2423 return NOCHAR;
2352} 2424}
2353 2425
2354// read the next octet 2426// read the next octet
2355uint32_t 2427uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2428rxvt_term::next_octet () NOTHROW
2357{ 2429{
2358 return cmdbuf_ptr < cmdbuf_endp 2430 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2431 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2432 : NOCHAR;
2361} 2433}
2362 2434
2363static class out_of_input out_of_input; 2435static class out_of_input out_of_input;
2364 2436
2365/* rxvt_cmd_getc () - Return next input character */ 2437wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2438rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2439{
2373 wchar_t c = next_char (); 2440 wchar_t c = next_char ();
2374 2441
2375 if (c == NOCHAR) 2442 if (c == NOCHAR)
2376 throw out_of_input; 2443 throw out_of_input;
2377 2444
2378 return c; 2445 return c;
2379} 2446}
2380 2447
2381uint32_t 2448uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2449rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2450{
2384 uint32_t c = next_octet (); 2451 uint32_t c = next_octet ();
2385 2452
2386 if (c == NOCHAR) 2453 if (c == NOCHAR)
… …
2390} 2457}
2391 2458
2392/*{{{ print pipe */ 2459/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2460/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2461#ifdef PRINTPIPE
2395FILE * 2462FILE * ecb_cold
2396rxvt_term::popen_printer () 2463rxvt_term::popen_printer ()
2397{ 2464{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2465 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2466
2400 if (stream == NULL) 2467 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2468 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2469
2403 return stream; 2470 return stream;
2404} 2471}
2405 2472
2406int 2473int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2474rxvt_term::pclose_printer (FILE *stream)
2408{ 2475{
2409 fflush (stream); 2476 fflush (stream);
2410 return pclose (stream); 2477 return pclose (stream);
2411} 2478}
2412 2479
2413/* 2480/*
2414 * simulate attached vt100 printer 2481 * simulate attached vt100 printer
2415 */ 2482 */
2416void 2483void ecb_cold
2417rxvt_term::process_print_pipe () 2484rxvt_term::process_print_pipe ()
2418{ 2485{
2419 int done; 2486 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2487
2422 if ((fd = popen_printer ()) == NULL) 2488 if (!fd)
2423 return; 2489 return;
2424 2490
2425 /* 2491 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2492 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2493 * is received.
2428 */ 2494 */
2429 for (done = 0; !done;) 2495 for (int done = 0; !done; )
2430 { 2496 {
2431 unsigned char buf[8]; 2497 unsigned char buf[8];
2432 unicode_t ch; 2498 unicode_t ch;
2433 unsigned int i, len; 2499 unsigned int i, len;
2434 2500
… …
2468 pclose_printer (fd); 2534 pclose_printer (fd);
2469} 2535}
2470#endif /* PRINTPIPE */ 2536#endif /* PRINTPIPE */
2471/*}}} */ 2537/*}}} */
2472 2538
2473/* *INDENT-OFF* */
2474enum { 2539enum {
2475 C1_40 = 0x40, 2540 C1_40 = 0x40,
2476 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2541 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2477 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2542 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2478 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2543 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2479 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2544 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2480}; 2545};
2481/* *INDENT-ON* */
2482 2546
2483/*{{{ process non-printing single characters */ 2547/*{{{ process non-printing single characters */
2484void 2548void ecb_hot
2485rxvt_term::process_nonprinting (unicode_t ch) 2549rxvt_term::process_nonprinting (unicode_t ch)
2486{ 2550{
2487 switch (ch) 2551 switch (ch)
2488 { 2552 {
2489 case C0_ESC: 2553 case C0_ESC:
… …
2535} 2599}
2536/*}}} */ 2600/*}}} */
2537 2601
2538 2602
2539/*{{{ process VT52 escape sequences */ 2603/*{{{ process VT52 escape sequences */
2540void 2604void ecb_cold
2541rxvt_term::process_escape_vt52 (unicode_t ch) 2605rxvt_term::process_escape_vt52 (unicode_t ch)
2542{ 2606{
2543 int row, col; 2607 int row, col;
2544 2608
2545 switch (ch) 2609 switch (ch)
… …
2579 break; 2643 break;
2580 case 'Z': /* identify the terminal type */ 2644 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2645 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2646 break;
2583 case '<': /* turn off VT52 mode */ 2647 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2648 priv_modes &= ~PrivMode_vt52;
2585 break; 2649 break;
2586 case 'F': /* use special graphics character set */ 2650 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2651 case 'G': /* use regular character set */
2588 /* unimplemented */ 2652 /* unimplemented */
2589 break; 2653 break;
… …
2595} 2659}
2596/*}}} */ 2660/*}}} */
2597 2661
2598 2662
2599/*{{{ process escape sequences */ 2663/*{{{ process escape sequences */
2600void 2664void ecb_hot
2601rxvt_term::process_escape_seq () 2665rxvt_term::process_escape_seq ()
2602{ 2666{
2603 unicode_t ch = cmd_getc (); 2667 unicode_t ch = cmd_getc ();
2604 2668
2605 if (priv_modes & PrivMode_vt52) 2669 if (priv_modes & PrivMode_vt52)
… …
2608 return; 2672 return;
2609 } 2673 }
2610 2674
2611 switch (ch) 2675 switch (ch)
2612 { 2676 {
2613 /* case 1: do_tek_mode (); break; */
2614 case '#': 2677 case '#':
2615 if (cmd_getc () == '8') 2678 if (cmd_getc () == '8')
2616 scr_E (); 2679 scr_E ();
2617 break; 2680 break;
2618 case '(': 2681 case '(':
… …
2641#if !ENABLE_MINIMAL 2704#if !ENABLE_MINIMAL
2642 case '9': 2705 case '9':
2643 scr_forwardindex (); 2706 scr_forwardindex ();
2644 break; 2707 break;
2645#endif 2708#endif
2709 // DECPAM/DECPNM
2646 case '=': 2710 case '=':
2711 priv_modes |= PrivMode_aplKP;
2712 break;
2647 case '>': 2713 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2714 priv_modes &= ~PrivMode_aplKP;
2649 break; 2715 break;
2650 2716
2651 case C1_40: 2717 case C1_40:
2652 cmd_getc (); 2718 cmd_getc ();
2653 break; 2719 break;
… …
2657 2723
2658 /* 8.3.87: NEXT LINE */ 2724 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2725 case C1_NEL: /* ESC E */
2660 { 2726 {
2661 wchar_t nlcr[] = { C0_LF, C0_CR }; 2727 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2728 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2663 } 2729 }
2664 break; 2730 break;
2665 2731
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2732 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2733 case C1_ESA: /* ESC G */
2668 process_graphics (); 2734 // used by original rxvt for rob nations own graphics mode
2735 if (cmd_getc () == 'Q')
2736 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2669 break; 2737 break;
2670 2738
2671 /* 8.3.63: CHARACTER TABULATION SET */ 2739 /* 8.3.63: CHARACTER TABULATION SET */
2672 case C1_HTS: /* ESC H */ 2740 case C1_HTS: /* ESC H */
2673 scr_set_tab (1); 2741 scr_set_tab (1);
… …
2677 case C1_RI: /* ESC M */ 2745 case C1_RI: /* ESC M */
2678 scr_index (DN); 2746 scr_index (DN);
2679 break; 2747 break;
2680 2748
2681 /* 8.3.142: SINGLE-SHIFT TWO */ 2749 /* 8.3.142: SINGLE-SHIFT TWO */
2682 /*case C1_SS2: scr_single_shift (2); break; */ 2750 /* case C1_SS2: break; */
2683 2751
2684 /* 8.3.143: SINGLE-SHIFT THREE */ 2752 /* 8.3.143: SINGLE-SHIFT THREE */
2685 /*case C1_SS3: scr_single_shift (3); break; */ 2753 /* case C1_SS3: break; */
2686 2754
2687 /* 8.3.27: DEVICE CONTROL STRING */ 2755 /* 8.3.27: DEVICE CONTROL STRING */
2688 case C1_DCS: /* ESC P */ 2756 case C1_DCS: /* ESC P */
2689 process_dcs_seq (); 2757 process_dcs_seq ();
2690 break; 2758 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2760 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2761 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2762 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2763 break; /* steal obsolete ESC [ c */
2696 2764
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2765 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2766 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2767 process_csi_seq ();
2700 break; 2768 break;
2701 2769
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2770 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2771 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2772 process_osc_seq ();
2705 break; 2773 break;
2706 2774
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2775 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2776 case 'c':
2709 mbstate.reset (); 2777 mbstate.reset ();
2710 scr_poweron (); 2778 scr_poweron ();
2711 scrollbar_show (1); 2779 scrollBar.show (1);
2712 break; 2780 break;
2713 2781
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2782 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2783 case 'n':
2716 scr_charset_choose (2); 2784 scr_charset_choose (2);
… …
2723 } 2791 }
2724} 2792}
2725/*}}} */ 2793/*}}} */
2726 2794
2727/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2795/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2728/* *INDENT-OFF* */
2729enum { 2796enum {
2730 CSI_ICH = 0x40, 2797 CSI_ICH = 0x40,
2731 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2798 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2732 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2799 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2733 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2800 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2736 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2803 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2737 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2804 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2738 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2805 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2739}; 2806};
2740 2807
2741#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2808#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2742 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2809 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2743 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2810 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2744#define get_byte_array_bit(array, bit) \ 2811#define get_byte_array_bit(array, bit) \
2745 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2812 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2746 2813
2747const unsigned char csi_defaults[] = 2814static const unsigned char csi_defaults[] =
2748 { 2815 {
2749 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2816 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2750 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2817 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2751 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2818 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2752 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2819 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2753 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2820 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2754 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2821 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2755 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2756 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2757 }; 2824 };
2758/* *INDENT-ON* */
2759 2825
2760void 2826void ecb_hot
2761rxvt_term::process_csi_seq () 2827rxvt_term::process_csi_seq ()
2762{ 2828{
2763 unicode_t ch, priv, i; 2829 unicode_t ch, priv, prev_ch, i;
2764 unsigned int nargs, p; 2830 unsigned int nargs, p;
2765 int n, ndef; 2831 int n, ndef;
2766 int arg[ESC_ARGS] = { }; 2832 int arg[ESC_ARGS] = { };
2767 2833
2768 nargs = 0; 2834 nargs = 0;
2769 2835
2770 priv = 0; 2836 priv = 0;
2771 ch = cmd_getc (); 2837 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2838 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2839 {
2774 /* '<' '=' '>' '?' */ 2840 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2841 priv = ch;
2776 ch = cmd_getc (); 2842 ch = cmd_getc ();
2777 } 2843 }
2778 2844
2845 prev_ch = 0;
2779 /* read any numerical arguments */ 2846 /* read any numerical arguments */
2780 for (n = -1; ch < CSI_ICH; ) 2847 for (n = -1; ch < CSI_ICH; )
2781 { 2848 {
2782 if (isdigit (ch)) 2849 if (isdigit (ch))
2783 { 2850 {
… …
2793 n = -1; 2860 n = -1;
2794 } 2861 }
2795 else if (IS_CONTROL (ch)) 2862 else if (IS_CONTROL (ch))
2796 process_nonprinting (ch); 2863 process_nonprinting (ch);
2797 2864
2865 prev_ch = ch;
2798 ch = cmd_getc (); 2866 ch = cmd_getc ();
2799 } 2867 }
2800 2868
2801 if (ch > CSI_7F) 2869 if (ch > CSI_7F)
2802 return; 2870 return;
… …
2833 2901
2834 case '?': 2902 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2903 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2904 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2905 break;
2906
2907 case '!':
2908 if (ch == CSI_70)
2909 {
2910 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2911 scr_soft_reset ();
2912
2913 static const int pm_h[] = { 7, 25 };
2914 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2915
2916 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2917 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2838 } 2918 }
2919 break;
2920 }
2921
2839 return; 2922 return;
2840 } 2923 }
2841 2924
2842 switch (ch) 2925 switch (ch)
2843 { 2926 {
… …
2857 } 2940 }
2858 break; 2941 break;
2859#endif 2942#endif
2860 2943
2861 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2944 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2862 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2945 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2863 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
2864 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
2865 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2948 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2866 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2949 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2867 scr_gotorc (arg[0], 0, RELATIVE); 2950 scr_gotorc (arg[0], 0, RELATIVE);
2868 break; 2951 break;
2869 2952
2870 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2953 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2871 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2954 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3021 scr_insert_mode (1); 3104 scr_insert_mode (1);
3022 else if (arg[0] == 20) 3105 else if (arg[0] == 20)
3023 priv_modes |= PrivMode_LFNL; 3106 priv_modes |= PrivMode_LFNL;
3024 break; 3107 break;
3025 3108
3109 case CSI_71: // DESCUSR: set cursor style
3110 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]);
3112 break;
3113
3026 /* 3114 /*
3027 * PRIVATE USE beyond this point. All CSI_7? sequences here 3115 * PRIVATE USE beyond this point. All CSI_7? sequences here
3028 */ 3116 */
3029 case CSI_72: /* DECSTBM: set top and bottom margins */ 3117 case CSI_72: /* DECSTBM: set top and bottom margins */
3030 if (nargs == 1) 3118 if (nargs == 1)
… …
3058 } 3146 }
3059} 3147}
3060/*}}} */ 3148/*}}} */
3061 3149
3062#if !ENABLE_MINIMAL 3150#if !ENABLE_MINIMAL
3063/* ARGSUSED */
3064void 3151void
3065rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3152rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3066{ 3153{
3067 int x, y; 3154 int x, y;
3068 XWindowAttributes wattr; 3155 XWindowAttributes wattr;
… …
3077 { 3164 {
3078 /* 3165 /*
3079 * commands 3166 * commands
3080 */ 3167 */
3081 case 1: /* deiconify window */ 3168 case 1: /* deiconify window */
3082 XMapWindow (dpy, parent[0]); 3169 XMapWindow (dpy, parent);
3083 break; 3170 break;
3084 case 2: /* iconify window */ 3171 case 2: /* iconify window */
3085 XIconifyWindow (dpy, parent[0], display->screen); 3172 XIconifyWindow (dpy, parent, display->screen);
3086 break; 3173 break;
3087 case 3: /* set position (pixels) */ 3174 case 3: /* set position (pixels) */
3088 XMoveWindow (dpy, parent[0], args[1], args[2]); 3175 XMoveWindow (dpy, parent, args[1], args[2]);
3089 break; 3176 break;
3090 case 4: /* set size (pixels) */ 3177 case 4: /* set size (pixels) */
3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3178 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3092 break; 3179 break;
3093 case 5: /* raise window */ 3180 case 5: /* raise window */
3094 XRaiseWindow (dpy, parent[0]); 3181 XRaiseWindow (dpy, parent);
3095 break; 3182 break;
3096 case 6: /* lower window */ 3183 case 6: /* lower window */
3097 XLowerWindow (dpy, parent[0]); 3184 XLowerWindow (dpy, parent);
3098 break; 3185 break;
3099 case 7: /* refresh window */ 3186 case 7: /* refresh window */
3100 scr_touch (true); 3187 scr_touch (true);
3101 break; 3188 break;
3102 case 8: /* set size (chars) */ 3189 case 8: /* set size (chars) */
… …
3105 break; 3192 break;
3106 3193
3107 //case 9: NYI, TODO, restore maximized window or maximize window 3194 //case 9: NYI, TODO, restore maximized window or maximize window
3108 default: 3195 default:
3109 if (args[0] >= 24) /* set height (chars) */ 3196 if (args[0] >= 24) /* set height (chars) */
3110 set_widthheight ((unsigned int)width, 3197 set_widthheight ((unsigned int)vt_width,
3111 (unsigned int) (args[1] * fheight)); 3198 (unsigned int) (args[1] * fheight));
3112 break; 3199 break;
3113 3200
3114 /* 3201 /*
3115 * reports - some output format copied from XTerm 3202 * reports - some output format copied from XTerm
3116 */ 3203 */
3117 case 11: /* report window state */ 3204 case 11: /* report window state */
3118 XGetWindowAttributes (dpy, parent[0], &wattr); 3205 XGetWindowAttributes (dpy, parent, &wattr);
3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3206 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3120 break; 3207 break;
3121 case 13: /* report window position */ 3208 case 13: /* report window position */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3123 XTranslateCoordinates (dpy, parent[0], wattr.root, 3210 XTranslateCoordinates (dpy, parent, wattr.root,
3124 -wattr.border_width, -wattr.border_width, 3211 -wattr.border_width, -wattr.border_width,
3125 &x, &y, &wdummy); 3212 &x, &y, &wdummy);
3126 tt_printf ("\033[3;%d;%dt", x, y); 3213 tt_printf ("\033[3;%d;%dt", x, y);
3127 break; 3214 break;
3128 case 14: /* report window size (pixels) */ 3215 case 14: /* report window size (pixels) */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3216 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3217 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3131 break; 3218 break;
3132 case 18: /* report text area size (chars) */ 3219 case 18: /* report text area size (chars) */
3133 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3134 break; 3221 break;
… …
3136 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3223 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3137 break; 3224 break;
3138 case 20: /* report icon label */ 3225 case 20: /* report icon label */
3139 { 3226 {
3140 char *s; 3227 char *s;
3141 XGetIconName (dpy, parent[0], &s); 3228 XGetIconName (dpy, parent, &s);
3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3143 XFree (s); 3230 XFree (s);
3144 } 3231 }
3145 break; 3232 break;
3146 case 21: /* report window title */ 3233 case 21: /* report window title */
3147 { 3234 {
3148 char *s; 3235 char *s;
3149 XFetchName (dpy, parent[0], &s); 3236 XFetchName (dpy, parent, &s);
3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3237 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3151 XFree (s); 3238 XFree (s);
3152 } 3239 }
3153 break; 3240 break;
3154 } 3241 }
… …
3164rxvt_term::get_to_st (unicode_t &ends_how) 3251rxvt_term::get_to_st (unicode_t &ends_how)
3165{ 3252{
3166 unicode_t ch; 3253 unicode_t ch;
3167 bool seen_esc = false; 3254 bool seen_esc = false;
3168 unsigned int n = 0; 3255 unsigned int n = 0;
3169 wchar_t string[STRING_MAX]; 3256 wchar_t string[CBUFSIZ];
3170 3257
3171 while ((ch = cmd_getc ()) != NOCHAR) 3258 while ((ch = cmd_getc ()) != NOCHAR)
3172 { 3259 {
3173 if (seen_esc) 3260 if (seen_esc)
3174 { 3261 {
… …
3189 else if (ch < 0x20) 3276 else if (ch < 0x20)
3190 return NULL; /* other control character - exit */ 3277 return NULL; /* other control character - exit */
3191 3278
3192 seen_esc = false; 3279 seen_esc = false;
3193 3280
3194 if (n >= STRING_MAX - 1) 3281 if (n >= sizeof (string) - 1)
3195 // stop at some sane length 3282 // stop at some sane length
3196 return NULL; 3283 return NULL;
3197 3284
3198 string[n++] = ch; 3285 string[n++] = ch;
3199 } 3286 }
… …
3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3297 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3211 */ 3298 */
3212void 3299void
3213rxvt_term::process_dcs_seq () 3300rxvt_term::process_dcs_seq ()
3214{ 3301{
3215 char *s;
3216 unicode_t eh;
3217
3218 /* 3302 /*
3219 * Not handled yet 3303 * Not handled yet
3220 */ 3304 */
3305
3306 unicode_t eh;
3221 s = get_to_st (eh); 3307 char *s = get_to_st (eh);
3222 if (s) 3308 if (s)
3223 free (s); 3309 free (s);
3224 3310
3225 return; 3311 return;
3226} 3312}
… …
3230 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3316 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3231 */ 3317 */
3232void 3318void
3233rxvt_term::process_osc_seq () 3319rxvt_term::process_osc_seq ()
3234{ 3320{
3235 unicode_t ch, eh;
3236 int arg; 3321 int arg;
3237 3322
3238 ch = cmd_getc (); 3323 unicode_t ch = cmd_getc ();
3239 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3324 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3240 arg = arg * 10 + (ch - '0'); 3325 arg = arg * 10 + (ch - '0');
3241 3326
3242 if (ch == ';') 3327 if (ch == ';')
3243 { 3328 {
3329 unicode_t eh;
3244 char *s = get_to_st (eh); 3330 char *s = get_to_st (eh);
3245 3331
3246 if (s) 3332 if (s)
3247 { 3333 {
3248 process_xterm_seq (arg, s, eh); 3334 process_xterm_seq (arg, s, eh);
… …
3272 3358
3273/* 3359/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3360 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3361 */
3276void 3362void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3363rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3364{
3279 int color; 3365 int color;
3280 char *buf, *name; 3366 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3367 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3368 int saveop = op;
… …
3309 unsigned long bytes_after; 3395 unsigned long bytes_after;
3310 unsigned char *value = 0; 3396 unsigned char *value = 0;
3311 const char *str = ""; 3397 const char *str = "";
3312 3398
3313 if (prop 3399 if (prop
3314 && XGetWindowProperty (dpy, parent[0], 3400 && XGetWindowProperty (dpy, parent,
3315 prop, 0, 1<<16, 0, AnyPropertyType, 3401 prop, 0, 1<<16, 0, AnyPropertyType,
3316 &actual_type, &actual_format, 3402 &actual_type, &actual_format,
3317 &nitems, &bytes_after, &value) == Success 3403 &nitems, &bytes_after, &value) == Success
3318 && actual_type != None 3404 && actual_type != None
3319 && actual_format == 8) 3405 && actual_format == 8)
3320 str = (const char *)(value); 3406 str = (const char *)(value);
3321 3407
3322 tt_printf ("\033]%d;%s%c", op, str, resp); 3408 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3323 3409
3324 XFree (value); 3410 XFree (value);
3325 } 3411 }
3326 else 3412 else
3327 { 3413 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3414 char *eq = strchr (str, '=');
3329 3415
3330 if (eq) 3416 if (eq)
3331 { 3417 {
3332 *eq = 0; 3418 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3419 set_utf8_property (display->atom (str), eq + 1);
3334 } 3420 }
3335 else 3421 else
3336 XDeleteProperty (dpy, parent[0], 3422 XDeleteProperty (dpy, parent,
3337 display->atom (str)); 3423 display->atom (str));
3338 } 3424 }
3339 break; 3425 break;
3340 3426
3341 case XTerm_Color: 3427 case XTerm_Color:
… …
3373 process_color_seq (op, Color_pointer_fg, str, resp); 3459 process_color_seq (op, Color_pointer_fg, str, resp);
3374 break; 3460 break;
3375 case XTerm_Color_pointer_bg: 3461 case XTerm_Color_pointer_bg:
3376 process_color_seq (op, Color_pointer_bg, str, resp); 3462 process_color_seq (op, Color_pointer_bg, str, resp);
3377 break; 3463 break;
3464#ifdef OPTION_HC
3465 case XTerm_Color_HC:
3466 process_color_seq (op, Color_HC, str, resp);
3467 break;
3468 case XTerm_Color_HTC:
3469 process_color_seq (op, Color_HTC, str, resp);
3470 break;
3471#endif
3378#ifndef NO_BOLD_UNDERLINE_REVERSE 3472#ifndef NO_BOLD_UNDERLINE_REVERSE
3379 case XTerm_Color_RV:
3380 process_color_seq (op, Color_RV, str, resp);
3381 break;
3382 case Rxvt_Color_BD:
3383 case URxvt_Color_BD: 3473 case URxvt_Color_BD:
3384 process_color_seq (op, Color_BD, str, resp); 3474 process_color_seq (op, Color_BD, str, resp);
3385 break; 3475 break;
3386 case Rxvt_Color_UL:
3387 case URxvt_Color_UL: 3476 case URxvt_Color_UL:
3388 process_color_seq (op, Color_UL, str, resp); 3477 process_color_seq (op, Color_UL, str, resp);
3389 break; 3478 break;
3390 case URxvt_Color_IT: 3479 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3480 process_color_seq (op, Color_IT, str, resp);
3392 break; 3481 break;
3393#endif 3482#endif
3394#if ENABLE_TRANSPARENCY 3483 case URxvt_Color_border:
3484 process_color_seq (op, Color_border, str, resp);
3485 break;
3486
3487#if BG_IMAGE_FROM_ROOT
3395 case URxvt_Color_tint: 3488 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3489 process_color_seq (op, Color_tint, str, resp);
3397 { 3490 {
3398 bool changed = false; 3491 bool changed = false;
3399 3492
3400 if (ISSET_PIXCOLOR (Color_tint)) 3493 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3494 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404 3495
3405 if (changed) 3496 if (changed)
3406 update_background (); 3497 update_background ();
3407 } 3498 }
3408 3499
… …
3412#if BG_IMAGE_FROM_FILE 3503#if BG_IMAGE_FROM_FILE
3413 case Rxvt_Pixmap: 3504 case Rxvt_Pixmap:
3414 if (!strcmp (str, "?")) 3505 if (!strcmp (str, "?"))
3415 { 3506 {
3416 char str[256]; 3507 char str[256];
3508 int h_scale = fimage.h_scale;
3509 int v_scale = fimage.v_scale;
3510 int h_align = fimage.h_align;
3511 int v_align = fimage.v_align;
3417 3512
3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3513 sprintf (str, "[%dx%d+%d+%d]",
3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3514 h_scale, v_scale,
3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3515 h_align, v_align);
3421 process_xterm_seq (XTerm_title, str, CHAR_ST); 3516 process_xterm_seq (XTerm_title, str, CHAR_ST);
3422 } 3517 }
3423 else 3518 else
3424 { 3519 {
3425 int changed = 0; 3520 bool changed = false;
3426 3521
3427 if (*str != ';') 3522 if (*str != ';')
3428 { 3523 {
3429 /* reset to default scaling :*/ 3524 try
3430 bgPixmap.unset_geometry (); 3525 {
3431 if (bgPixmap.set_file (str)) /* change pixmap */ 3526 fimage.set_file_geometry (this, str);
3432 changed++; 3527 changed = true;
3433 str = strchr (str, ';'); 3528 }
3434 if (str == NULL) 3529 catch (const class rxvt_failure_exception &e)
3435 bgPixmap.set_defaultGeometry (); 3530 {
3531 }
3436 } 3532 }
3437 3533 else
3438 while (str)
3439 { 3534 {
3440 str++; 3535 str++;
3441 if (bgPixmap.set_geometry (str)) 3536 if (fimage.set_geometry (str, true))
3442 changed++; 3537 changed = true;
3443 str = strchr (str, ';');
3444 } 3538 }
3445 3539
3446 if (changed) 3540 if (changed)
3541 {
3542 if (bg_window_position_sensitive ())
3543 {
3544 int x, y;
3545 get_window_origin (x, y);
3546 parent_x = x;
3547 parent_y = y;
3548 }
3447 update_background (); 3549 update_background ();
3550 }
3448 } 3551 }
3449 break; 3552 break;
3450#endif 3553#endif
3451 3554
3452 case XTerm_logfile: 3555 case XTerm_logfile:
… …
3522 break; 3625 break;
3523#endif 3626#endif
3524 3627
3525#if ENABLE_PERL 3628#if ENABLE_PERL
3526 case URxvt_perl: 3629 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3630 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528 ; // no responses yet
3529 break; 3631 break;
3530#endif 3632#endif
3531 } 3633 }
3532} 3634}
3533/*----------------------------------------------------------------------*/ 3635/*----------------------------------------------------------------------*/
… …
3540 * 's' = save 3642 * 's' = save
3541 * 'r' = restore 3643 * 'r' = restore
3542 * 't' = toggle 3644 * 't' = toggle
3543 * so no need for fancy checking 3645 * so no need for fancy checking
3544 */ 3646 */
3545int 3647int ecb_cold
3546rxvt_term::privcases (int mode, unsigned long bit) 3648rxvt_term::privcases (int mode, unsigned long bit)
3547{ 3649{
3548 int state; 3650 int state;
3549 3651
3550 if (mode == 's') 3652 if (mode == 's')
3551 { 3653 {
3552 SavedModes |= (priv_modes & bit); 3654 if (priv_modes & bit)
3655 SavedModes |= bit;
3656 else
3657 SavedModes &= ~bit;
3553 return -1; 3658 return -1;
3554 } 3659 }
3555 else 3660 else
3556 { 3661 {
3557 if (mode == 'r') 3662 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3663 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3664 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3665 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3666
3667 if (state)
3668 priv_modes |= bit;
3669 else
3670 priv_modes &= ~bit;
3562 } 3671 }
3563 3672
3564 return state; 3673 return state;
3565} 3674}
3566 3675
3567/* we're not using priv _yet_ */ 3676/* we're not using priv _yet_ */
3568void 3677void
3569rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3678rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3570{ 3679{
3571 unsigned int i, j; 3680 unsigned int i, j;
3572 int state; 3681 int state;
3573 3682
3574 static const struct 3683 static const struct
3575 { 3684 {
3576 const int argval; 3685 const int argval;
3577 const unsigned long bit; 3686 const unsigned long bit;
3578 } argtopriv[] = { 3687 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3688 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3689 { 2, PrivMode_vt52 }, // DECANM
3581 { 3, PrivMode_132 }, 3690 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3691 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3692 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3693 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3694 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3695 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3696 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3697 // 18 end FF to printer after print screen
3698 // 19 Print screen prints full screen/scroll region
3589 { 25, PrivMode_VisibleCursor }, 3699 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3700#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3701 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3702#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3703 { 35, PrivMode_ShiftKeys }, // rxvt extension
3704 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3705 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3706 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3707 // 45 margin bell NYI
3597 // 46 start logging 3708 // 46 start logging
3598 { 47, PrivMode_Screen }, 3709 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3710 { 66, PrivMode_aplKP }, // DECNKM
3600#ifndef NO_BACKSPACE_KEY 3711#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3712 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3713#endif
3603 { 1000, PrivMode_MouseX11 }, 3714 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3715 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3716 { 1003, PrivMode_MouseAnyEvent },
3717#if ENABLE_FRILLS
3718 { 1005, PrivMode_ExtModeMouse },
3719#endif
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3720 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3607 { 1011, PrivMode_Keypress }, // rxvt extension 3721 { 1011, PrivMode_Keypress }, // rxvt extension
3722#if ENABLE_FRILLS
3723 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3724#endif
3608 // 1035 enable modifiers for alt, numlock NYI 3725 // 1035 enable modifiers for alt, numlock NYI
3609 // 1036 send ESC for meta keys NYI 3726 // 1036 send ESC for meta keys NYI
3610 // 1037 send DEL for keypad delete NYI 3727 // 1037 send DEL for keypad delete NYI
3611 { 1047, PrivMode_Screen }, 3728 { 1047, PrivMode_Screen },
3612 // 1048 save and restore cursor 3729 // 1048 save and restore cursor, implemented in code
3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3730 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3731 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste }, 3732 { 2004, PrivMode_BracketPaste },
3616 }; 3733 };
3617 3734
… …
3627 for (i = 0; i < nargs; i++) 3744 for (i = 0; i < nargs; i++)
3628 { 3745 {
3629 state = -1; 3746 state = -1;
3630 3747
3631 /* basic handling */ 3748 /* basic handling */
3632 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3749 for (j = 0; j < ecb_array_length (argtopriv); j++)
3633 if (argtopriv[j].argval == arg[i]) 3750 if (argtopriv[j].argval == arg[i])
3634 { 3751 {
3635 state = privcases (mode, argtopriv[j].bit); 3752 state = privcases (mode, argtopriv[j].bit);
3636 break; 3753 break;
3637 } 3754 }
… …
3645 3762
3646 scr_touch (true); 3763 scr_touch (true);
3647 break; 3764 break;
3648#endif 3765#endif
3649 case 1048: /* alternative cursor save */ 3766 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3768 if (mode == 0)
3653 scr_cursor (RESTORE); 3769 scr_cursor (RESTORE);
3654 else if (mode == 1) 3770 else if (mode == 1)
3655 scr_cursor (SAVE); 3771 scr_cursor (SAVE);
… …
3664 case 2: /* VT52 mode */ 3780 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3781 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3782 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3783 * within VT52 mode
3668 */ 3784 */
3669 PrivMode (1, PrivMode_vt52); 3785 priv_modes |= PrivMode_vt52;
3670 break; 3786 break;
3671 case 3: /* 80/132 */ 3787 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3788 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3789 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3790 break;
3678 case 4: /* smooth scrolling */ 3791 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3792 set_option (Opt_jumpScroll, !state);
3680 break; 3793 break;
3681 case 5: /* reverse video */ 3794 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3805 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3806 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3807 break;
3695#ifdef scrollBar_esc 3808#ifdef scrollBar_esc
3696 case scrollBar_esc: 3809 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3810 scrollBar.map (state);
3698 {
3699 resize_all_windows (0, 0, 0); 3811 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3812 scr_touch (true);
3701 }
3702 break; 3813 break;
3703#endif 3814#endif
3704 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3705 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3706 break; 3817 break;
… …
3719 case 1003: 3830 case 1003:
3720 if (state) 3831 if (state)
3721 { 3832 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3724 vt_emask_mouse = PointerMotionMask; 3836 vt_emask_mouse = PointerMotionMask;
3725 } 3837 }
3726 else 3838 else
3727 vt_emask_mouse = NoEventMask; 3839 vt_emask_mouse = NoEventMask;
3840
3728 vt_select_input (); 3841 vt_select_input ();
3729 break; 3842 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3844 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3845 break;
3733 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3848 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3851 if (!state)
3739 scr_erase_screen (2); 3852 scr_erase_screen (2);
3853
3740 scr_change_screen (state); 3854 scr_change_screen (state);
3741 break; 3855 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3743 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3744 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3864 if (state)
3746 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3747 break; 3868 break;
3748 default: 3869 default:
3749 break; 3870 break;
3750 } 3871 }
3751 } 3872 }
3752} 3873}
3753/*}}} */ 3874/*}}} */
3754 3875
3755/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3756void 3877void ecb_hot
3757rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3758{ 3879{
3759 unsigned int i; 3880 unsigned int i;
3760 short rendset; 3881 short rendset;
3761 int rendstyle; 3882 int rendstyle;
… …
3902 break; 4023 break;
3903#endif 4024#endif
3904 } 4025 }
3905 } 4026 }
3906} 4027}
3907/*}}} */
3908 4028
3909/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3910void 4029void
3911rxvt_term::process_graphics () 4030rxvt_term::set_cursor_style (int style)
3912{ 4031{
3913 unicode_t ch, cmd = cmd_getc (); 4032 if (!IN_RANGE_INC (style, 0, 4))
3914
3915 if (cmd == 'Q')
3916 {
3917 /* query graphics */
3918 tt_printf ("\033G0\012"); /* no graphics */
3919 return; 4033 return;
3920 } 4034
3921 /* swallow other graphics sequences until terminating ':' */ 4035 set_option (Opt_cursorUnderline, style >= 3);
3922 do 4036
3923 ch = cmd_getc (); 4037#ifdef CURSOR_BLINK
3924 while (ch != ':'); 4038 set_option (Opt_cursorBlink, !style || (style & 1));
4039 cursor_blink_reset ();
4040#endif
4041
4042 want_refresh = 1;
3925} 4043}
3926/*}}} */ 4044/*}}} */
3927 4045
3928/* ------------------------------------------------------------------------- */ 4046/* ------------------------------------------------------------------------- */
3929 4047
… …
3945 4063
3946/* ---------------------------------------------------------------------- */ 4064/* ---------------------------------------------------------------------- */
3947/* Write data to the pty as typed by the user, pasted with the mouse, 4065/* Write data to the pty as typed by the user, pasted with the mouse,
3948 * or generated by us in response to a query ESC sequence. 4066 * or generated by us in response to a query ESC sequence.
3949 */ 4067 */
3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4068static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3951 4069
3952void 4070void
3953rxvt_term::tt_write (const char *data, unsigned int len) 4071rxvt_term::tt_write (const char *data, unsigned int len)
3954{ 4072{
3955 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3960 4078
3961 if (v_buflen == 0) 4079 if (v_buflen == 0)
3962 { 4080 {
3963 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4081 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3964 4082
4083 max_it (written, 0);
4084
3965 if ((unsigned int)written == len) 4085 if (written == len)
3966 return; 4086 return;
3967 4087
3968 data += written; 4088 data += written;
3969 len -= written; 4089 len -= written;
3970 } 4090 }
3971 4091
3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4092 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3973 4093
3974 memcpy (v_buffer + v_buflen, data, len); 4094 memcpy (v_buffer + v_buflen, data, len);
3975 v_buflen += len; 4095 v_buflen += len;
3976 4096
3977 pty_ev.set (ev::READ | ev::WRITE); 4097 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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