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.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs.
Revision 1.552 by sf-exg, Fri Jul 25 17:03:38 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-2006 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 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
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 + hey
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 !UNICODE3 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 unsigned int newlen; 418 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 419 char rkbuf[KBUFSZ + 1];
420 char *kbuf = rkbuf + 1;
311 421
312#if ISO_14755 422#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 423 if (iso14755buf & ISO_14755_52)
314 return; 424 return;
315#endif 425#endif
… …
322 */ 432 */
323 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
326 436
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 437 kbuf[0] = 0;
334 438
335#ifdef USE_XIM 439#if USE_XIM
336 if (Input_Context) 440 if (Input_Context)
337 { 441 {
338 Status status_return; 442 Status status_return;
339 443
340#if 0 444#if 0
… …
378 } 482 }
379 } 483 }
380 else 484 else
381 len = 0; 485 len = 0;
382 } 486 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 487 }
387 else 488 else
388#endif 489#endif
389 { 490 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 491 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 492 }
493
494 if (keysym != NoSymbol)
392 } 495 {
496 KeySym orig_keysym = keysym;
393 497
394 if (valid_keysym) 498 /* Shift + F1 - F10 generates F11 - F20 */
499 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
500 {
501 keysym += (XK_F11 - XK_F1);
502 shft = 0; /* turn off Shift */
503 }
504
505 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
506 {
507 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
508 unsigned int newlen = 1;
509
510 if (ev.state & ModNumLockMask)
511 kp = false;
512
513 keysym = translate_keypad (keysym, kp);
514
515 switch (keysym)
516 {
517#ifndef NO_BACKSPACE_KEY
518 case XK_BackSpace:
519 if (priv_modes & PrivMode_HaveBackSpace)
520 {
521 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
522 ^ !!ctrl) ? '\b' : '\177';
523 kbuf[1] = '\0';
524 }
525 else
526 strcpy (kbuf, rs[Rs_backspace_key]);
527 break;
528#endif
529#ifndef NO_DELETE_KEY
530 case XK_Delete:
531 strcpy (kbuf, rs[Rs_delete_key]);
532 break;
533#endif
534 case XK_Tab:
535 if (shft)
536 strcpy (kbuf, "\033[Z");
537 else
538 {
539#ifdef CTRL_TAB_MAKES_META
540 if (ctrl)
541 meta = 1;
542#endif
543#ifdef MOD4_TAB_MAKES_META
544 if (ev.state & Mod4Mask)
545 meta = 1;
546#endif
547 newlen = 0;
548 }
549 break;
550
551 case XK_Up: /* "\033[A" */
552 case XK_Down: /* "\033[B" */
553 case XK_Right: /* "\033[C" */
554 case XK_Left: /* "\033[D" */
555 strcpy (kbuf, "\033[Z");
556 kbuf[2] = "DACB"[keysym - XK_Left];
557 /* do Shift first */
558 if (shft)
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 else if (ctrl)
561 {
562 kbuf[1] = 'O';
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 }
565 else if (priv_modes & PrivMode_aplCUR)
566 kbuf[1] = 'O';
567 break;
568
569 case XK_KP_Enter:
570 /* allow shift to override */
571 if (kp)
572 {
573 strcpy (kbuf, "\033OM");
574 break;
575 }
576
577 /* FALLTHROUGH */
578
579 case XK_Return:
580 if (priv_modes & PrivMode_LFNL)
581 {
582 kbuf[0] = '\015';
583 kbuf[1] = '\012';
584 kbuf[2] = '\0';
585 }
586 else
587 {
588 kbuf[0] = '\015';
589 kbuf[1] = '\0';
590 }
591 break;
592
593 case XK_KP_F1: /* "\033OP" */
594 case XK_KP_F2: /* "\033OQ" */
595 case XK_KP_F3: /* "\033OR" */
596 case XK_KP_F4: /* "\033OS" */
597 strcpy (kbuf, "\033OP");
598 kbuf[2] += (keysym - XK_KP_F1);
599 break;
600
601 case XK_KP_Multiply: /* "\033Oj" : "*" */
602 case XK_KP_Add: /* "\033Ok" : "+" */
603 case XK_KP_Separator: /* "\033Ol" : "," */
604 case XK_KP_Subtract: /* "\033Om" : "-" */
605 case XK_KP_Decimal: /* "\033On" : "." */
606 case XK_KP_Divide: /* "\033Oo" : "/" */
607 case XK_KP_0: /* "\033Op" : "0" */
608 case XK_KP_1: /* "\033Oq" : "1" */
609 case XK_KP_2: /* "\033Or" : "2" */
610 case XK_KP_3: /* "\033Os" : "3" */
611 case XK_KP_4: /* "\033Ot" : "4" */
612 case XK_KP_5: /* "\033Ou" : "5" */
613 case XK_KP_6: /* "\033Ov" : "6" */
614 case XK_KP_7: /* "\033Ow" : "7" */
615 case XK_KP_8: /* "\033Ox" : "8" */
616 case XK_KP_9: /* "\033Oy" : "9" */
617 /* allow shift to override */
618 if (kp)
619 {
620 strcpy (kbuf, "\033Oj");
621 kbuf[2] += (keysym - XK_KP_Multiply);
622 }
623 else
624 {
625 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
626 kbuf[1] = '\0';
627 }
628 break;
629
630 default:
631 {
632 int param = map_function_key (keysym);
633 if (param > 0)
634 sprintf (kbuf,"\033[%d~", param);
635 else
636 newlen = 0;
637 }
638 break;
639 }
640
641 if (newlen)
642 len = strlen (kbuf);
643
644 if (len > 0)
645 {
646 /*
647 * pass Shift/Control indicators for function keys ending with `~'
648 *
649 * eg,
650 * Prior = "ESC[5~"
651 * Shift+Prior = "ESC[5$"
652 * Ctrl+Prior = "ESC[5^"
653 * Ctrl+Shift+Prior = "ESC[5@"
654 */
655 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
656 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
657
658 /*
659 * Pass meta for all function keys, if 'meta' option set
660 */
661#ifdef META8_OPTION
662 if (meta && (meta_char == 0x80))
663 kbuf[len - 1] |= 0x80;
664#endif
665 }
666
667 }
668 else if (ctrl && keysym == XK_minus)
669 {
670 len = 1;
671 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
672 }
673 else if (keysym == XK_ISO_Left_Tab)
674 {
675 strcpy (kbuf, "\033[Z");
676 len = 3;
677 }
678 else
679 {
680#ifdef META8_OPTION
681 /* set 8-bit on */
682 if (meta && (meta_char == 0x80))
683 {
684 char *ch;
685
686 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80;
688
689 meta = 0;
690 }
691#endif
692 /* nil */ ;
693 }
694
695 keysym = orig_keysym;
696 }
697
698 /* escape prefix */
699 if (len && meta
700#ifdef META8_OPTION
701 && meta_char == C0_ESC
702#endif
703 )
704 {
705 *--kbuf = C0_ESC;
706 len++;
707 }
708
709 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
710 return;
711
712 if (keysym != NoSymbol)
395 { 713 {
396#ifdef KEYSYM_RESOURCE 714#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 715 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 716 return;
399#endif 717#endif
400 718
401 if (saveLines) 719 if (saveLines)
402 { 720 {
… …
411#ifdef PAGING_CONTEXT_LINES 729#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 730 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 731#else
414 lnsppg = nrow * 4 / 5; 732 lnsppg = nrow * 4 / 5;
415#endif 733#endif
734 max_it (lnsppg, 1);
735
416 if (keysym == XK_Prior) 736 if (keysym == XK_Prior)
417 { 737 {
418 scr_page (UP, lnsppg); 738 scr_page (lnsppg);
419 return; 739 return;
420 } 740 }
421 else if (keysym == XK_Next) 741 else if (keysym == XK_Next)
422 { 742 {
423 scr_page (DN, lnsppg); 743 scr_page (-lnsppg);
424 return; 744 return;
425 } 745 }
426 } 746 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 747#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 748 if (IS_SCROLL_MOD)
429 { 749 {
430 if (keysym == XK_Up) 750 if (keysym == XK_Up)
431 { 751 {
432 scr_page (UP, 1); 752 scr_page (1);
433 return; 753 return;
434 } 754 }
435 else if (keysym == XK_Down) 755 else if (keysym == XK_Down)
436 { 756 {
437 scr_page (DN, 1); 757 scr_page (-1);
438 return; 758 return;
439 } 759 }
440 } 760 }
441#endif 761#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 762#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 763 if (IS_SCROLL_MOD)
444 { 764 {
445 if (keysym == XK_Home) 765 if (keysym == XK_Home)
446 { 766 {
447 scr_move_to (0, 1); 767 scr_changeview (top_row);
448 return; 768 return;
449 } 769 }
450 else if (keysym == XK_End) 770 else if (keysym == XK_End)
451 { 771 {
452 scr_move_to (1, 1); 772 scr_changeview (0);
453 return; 773 return;
454 } 774 }
455 } 775 }
456#endif 776#endif
457 } 777 }
458 778
459 if (shft) 779 if (shft)
460 { 780 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 781 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 782 {
469 switch (keysym) 783 switch (keysym)
470 { 784 {
471 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 787 selection_request (ev.time);
474 return; 788 return;
475#if TODO 789#if TODO
476 /* rxvt extras */ 790 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 792 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 794 return;
483#endif 795#endif
484 } 796 }
485 } 797 }
486 } 798 }
487 799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
813 }
814
488#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 816 // ISO 14755 support
490 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 818 {
492 int hv; 819 int hv;
493 820
494 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 846# endif
520 return; 847 return;
521 } 848 }
522 else 849 else
523 { 850 {
524# if ENABLE_OVERLAY 851# if ISO_14755
525 scr_overlay_off (); 852 scr_overlay_off ();
526# endif 853# endif
527 iso14755buf = 0; 854 iso14755buf = 0;
528 } 855 }
529 } 856 }
857 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
533 { 861 {
534 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 863# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 865 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 866# endif
539 } 867 }
540#endif 868#endif
541 869
542#ifdef PRINTPIPE 870#ifdef PRINTPIPE
543 if (keysym == XK_Print) 871 if (keysym == XK_Print)
544 { 872 {
545 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
546 return; 874 return;
547 } 875 }
548#endif 876#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 877 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 878
887 if (len <= 0) 879 if (len <= 0)
888 return; /* not mapped */ 880 return; /* not mapped */
889 881
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
923} 883}
924 884
925void 885void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
927{ 887{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 889 KeySym keysym;
930 890
… …
934#if ENABLE_FRILLS || ISO_14755 894#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 895 // ISO 14755 support
936 if (iso14755buf) 896 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 897 if (iso14755buf & ISO_14755_52)
938 { 898 {
939# if ENABLE_OVERLAY 899# if ISO_14755
940 scr_overlay_off (); 900 scr_overlay_off ();
941# endif 901# endif
942# if ISO_14755 902# if ISO_14755
943 // iso14755 part 5.2 handling: release time 903 // iso14755 part 5.2 handling: release time
944 // first: controls 904 // first: controls
… …
950 commit_iso14755 (); 910 commit_iso14755 ();
951 911
952 return; 912 return;
953 } 913 }
954 914
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 916 if (i[0] == keysym)
957 { 917 {
958 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 919 commit_iso14755 ();
960 920
… …
967 927
968 return; 928 return;
969 } 929 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 930 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 931 {
972# if ENABLE_OVERLAY 932# if ISO_14755
973 scr_overlay_off (); 933 scr_overlay_off ();
974# endif 934# endif
975 if (iso14755buf & ISO_14755_51) 935 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 936 commit_iso14755 ();
977#if ISO_14755 937#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
999#endif 959#endif
1000} 960}
1001 961
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 962void
1036rxvt_term::flush () 963rxvt_term::flush ()
1037{ 964{
1038 flush_ev.stop (); 965 flush_ev.stop ();
1039 966
1040#ifdef TRANSPARENT 967#ifdef HAVE_IMG
1041 if (want_full_refresh) 968 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 969 {
1043 want_full_refresh = 0; 970 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 971 scr_touch (false);
1046 } 972 }
1047#endif 973#endif
1048 974
1049 if (want_refresh) 975 if (want_refresh)
… …
1085 } 1011 }
1086 while (row < end_row); 1012 while (row < end_row);
1087 } 1013 }
1088 1014
1089 scr_refresh (); 1015 scr_refresh ();
1090 scrollbar_show (1); 1016 scrollBar.show (1);
1091#ifdef USE_XIM 1017#if USE_XIM
1092 IMSendSpot (); 1018 im_send_spot ();
1093#endif 1019#endif
1094 } 1020 }
1095 1021
1096 display->flush (); 1022 display->flush ();
1097} 1023}
1098 1024
1025/* checks whether a refresh is requested and starts the refresh timer */
1099void 1026void
1100rxvt_term::check_cb (check_watcher &w) 1027rxvt_term::refresh_check ()
1028{
1029 if (want_refresh && !flush_ev.is_active ())
1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1031
1032 display->flush ();
1033}
1034
1035void
1036rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1037{
1102 make_current (); 1038 make_current ();
1103 1039
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1040 refresh_count = 0;
1117 flush (); 1041 flush ();
1118} 1042}
1119 1043
1120#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1121void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1062{
1124 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1064 want_refresh = 1;
1126 1065 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1066}
1129#endif 1067#endif
1130 1068
1131#ifdef TEXT_BLINK 1069#ifdef TEXT_BLINK
1132void 1070void
1133rxvt_term::text_blink_cb (time_watcher &w) 1071rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1072{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1073 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1074 {
1137 hidden_text = !hidden_text; 1075 hidden_text = !hidden_text;
1138 want_refresh = 1; 1076 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1077 refresh_check ();
1140 } 1078 }
1079 else
1080 w.stop ();
1141} 1081}
1142#endif 1082#endif
1143 1083
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1085void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1087{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1150 { 1090 {
1151 want_refresh = 1; 1091 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1092 refresh_check ();
1153 } 1093 }
1094 else
1095 w.stop ();
1154} 1096}
1155#endif 1097#endif
1156 1098
1157#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1158void 1100void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1102{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1162 { 1104 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1106 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 refresh_check ();
1166 } 1108 }
1109 else
1110 w.stop ();
1167} 1111}
1168#endif 1112#endif
1169 1113
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1115void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1117{
1174 if (mouse_slip_wheel_speed == 0 1118 if (scr_page (mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1119 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1120 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1121 refresh_check ();
1122 }
1123
1124 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 {
1126 mouse_slip_wheel_speed = 0;
1127 w.stop ();
1183 } 1128 }
1184} 1129}
1185#endif 1130#endif
1186 1131
1187#if LINUX_YIELD_HACK 1132#if LINUX_YIELD_HACK
1188static struct event_handler 1133static struct event_handler
1189{ 1134{
1190 check_watcher yield_ev; 1135 ev::prepare yield_ev;
1191 1136
1192 void yield_cb (check_watcher &w) 1137 void yield_cb (ev::prepare &w, int revents)
1193 { 1138 {
1194 // this should really be sched_yield(), but the linux guys thought 1139 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1140 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1141 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1142 // allowed by the sus... as is returning ENOSYS.
1143 // since the linux guys additionally thought that breaking the only
1144 // known workaround against their unusable sched_yield hack is cool,
1145 // we just nanosleep a bit and hope for the best.
1198 1146
1199 struct timespec ts = { 0, 0 }; 1147 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1148 nanosleep (&ts, 0);
1201 1149
1202 w.stop (); 1150 w.stop ();
1203 } 1151 }
1204 1152
… …
1207 { 1155 {
1208 } 1156 }
1209} event_handler; 1157} event_handler;
1210#endif 1158#endif
1211 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1212bool 1193bool
1213rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1214{ 1195{
1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1216 1197
1217 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1218 { 1199
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1220 n = 0;
1221 } 1201 {
1222 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1224 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1225 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1226 1207
1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1228 1209
1229 if (r > 0) 1210 if (r > 0)
1230 { 1211 {
1231 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1232 return true; 1213 return true;
… …
1243 pty_ev.stop (); 1224 pty_ev.stop ();
1244 1225
1245 if (!option (Opt_hold)) 1226 if (!option (Opt_hold))
1246 destroy (); 1227 destroy ();
1247 } 1228 }
1248 1229
1249 return false; 1230 return false;
1250} 1231}
1251 1232
1252void 1233void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1234rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1235{
1255 make_current (); 1236 make_current ();
1256 1237
1257 if (revents & EVENT_READ) 1238 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1239 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1240 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1241 cmd_parse ();
1261 break;
1262 1242
1263 if (revents & EVENT_WRITE) 1243 if (revents & ev::WRITE)
1264 pty_write (); 1244 pty_write ();
1265}
1266 1245
1267void 1246 refresh_check ();
1247}
1248
1249void ecb_cold
1268rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1269{ 1251{
1270 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor (); 1253 recolour_cursor ();
1272 1254
1273#ifdef POINTER_BLANK 1255#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1256 hidden_pointer = 0;
1275 1257
1276 if (option (Opt_pointerBlank)) 1258 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1278#endif 1260#endif
1279} 1261}
1280 1262
1281#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1282void 1264void ecb_cold
1283rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1284{ 1266{
1285 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1286 return; 1268 return;
1287 1269
… …
1289 XFlush (dpy); 1271 XFlush (dpy);
1290 1272
1291 hidden_pointer = 1; 1273 hidden_pointer = 1;
1292} 1274}
1293 1275
1294void 1276void ecb_cold
1295rxvt_term::pointer_cb (time_watcher &w) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1278{
1297 make_current (); 1279 make_current ();
1298 1280
1299 pointer_blank (); 1281 pointer_blank ();
1300} 1282}
… …
1303void 1285void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1286rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1287{
1306 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1307 int x, y; 1289 int x, y;
1290 int code = 32;
1308 1291
1309 x = ev.x; 1292 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1293 y = Pixel2Row (ev.y) + 1;
1311 pixel_position (&x, &y); 1294
1295 if (ev.type == MotionNotify)
1296 {
1297 if (x == mouse_row && y == mouse_col)
1298 return;
1299
1300 mouse_row = x;
1301 mouse_col = y;
1302 code += 32;
1303 }
1312 1304
1313 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
1314 button_number = 3; 1306 button_number = 3;
1315 else 1307 else
1316 { 1308 {
1317 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1311 if (button_number >= 3)
1320 button_number += (64 - 3); 1312 button_number += 64 - 3;
1321 } 1313 }
1322 1314
1323 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1324 { 1316 {
1325 /* 1317 /*
… …
1357 fputc ('A', stderr); 1349 fputc ('A', stderr);
1358 if (key_state & 32) 1350 if (key_state & 32)
1359 fputc ('2', stderr); 1351 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1353 button_number,
1362 x + 1, 1354 x,
1363 y + 1); 1355 y);
1364#endif 1356#endif
1365 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1366 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1372 code + button_number + key_state,
1368 (32 + x + 1), 1373 32 + x,
1369 (32 + y + 1)); 1374 32 + y);
1370} 1375}
1371 1376
1372/*{{{ process an X event */ 1377/*{{{ process an X event */
1373void 1378void ecb_hot
1374rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1375{ 1380{
1376 make_current (); 1381 make_current ();
1377 1382
1378 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1440 focus_out ();
1436 } 1441 }
1437#endif 1442#endif
1438 } 1443 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1444 break;
1444 1445
1445 /* 1446 /*
1446 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1482 focus_out ();
1482 break; 1483 break;
1483 1484
1484 case ConfigureNotify: 1485 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1486 { 1487 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1489 ;
1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1505 int x, y;
1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1522 }
1489 1523
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1525 {
1492 seen_resize = 1; 1526 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1528 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1502 1536
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1538 }
1510 break; 1539 break;
1511 1540
1512 case PropertyNotify: 1541 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1543 break;
1519 1544
1520 case SelectionClear: 1545 case SelectionClear:
1521 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1547 break;
1528 1548
1529 case SelectionRequest: 1549 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1531 break; 1551 break;
1532 1552
1533 case MapNotify: 1553 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1534 mapped = 1; 1565 mapped = 1;
1535#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1567 text_blink_ev.start ();
1537#endif 1568#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1570 break;
1540 1571
1541 case UnmapNotify: 1572 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1574#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1575 text_blink_ev.stop ();
1545#endif 1576#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1577 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1578 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1579
1555 case GraphicsExpose: 1580 case GraphicsExpose:
1556 case Expose: 1581 case Expose:
1557 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1558 { 1583 {
1559 do 1584 do
1585 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1590
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1592
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1594 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1597 }
1569 1598
1570 want_refresh = 1; 1599 want_refresh = 1;
1571 } 1600 }
1572 else 1601 else
1573 { 1602 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1605 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1606 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1608 ;
1580 1609
1581 if (isScrollbarWindow (ev.xany.window)) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1611 {
1583 scrollBar.setIdle (); 1612 scrollBar.state = SB_STATE_IDLE;
1584 scrollbar_show (0); 1613 scrollBar.show (0);
1585 } 1614 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1615 }
1592 break; 1616 break;
1593 1617
1594 case MotionNotify: 1618 case MotionNotify:
1595#ifdef POINTER_BLANK 1619#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1620 if (hidden_pointer)
1597 pointer_unblank (); 1621 pointer_unblank ();
1598#endif 1622#endif
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent)
1625 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1627 break;
1601 1628
1602 if (ev.xany.window == vt) 1629 if (ev.xany.window == vt)
1603 { 1630 {
… …
1632 1659
1633#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1634 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1635 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1636 { 1663 {
1664 page_dirn scroll_selection_dir;
1637 int dist; 1665 int dist;
1638 1666
1639 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1641 */ 1669 */
1642 if (!sel_scroll_ev.active) 1670 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1671 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1672
1645 /* save the event params so we can highlight 1673 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1674 * the selection in the pending-scroll loop
1647 */ 1675 */
1648 selection_save_x = ev.xbutton.x; 1676 selection_save_x = ev.xbutton.x;
… …
1656 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1657 } 1685 }
1658 else 1686 else
1659 { 1687 {
1660 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1661 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1662 } 1690 }
1663 1691
1664 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1665 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1; 1694 + 1;
1667 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1668 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1669 } 1698 }
1670 else 1699 else
1671 { 1700 {
1672 /* we are within the text window, so we 1701 /* we are within the text window, so we
1673 * shouldn't be scrolling 1702 * shouldn't be scrolling
1674 */ 1703 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1704 sel_scroll_ev.stop();
1677 } 1705 }
1678#endif 1706#endif
1679#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1680 } 1708 }
1681#endif 1709#endif
1682 } 1710 }
1683 } 1711 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1713 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1688 ; 1716 ;
1689 1717
1690 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1722 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1724 scrollBar.size ());
1697 want_refresh = 1; 1725 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1726 scrollBar.show (1);
1700 } 1727 }
1701 break; 1728 break;
1702 } 1729 }
1703 1730
1704#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1706 { 1733 cursor_blink_reset ();
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif 1734#endif
1716 1735
1717#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 { 1738 {
… …
1725 1744
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1745 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1746 pointer_blank ();
1728 } 1747 }
1729#endif 1748#endif
1730}
1731 1749
1732void 1750 refresh_check ();
1751}
1752
1753#if ENABLE_FRILLS
1754void ecb_cold
1755rxvt_term::set_urgency (bool enable)
1756{
1757 if (enable == urgency_hint)
1758 return;
1759
1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1761 {
1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1763 XSetWMHints (dpy, parent, h);
1764 urgency_hint = enable;
1765 XFree (h);
1766 }
1767}
1768#endif
1769
1770void ecb_cold
1733rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1734{ 1772{
1735 if (!focus) 1773 if (!focus)
1736 { 1774 {
1737 focus = 1; 1775 focus = 1;
1738 want_refresh = 1; 1776 want_refresh = 1;
1739 1777
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1778#if USE_XIM
1743 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1744 { 1780 {
1745 IMSetPosition (); 1781 im_set_position ();
1746 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1747 } 1783 }
1748#endif 1784#endif
1749#if CURSOR_BLINK 1785#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1787 cursor_blink_ev.again ();
1752#endif 1788#endif
1753#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1755 { 1791 {
1756 pix_colors = pix_colors_focused; 1792 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1793 scr_recolour ();
1758 } 1794 }
1759#endif 1795#endif
1760#if ENABLE_FRILLS 1796#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1797 if (option (Opt_urgentOnBell))
1762 { 1798 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1799#endif
1773 }
1774}
1775 1800
1776void 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 }
1803}
1804
1805void ecb_cold
1777rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1778{ 1807{
1779 if (focus) 1808 if (focus)
1780 { 1809 {
1781 focus = 0; 1810 focus = 0;
1782 want_refresh = 1; 1811 want_refresh = 1;
1783 1812
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1813#if ENABLE_FRILLS
1785 1814 if (option (Opt_urgentOnBell))
1815 set_urgency (0);
1816#endif
1786#if ENABLE_FRILLS || ISO_14755 1817#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1818 if (iso14755buf)
1788 { 1819 {
1789 iso14755buf = 0; 1820 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1821# if ISO_14755
1791 scr_overlay_off (); 1822 scr_overlay_off ();
1792# endif 1823# endif
1793 } 1824 }
1794#endif 1825#endif
1795#if USE_XIM 1826#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1828 XUnsetICFocus (Input_Context);
1798#endif 1829#endif
1799#if CURSOR_BLINK 1830#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1831 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1832 cursor_blink_ev.stop ();
1833
1802 hidden_cursor = 0; 1834 hidden_cursor = 0;
1803#endif 1835#endif
1804#if OFF_FOCUS_FADING 1836#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1837 if (rs[Rs_fade])
1806 { 1838 {
1807 pix_colors = pix_colors_unfocused; 1839 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1840 scr_recolour ();
1809 } 1841 }
1810#endif 1842#endif
1811 }
1812}
1813 1843
1814void 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 }
1846}
1847
1848void ecb_cold
1815rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1816{ 1850{
1817#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1819 { 1853 {
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1857 }
1824#endif 1858#endif
1825} 1859}
1826 1860
1827#if TRANSPARENT || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1828void 1862void ecb_hot
1829rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1864{
1831 make_current (); 1865 make_current ();
1832 1866
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1869 return;
1836 1870
1837# if TRANSPARENT
1838 switch (ev.type) 1871 switch (ev.type)
1839 { 1872 {
1840 case PropertyNotify: 1873 case PropertyNotify:
1841 /* 1874 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1844 */ 1877 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1880 {
1848 1881#if BG_IMAGE_FROM_ROOT
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent)) 1882 if (option (Opt_transparent))
1852 check_our_parents (); 1883 {
1853 break; 1884 rxvt_img::new_from_root (this)->replace (root_img);
1854 } 1885 update_background ();
1886 }
1855# endif 1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 }
1890
1891 break;
1892 }
1893
1894 refresh_check ();
1856} 1895}
1857#endif 1896#endif
1858 1897
1859void 1898void
1860rxvt_term::button_press (XButtonEvent &ev) 1899rxvt_term::button_press (XButtonEvent &ev)
… …
1891 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1895 { 1934 {
1896 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1897 MEvent.clicks++; 1936 MEvent.clicks++;
1898 1937
1899 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1900 { 1939 {
1901 /* only report double clicks */ 1940 /* only report double clicks */
… …
1915 mouse_report (ev); 1954 mouse_report (ev);
1916 } 1955 }
1917#else 1956#else
1918 MEvent.button = ev.button; 1957 MEvent.button = ev.button;
1919 mouse_report (ev); 1958 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1959#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1960
1922 } 1961 }
1923 else 1962 else
1924 { 1963 {
1925 if (ev.button != MEvent.button) 1964 if (ev.button != MEvent.button)
… …
1973 } 2012 }
1974 2013
1975 /* 2014 /*
1976 * Scrollbar window processing of button press 2015 * Scrollbar window processing of button press
1977 */ 2016 */
1978 if (isScrollbarWindow (ev.window)) 2017 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 2018 {
1980 scrollBar.setIdle (); 2019 page_dirn direction = NO_DIR;
2020
2021 if (scrollBar.upButton (ev.y))
2022 direction = UP; /* up */
2023 else if (scrollBar.dnButton (ev.y))
2024 direction = DN; /* down */
2025
2026 scrollBar.state = SB_STATE_IDLE;
1981 /* 2027 /*
1982 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 2029 * move up if mouse is above slider
1984 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1985 * 2031 *
… …
1994 /* 2040 /*
1995 * Mouse report disabled scrollbar: 2041 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2042 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2043 * click on scrollbar - send pageup/down
1998 */ 2044 */
1999 if ((scrollBar.style == R_SB_NEXT 2045 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2046 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2047 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2048 tt_printf ("\033[B");
2009 else 2049 else
2010 switch (ev.button) 2050 switch (ev.button)
2011 { 2051 {
2012 case Button2: 2052 case Button2:
… …
2019 tt_printf ("\033[5~"); 2059 tt_printf ("\033[5~");
2020 break; 2060 break;
2021 } 2061 }
2022 } 2062 }
2023 else 2063 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2064#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2065 {
2031 if (scrollbarnext_upButton (ev.y)) 2066 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2067 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2071#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2072 if (scr_page (direction, 1))
2049 { 2073 {
2050 if (upordown < 0) 2074 if (direction == UP)
2051 scrollBar.setUp (); 2075 scrollBar.state = SB_STATE_UP;
2052 else 2076 else
2053 scrollBar.setDn (); 2077 scrollBar.state = SB_STATE_DOWN;
2054 } 2078 }
2055 } 2079 }
2056 else 2080 else
2057 switch (ev.button) 2081 switch (ev.button)
2058 { 2082 {
2059 case Button2: 2083 case Button2:
2060 switch (scrollbar_align) 2084 switch (scrollBar.align)
2061 { 2085 {
2062 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2063 csrO = 0; 2087 csrO = 0;
2064 break; 2088 break;
2065 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2066 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2067 break; 2091 break;
2068 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2069 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2070 break; 2094 break;
2071 } 2095 }
2072 2096
2073 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2074 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2077 2101
2078 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2079 break; 2103 break;
2080 2104
2081 case Button1: 2105 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2085 2109
2086 case Button3: 2110 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2088 { 2112 {
2089 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2091 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2092# else 2116# else
2093 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2094# endif 2118# endif
2095 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2096# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2097 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2098# else 2122# else
2099 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2100# endif 2124# endif
2101 else 2125 else
2102 scrollBar.setMotion (); 2126 scrollBar.state = SB_STATE_MOTION;
2103 } 2127 }
2104 else 2128 else
2105 { 2129 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2131 (nrow
2108 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2109 / scrollbar_size ())); 2133 / scrollBar.size ()));
2110 } 2134 }
2111 2135
2112 break; 2136 break;
2113 } 2137 }
2114 } 2138 }
… …
2124 2148
2125 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2150 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2152
2129 if (scrollbar_isUpDn ()) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2130 { 2154 {
2131 scrollBar.setIdle (); 2155 scrollBar.state = SB_STATE_IDLE;
2132 scrollbar_show (0); 2156 scrollBar.show (0);
2133 } 2157 }
2134 2158
2135#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
2138#endif 2161#endif
2139 2162
2140 if (ev.window == vt) 2163 if (ev.window == vt)
2141 { 2164 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2165 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2189 mouse_report (ev);
2167 } 2190 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2191#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2192 MEvent.button = AnyButton;
2170 mouse_report (ev); 2193 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2194#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2195 return;
2173 } 2196 }
2174 2197
2175 /* 2198 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2199 * dumb hack to compensate for the failure of click-and-drag
… …
2187 case Button3: 2210 case Button3:
2188 selection_make (ev.time); 2211 selection_make (ev.time);
2189 break; 2212 break;
2190 2213
2191 case Button2: 2214 case Button2:
2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2217 break;
2195 2218
2196#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2197 case Button4: 2220 case Button4:
2198 case Button5: 2221 case Button5:
2199 { 2222 {
2200 int i; 2223 int lines;
2201 page_dirn v; 2224 page_dirn dirn;
2202 2225
2203 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2204 2227
2205 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2206 i = 1; 2229 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2231 lines = nrow - 1;
2209 else 2232 else
2210 i = 5; 2233 lines = 5;
2211 2234
2212# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2214 { 2237 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2240
2219 if (slip_wheel_ev.at < NOW) 2241 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2243 }
2224 else 2244 else
2245# endif
2225 { 2246 {
2226# endif
2227 scr_page (v, i); 2247 scr_page (dirn, lines);
2228 scrollbar_show (1); 2248 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2249 }
2231# endif
2232 } 2250 }
2233 break; 2251 break;
2234#endif 2252#endif
2235 } 2253 }
2236 } 2254 }
2237} 2255}
2238 2256
2239/*}}} */ 2257/*}}} */
2240 2258
2241bool 2259void ecb_hot
2242rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2243{ 2261{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2247 2264
2248 for (;;) 2265 for (;;)
2249 { 2266 {
2250 if (ch == NOCHAR) 2267 if (ecb_unlikely (ch == NOCHAR))
2251 { 2268 {
2252 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2270 ch = next_char ();
2254 2271
2255 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2256 break; 2273 break;
2257 } 2274 }
2258 2275
2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2260 { 2277 {
2261 if (!seen_input) 2278 if (ecb_unlikely (!seen_input))
2262 { 2279 {
2263 seen_input = 1; 2280 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2296 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2298
2282 for (;;) 2299 for (;;)
2283 { 2300 {
2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2285 break; 2302 break;
2286 2303
2287 *str++ = ch; 2304 *str++ = ch;
2288 2305
2289 if (ch == C0_LF || str >= eol) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2290 { 2307 {
2291 if (ch == C0_LF) 2308 if (ch == C0_LF)
2292 nlines++; 2309 nlines++;
2293 2310
2294 refresh_count++; 2311 refresh_count++;
2295 2312
2296 if (!option (Opt_jumpScroll) 2313 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2314 {
2299 refreshnow = true;
2300 refresh_count = 0; 2315 refresh_count = 0;
2316
2317 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2318 {
2319 refreshnow = true;
2301 ch = NOCHAR; 2320 ch = NOCHAR;
2302 break; 2321 break;
2322 }
2303 } 2323 }
2304 2324
2305 // scr_add_lines only works for nlines <= nrow - 1. 2325 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2326 if (nlines >= nrow - 1)
2307 { 2327 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2355 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2356 scr_add_lines (buf, str - buf, nlines);
2337 2357
2338 /* 2358 /*
2339 * If there have been a lot of new lines, then update the screen 2359 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2360 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2361 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2362 */
2344 if (refreshnow) 2363 if (refreshnow)
2345 { 2364 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2365 scr_refresh ();
2353 want_refresh = 1; 2366 want_refresh = 1;
2354 }
2355 } 2367 }
2356
2357 } 2368 }
2358 else 2369 else
2359 { 2370 {
2360 try 2371 try
2361 { 2372 {
… …
2369 } 2380 }
2370 2381
2371 ch = NOCHAR; 2382 ch = NOCHAR;
2372 } 2383 }
2373 } 2384 }
2374
2375 return flag;
2376} 2385}
2377 2386
2378// read the next character 2387// read the next character
2379wchar_t 2388wchar_t ecb_hot
2380rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2381{ 2390{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2392 {
2384 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2387 2396
2388 wchar_t wc; 2397 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2399
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2403 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2404 break;
2396 } 2405 }
2397 2406
2398 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2408 {
2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2413 }
2400 2414
2401 // assume wchar == unicode 2415 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2417 return wc & UNICODE_MASK;
2404 } 2418 }
2405 2419
2406 return NOCHAR; 2420 return NOCHAR;
2407} 2421}
2408 2422
2409// read the next octet 2423// read the next octet
2410uint32_t 2424uint32_t ecb_hot
2411rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2412{ 2426{
2413 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR; 2429 : NOCHAR;
2416} 2430}
2417 2431
2418static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2419 2433
2420/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2421/*
2422 * Return the next input character after first passing any keyboard input
2423 * to the command.
2424 */
2425wchar_t
2426rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2427{ 2436{
2428 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2429 2438
2430 if (c == NOCHAR) 2439 if (c == NOCHAR)
2431 throw out_of_input; 2440 throw out_of_input;
2432 2441
2433 return c; 2442 return c;
2434} 2443}
2435 2444
2436uint32_t 2445uint32_t ecb_hot
2437rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2438{ 2447{
2439 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2440 2449
2441 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2445} 2454}
2446 2455
2447/*{{{ print pipe */ 2456/*{{{ print pipe */
2448/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2450FILE * 2459FILE * ecb_cold
2451rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2452{ 2461{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2463
2455 if (stream == NULL) 2464 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2466
2458 return stream; 2467 return stream;
2459} 2468}
2460 2469
2461int 2470int ecb_cold
2462rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2463{ 2472{
2464 fflush (stream); 2473 fflush (stream);
2465 return pclose (stream); 2474 return pclose (stream);
2466} 2475}
2467 2476
2468/* 2477/*
2469 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2470 */ 2479 */
2471void 2480void ecb_cold
2472rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2473{ 2482{
2474 int done; 2483 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2484
2477 if ((fd = popen_printer ()) == NULL) 2485 if (!fd)
2478 return; 2486 return;
2479 2487
2480 /* 2488 /*
2481 * Send all input to the printer until either ESC[4i or ESC[?4i 2489 * Send all input to the printer until either ESC[4i or ESC[?4i
2482 * is received. 2490 * is received.
2483 */ 2491 */
2484 for (done = 0; !done;) 2492 for (int done = 0; !done; )
2485 { 2493 {
2486 unsigned char buf[8]; 2494 unsigned char buf[8];
2487 unicode_t ch; 2495 unicode_t ch;
2488 unsigned int i, len; 2496 unsigned int i, len;
2489 2497
… …
2508 { 2516 {
2509 if ((buf[len++] = cmd_getc ()) == 'i') 2517 if ((buf[len++] = cmd_getc ()) == 'i')
2510 break; /* done = 1 */ 2518 break; /* done = 1 */
2511 } 2519 }
2512 } 2520 }
2513 2521
2514 for (i = 0; i < len; i++) 2522 for (i = 0; i < len; i++)
2515 if (putc (buf[i], fd) == EOF) 2523 if (putc (buf[i], fd) == EOF)
2516 { 2524 {
2517 done = 1; 2525 done = 1;
2518 break; 2526 break;
… …
2520 } 2528 }
2521 } 2529 }
2522 2530
2523 pclose_printer (fd); 2531 pclose_printer (fd);
2524} 2532}
2525#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2526/*}}} */ 2534/*}}} */
2527 2535
2528/* *INDENT-OFF* */
2529enum { 2536enum {
2530 C1_40 = 0x40, 2537 C1_40 = 0x40,
2531 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2532 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2533 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2535}; 2542};
2536/* *INDENT-ON* */
2537 2543
2538/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2539void 2545void ecb_hot
2540rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2541{ 2547{
2542 switch (ch) 2548 switch (ch)
2543 { 2549 {
2544 case C0_ESC: 2550 case C0_ESC:
… …
2580 process_dcs_seq (); 2586 process_dcs_seq ();
2581 break; 2587 break;
2582 case 0x9b: /* CSI */ 2588 case 0x9b: /* CSI */
2583 process_csi_seq (); 2589 process_csi_seq ();
2584 break; 2590 break;
2585 case 0x9d: /* CSI */ 2591 case 0x9d: /* OSC */
2586 process_osc_seq (); 2592 process_osc_seq ();
2587 break; 2593 break;
2588#endif 2594#endif
2589 } 2595 }
2590} 2596}
2591/*}}} */ 2597/*}}} */
2592 2598
2593 2599
2594/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2595void 2601void ecb_cold
2596rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2597{ 2603{
2598 int row, col; 2604 int row, col;
2599 2605
2600 switch (ch) 2606 switch (ch)
… …
2634 break; 2640 break;
2635 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2643 break;
2638 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2645 priv_modes &= ~PrivMode_vt52;
2640 break; 2646 break;
2641 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2643 /* unimplemented */ 2649 /* unimplemented */
2644 break; 2650 break;
… …
2650} 2656}
2651/*}}} */ 2657/*}}} */
2652 2658
2653 2659
2654/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2655void 2661void ecb_hot
2656rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2657{ 2663{
2658 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2659 2665
2660 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2663 return; 2669 return;
2664 } 2670 }
2665 2671
2666 switch (ch) 2672 switch (ch)
2667 { 2673 {
2668 /* case 1: do_tek_mode (); break; */
2669 case '#': 2674 case '#':
2670 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2671 scr_E (); 2676 scr_E ();
2672 break; 2677 break;
2673 case '(': 2678 case '(':
… …
2696#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2697 case '9': 2702 case '9':
2698 scr_forwardindex (); 2703 scr_forwardindex ();
2699 break; 2704 break;
2700#endif 2705#endif
2706 // DECPAM/DECPNM
2701 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2702 case '>': 2710 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2711 priv_modes &= ~PrivMode_aplKP;
2704 break; 2712 break;
2705 2713
2706 case C1_40: 2714 case C1_40:
2707 cmd_getc (); 2715 cmd_getc ();
2708 break; 2716 break;
… …
2712 2720
2713 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2714 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2715 { 2723 {
2716 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2718 } 2726 }
2719 break; 2727 break;
2720 2728
2721 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2722 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2723 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2724 break; 2734 break;
2725 2735
2726 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2727 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2728 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2732 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2733 scr_index (DN); 2743 scr_index (DN);
2734 break; 2744 break;
2735 2745
2736 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2737 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2738 2748
2739 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2740 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2741 2751
2742 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2743 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2744 process_dcs_seq (); 2754 process_dcs_seq ();
2745 break; 2755 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
2751 2761
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2764 process_csi_seq ();
2755 break; 2765 break;
2756 2766
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2769 process_osc_seq ();
2760 break; 2770 break;
2761 2771
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2773 case 'c':
2764 mbstate.reset (); 2774 mbstate.reset ();
2765 scr_poweron (); 2775 scr_poweron ();
2766 scrollbar_show (1); 2776 scrollBar.show (1);
2767 break; 2777 break;
2768 2778
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2779 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2780 case 'n':
2771 scr_charset_choose (2); 2781 scr_charset_choose (2);
… …
2778 } 2788 }
2779} 2789}
2780/*}}} */ 2790/*}}} */
2781 2791
2782/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2783/* *INDENT-OFF* */
2784enum { 2793enum {
2785 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2794}; 2803};
2795 2804
2796#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2799#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
2800 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2801 2810
2802const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
2803 { 2812 {
2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2812 }; 2821 };
2813/* *INDENT-ON* */
2814 2822
2815void 2823void ecb_hot
2816rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2817{ 2825{
2818 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2819 unsigned int nargs, p; 2827 unsigned int nargs, p;
2820 int n, ndef; 2828 int n, ndef;
2821 int arg[ESC_ARGS]; 2829 int arg[ESC_ARGS] = { };
2822 2830
2823 for (nargs = ESC_ARGS; nargs > 0;) 2831 nargs = 0;
2824 arg[--nargs] = 0;
2825 2832
2826 priv = 0; 2833 priv = 0;
2827 ch = cmd_getc (); 2834 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2836 {
2829 { /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2838 priv = ch;
2831 ch = cmd_getc (); 2839 ch = cmd_getc ();
2832 } 2840 }
2833 2841
2842 prev_ch = 0;
2834 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2835 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2836 { 2845 {
2837 if (isdigit (ch)) 2846 if (isdigit (ch))
2838 { 2847 {
… …
2848 n = -1; 2857 n = -1;
2849 } 2858 }
2850 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2851 process_nonprinting (ch); 2860 process_nonprinting (ch);
2852 2861
2862 prev_ch = ch;
2853 ch = cmd_getc (); 2863 ch = cmd_getc ();
2854 } 2864 }
2855 2865
2856 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2857 return; 2867 return;
… …
2873 switch (priv) 2883 switch (priv)
2874 { 2884 {
2875 case '>': 2885 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2886 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2887 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2888 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2889 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2890 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2891 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2892 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2893 // versions.
2884 // 2894 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2895 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2896 }
2887 break; 2897 break;
2898
2888 case '?': 2899 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
2891 break; 2902 break;
2903
2904 case '!':
2905 if (ch == CSI_70)
2906 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset ();
2909
2910 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2912
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2892 } 2915 }
2916 break;
2917 }
2918
2893 return; 2919 return;
2894 } 2920 }
2895 2921
2896 switch (ch) 2922 switch (ch)
2897 { 2923 {
… …
2911 } 2937 }
2912 break; 2938 break;
2913#endif 2939#endif
2914 2940
2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2917 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2918 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2921 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2922 break; 2948 break;
2923 2949
2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3075 scr_insert_mode (1); 3101 scr_insert_mode (1);
3076 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3077 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3078 break; 3104 break;
3079 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3080 /* 3111 /*
3081 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3082 */ 3113 */
3083 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3084 if (nargs == 1) 3115 if (nargs == 1)
… …
3112 } 3143 }
3113} 3144}
3114/*}}} */ 3145/*}}} */
3115 3146
3116#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3117/* ARGSUSED */
3118void 3148void
3119rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3120{ 3150{
3121 int x, y; 3151 int x, y;
3122 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3131 { 3161 {
3132 /* 3162 /*
3133 * commands 3163 * commands
3134 */ 3164 */
3135 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3136 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3137 break; 3167 break;
3138 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3139 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3140 break; 3170 break;
3141 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3142 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3143 break; 3173 break;
3144 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3146 break; 3176 break;
3147 case 5: /* raise window */ 3177 case 5: /* raise window */
3148 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3149 break; 3179 break;
3150 case 6: /* lower window */ 3180 case 6: /* lower window */
3151 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3152 break; 3182 break;
3153 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3154 scr_touch (true); 3184 scr_touch (true);
3155 break; 3185 break;
3156 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3159 break; 3189 break;
3160 3190
3161 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3162 default: 3192 default:
3163 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3164 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3165 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3166 break; 3196 break;
3167 3197
3168 /* 3198 /*
3169 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3170 */ 3200 */
3171 case 11: /* report window state */ 3201 case 11: /* report window state */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3174 break; 3204 break;
3175 case 13: /* report window position */ 3205 case 13: /* report window position */
3176 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3177 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3178 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3179 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3180 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3181 break; 3211 break;
3182 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3183 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3185 break; 3215 break;
3186 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3187 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3188 break; 3218 break;
… …
3190 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3191 break; 3221 break;
3192 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3193 { 3223 {
3194 char *s; 3224 char *s;
3195 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3197 XFree (s); 3227 XFree (s);
3198 } 3228 }
3199 break; 3229 break;
3200 case 21: /* report window title */ 3230 case 21: /* report window title */
3201 { 3231 {
3202 char *s; 3232 char *s;
3203 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3205 XFree (s); 3235 XFree (s);
3206 } 3236 }
3207 break; 3237 break;
3208 } 3238 }
… …
3218rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3219{ 3249{
3220 unicode_t ch; 3250 unicode_t ch;
3221 bool seen_esc = false; 3251 bool seen_esc = false;
3222 unsigned int n = 0; 3252 unsigned int n = 0;
3223 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3224 3254
3225 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3226 { 3256 {
3227 if (seen_esc) 3257 if (seen_esc)
3228 { 3258 {
… …
3243 else if (ch < 0x20) 3273 else if (ch < 0x20)
3244 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3245 3275
3246 seen_esc = false; 3276 seen_esc = false;
3247 3277
3248 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3249 // stop at some sane length 3279 // stop at some sane length
3250 return NULL; 3280 return NULL;
3251 3281
3252 string[n++] = ch; 3282 string[n++] = ch;
3253 } 3283 }
… …
3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3265 */ 3295 */
3266void 3296void
3267rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3268{ 3298{
3269 char *s;
3270 unicode_t eh;
3271
3272 /* 3299 /*
3273 * Not handled yet 3300 * Not handled yet
3274 */ 3301 */
3302
3303 unicode_t eh;
3275 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3276 if (s) 3305 if (s)
3277 free (s); 3306 free (s);
3278 3307
3279 return; 3308 return;
3280} 3309}
… …
3284 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3285 */ 3314 */
3286void 3315void
3287rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3288{ 3317{
3289 unicode_t ch, eh;
3290 int arg; 3318 int arg;
3291 3319
3292 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3293 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3294 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3295 3323
3296 if (ch == ';') 3324 if (ch == ';')
3297 { 3325 {
3326 unicode_t eh;
3298 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3299 3328
3300 if (s) 3329 if (s)
3301 { 3330 {
3302 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3326 3355
3327/* 3356/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3358 */
3330void 3359void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3361{
3333 int color; 3362 int color;
3334 char *buf, *name; 3363 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3365 int saveop = op;
3337 3366
3338 dLocal (Display *, dpy); 3367 dLocal (Display *, dpy);
3339 3368
3340 assert (str != NULL); 3369 assert (str != NULL);
3341 3370
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3371 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return; 3372 return;
3344 3373
3345 switch (op) 3374 switch (op)
3346 { 3375 {
… …
3363 unsigned long bytes_after; 3392 unsigned long bytes_after;
3364 unsigned char *value = 0; 3393 unsigned char *value = 0;
3365 const char *str = ""; 3394 const char *str = "";
3366 3395
3367 if (prop 3396 if (prop
3368 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3401 && actual_type != None
3373 && actual_format == 8) 3402 && actual_format == 8)
3374 str = (const char *)(value); 3403 str = (const char *)(value);
3375 3404
3376 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3377 3406
3378 XFree (value); 3407 XFree (value);
3379 } 3408 }
3380 else 3409 else
3381 { 3410 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3383 3412
3384 if (eq) 3413 if (eq)
3385 { 3414 {
3386 *eq = 0; 3415 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3388 } 3417 }
3389 else 3418 else
3390 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3391 display->atom (str)); 3420 display->atom (str));
3392 } 3421 }
3393 break; 3422 break;
3394 3423
3395 case XTerm_Color: 3424 case XTerm_Color:
… …
3408 *buf++ = '\0'; 3437 *buf++ = '\0';
3409 3438
3410 process_color_seq (op, color, name, resp); 3439 process_color_seq (op, color, name, resp);
3411 } 3440 }
3412 break; 3441 break;
3442 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3443 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3444 process_color_seq (op, Color_fg, str, resp);
3415 break; 3445 break;
3446 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3447 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3448 process_color_seq (op, Color_bg, str, resp);
3418 break; 3449 break;
3419#ifndef NO_CURSORCOLOR 3450#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3451 case XTerm_Color_cursor:
… …
3425 process_color_seq (op, Color_pointer_fg, str, resp); 3456 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break; 3457 break;
3427 case XTerm_Color_pointer_bg: 3458 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp); 3459 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break; 3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3430#ifndef NO_BOLD_UNDERLINE_REVERSE 3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3431 case XTerm_Color_RV:
3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD: 3470 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp); 3471 process_color_seq (op, Color_BD, str, resp);
3437 break; 3472 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL: 3473 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp); 3474 process_color_seq (op, Color_UL, str, resp);
3441 break; 3475 break;
3442 case URxvt_Color_IT: 3476 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3477 process_color_seq (op, Color_IT, str, resp);
3444 break; 3478 break;
3445#endif 3479#endif
3446#if TRANSPARENT && TINTING 3480 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp);
3482 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3447 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3487 {
3488 bool changed = false;
3449 3489
3450 check_our_parents (); 3490 if (ISSET_PIXCOLOR (Color_tint))
3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3451 3492
3452 if (am_transparent) 3493 if (changed)
3453 want_full_refresh = want_refresh = 1; 3494 update_background ();
3495 }
3454 3496
3455 break; 3497 break;
3456#endif 3498#endif
3457 3499
3500#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3502 if (!strcmp (str, "?"))
3459 { 3503 {
3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3509
3510 sprintf (str, "[%dx%d+%d+%d]",
3511 h_scale, v_scale,
3512 h_align, v_align);
3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3514 }
3515 else
3516 {
3517 bool changed = false;
3518
3460 if (*str != ';') 3519 if (*str != ';')
3461 { 3520 {
3462#if XPM_BACKGROUND 3521 try
3463 scale_pixmap (""); /* reset to default scaling */ 3522 {
3464 set_bgPixmap (str); /* change pixmap */ 3523 fimage.set_file_geometry (this, str);
3465 scr_touch (true); 3524 changed = true;
3466#endif 3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3467 } 3529 }
3468 3530 else
3469 int changed = 0;
3470
3471 while ((str = strchr (str, ';')) != NULL)
3472 { 3531 {
3473 str++; 3532 str++;
3474#if XPM_BACKGROUND 3533 if (fimage.set_geometry (str, true))
3475 changed += scale_pixmap (str); 3534 changed = true;
3476#endif
3477 } 3535 }
3478 3536
3479 if (changed) 3537 if (changed)
3480 { 3538 {
3481#ifdef XPM_BACKGROUND 3539 if (bg_window_position_sensitive ())
3482 resize_pixmap (); 3540 {
3483 scr_touch (true); 3541 int x, y;
3484#endif 3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3546 update_background ();
3485 } 3547 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif
3490
3491 } 3548 }
3492 break; 3549 break;
3493 3550#endif
3494 case Rxvt_restoreFG:
3495 set_window_color (Color_fg, str);
3496 break;
3497 case Rxvt_restoreBG:
3498 set_window_color (Color_bg, str);
3499 break;
3500 3551
3501 case XTerm_logfile: 3552 case XTerm_logfile:
3502 // TODO, when secure mode? 3553 // TODO, when secure mode?
3503 break; 3554 break;
3504 3555
… …
3571 break; 3622 break;
3572#endif 3623#endif
3573 3624
3574#if ENABLE_PERL 3625#if ENABLE_PERL
3575 case URxvt_perl: 3626 case URxvt_perl:
3576 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3577 ; // no responses yet
3578 break; 3628 break;
3579#endif 3629#endif
3580 } 3630 }
3581} 3631}
3582/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
… …
3589 * 's' = save 3639 * 's' = save
3590 * 'r' = restore 3640 * 'r' = restore
3591 * 't' = toggle 3641 * 't' = toggle
3592 * so no need for fancy checking 3642 * so no need for fancy checking
3593 */ 3643 */
3594int 3644int ecb_cold
3595rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3596{ 3646{
3597 int state; 3647 int state;
3598 3648
3599 if (mode == 's') 3649 if (mode == 's')
3600 { 3650 {
3601 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3602 return -1; 3655 return -1;
3603 } 3656 }
3604 else 3657 else
3605 { 3658 {
3606 if (mode == 'r') 3659 if (mode == 'r')
3607 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3608 else 3661 else
3609 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3610 PrivMode (state, bit); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3611 } 3668 }
3612 3669
3613 return state; 3670 return state;
3614} 3671}
3615 3672
3616/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3617void 3674void
3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3619{ 3676{
3620 unsigned int i, j; 3677 unsigned int i, j;
3621 int state; 3678 int state;
3622 3679
3623 static const struct 3680 static const struct
3624 { 3681 {
3625 const int argval; 3682 const int argval;
3626 const unsigned long bit; 3683 const unsigned long bit;
3627 }
3628
3629 argtopriv[] = { 3684 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3639 // 18, 19 printing-related 3694 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region
3640 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3641#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3642 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3643#endif 3699#endif
3644 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
3645 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3646 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3647 // 45 margin bell NYI 3704 // 45 margin bell NYI
3648 // 46 start logging 3705 // 46 start logging
3649 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3650 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
3651#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
3653#endif 3710#endif
3654 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3655 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3712 { 1002, PrivMode_MouseBtnEvent },
3656 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3713 { 1003, PrivMode_MouseAnyEvent },
3657 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3658 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3659 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3660 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3663 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3664 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3729 { 2004, PrivMode_BracketPaste },
3667 }; 3730 };
3668 3731
3669 if (nargs == 0) 3732 if (nargs == 0)
3670 return; 3733 return;
3671 3734
… …
3678 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3679 { 3742 {
3680 state = -1; 3743 state = -1;
3681 3744
3682 /* basic handling */ 3745 /* basic handling */
3683 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3684 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3685 { 3748 {
3686 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3687 break; 3750 break;
3688 } 3751 }
… …
3696 3759
3697 scr_touch (true); 3760 scr_touch (true);
3698 break; 3761 break;
3699#endif 3762#endif
3700 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
3701 case 1049:
3702 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3703 if (mode == 0) 3765 if (mode == 0)
3704 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
3705 else if (mode == 1) 3767 else if (mode == 1)
3706 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
… …
3715 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3716 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3717 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3718 * within VT52 mode 3780 * within VT52 mode
3719 */ 3781 */
3720 PrivMode (1, PrivMode_vt52); 3782 priv_modes |= PrivMode_vt52;
3721 break; 3783 break;
3722 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3724 set_widthheight (((state ? 132 : 80) * fwidth), height); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725 break; 3787 break;
3726 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
3727 set_option (Opt_jumpScroll, !state); 3789 set_option (Opt_jumpScroll, !state);
3728 break; 3790 break;
3729 case 5: /* reverse video */ 3791 case 5: /* reverse video */
… …
3736 scr_autowrap (state); 3798 scr_autowrap (state);
3737 break; 3799 break;
3738 /* case 8: - auto repeat, can't do on a per window basis */ 3800 /* case 8: - auto repeat, can't do on a per window basis */
3739 case 9: /* X10 mouse reporting */ 3801 case 9: /* X10 mouse reporting */
3740 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3741 priv_modes &= ~PrivMode_MouseX11; 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3804 break;
3743#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3744 case scrollBar_esc: 3806 case scrollBar_esc:
3745 if (scrollbar_mapping (state)) 3807 scrollBar.map (state);
3746 {
3747 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3748 scr_touch (true); 3809 scr_touch (true);
3749 }
3750 break; 3810 break;
3751#endif 3811#endif
3752 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3753 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3754 break; 3814 break;
… …
3759 break; 3819 break;
3760 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
3761 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
3762 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
3763 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
3764 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3765 break; 3825 break;
3766#if 0
3767 case 1001: 3826 case 1002:
3768 break; /* X11 mouse highlighting */ 3827 case 1003:
3769#endif 3828 if (state)
3829 {
3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3833 vt_emask_mouse = PointerMotionMask;
3834 }
3835 else
3836 vt_emask_mouse = NoEventMask;
3837
3838 vt_select_input ();
3839 break;
3770 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
3771 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
3772 break; 3842 break;
3773 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
3774 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
3775 break; 3845 break;
3776 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
3777 if (option (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3848 if (!state)
3779 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
3780 scr_change_screen (state); 3851 scr_change_screen (state);
3781 break; 3852 break;
3782 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
3783 scr_change_screen (state); 3858 scr_change_screen (state);
3859
3784 if (option (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
3785 if (current_screen != PRIMARY) 3861 if (state)
3786 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
3787 break; 3865 break;
3788 default: 3866 default:
3789 break; 3867 break;
3790 } 3868 }
3791 } 3869 }
3792} 3870}
3793/*}}} */ 3871/*}}} */
3794 3872
3795/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3796void 3874void ecb_hot
3797rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3798{ 3876{
3799 unsigned int i; 3877 unsigned int i;
3800 short rendset; 3878 short rendset;
3801 int rendstyle; 3879 int rendstyle;
… …
3942 break; 4020 break;
3943#endif 4021#endif
3944 } 4022 }
3945 } 4023 }
3946} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3947/*}}} */ 4041/*}}} */
3948 4042
3949/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3950void
3951rxvt_term::process_graphics ()
3952{
3953 unicode_t ch, cmd = cmd_getc ();
3954
3955 if (cmd == 'Q')
3956 { /* query graphics */
3957 tt_printf ("\033G0\012"); /* no graphics */
3958 return;
3959 }
3960 /* swallow other graphics sequences until terminating ':' */
3961 do
3962 ch = cmd_getc ();
3963 while (ch != ':');
3964}
3965/*}}} */
3966
3967/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
3968 4047
3969/* 4048/*
3970 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
3971 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
3972 */ 4051 */
… …
3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3981 va_end (arg_ptr); 4060 va_end (arg_ptr);
3982 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
3983} 4062}
3984 4063
3985/* ---------------------------------------------------------------------- */
3986/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
3987 * or generated by us in response to a query ESC sequence. 4065void
3988 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3989const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
3990 4080
3991void 4081void
3992rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
3993{ 4083{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return; 4085 return;
3996 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
3997 if (pty->pty < 0) 4095 if (pty->pty < 0)
3998 return; 4096 return;
3999 4097
4000 if (v_buflen == 0) 4098 if (v_buflen == 0)
4001 { 4099 {
4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4003 4101
4102 max_it (written, 0);
4103
4004 if ((unsigned int)written == len) 4104 if (written == len)
4005 return; 4105 return;
4006 4106
4007 data += written; 4107 data += written;
4008 len -= written; 4108 len -= written;
4009 } 4109 }
4010 4110
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4012 4112
4013 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len; 4114 v_buflen += len;
4015 4115
4016 pty_ev.set (EVENT_READ | EVENT_WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);
4017} 4117}
4018 4118
4019void rxvt_term::pty_write () 4119void rxvt_term::pty_write ()
4020{ 4120{
4021 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4121 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4026 4126
4027 if (v_buflen == 0) 4127 if (v_buflen == 0)
4028 { 4128 {
4029 free (v_buffer); 4129 free (v_buffer);
4030 v_buffer = 0; 4130 v_buffer = 0;
4031 v_buflen = 0;
4032 4131
4033 pty_ev.set (EVENT_READ); 4132 pty_ev.set (ev::READ);
4034 return; 4133 return;
4035 } 4134 }
4036 4135
4037 memmove (v_buffer, v_buffer + written, v_buflen); 4136 memmove (v_buffer, v_buffer + written, v_buflen);
4038 } 4137 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4138 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ); 4139 pty_ev.set (ev::READ);
4041} 4140}
4042 4141
4043/*----------------------- end-of-file (C source) -----------------------*/ 4142/*----------------------- end-of-file (C source) -----------------------*/
4044 4143

Diff Legend

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