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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.520 by sf-exg, Sun Jun 10 13:07:56 2012 UTC

… …
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-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
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)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 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
405void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
304{ 407{
305 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
309 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
310 412
311#if ISO_14755 413#if ISO_14755
… …
321 */ 423 */
322 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
325 427
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 428 kbuf[0] = 0;
333 429
334#ifdef USE_XIM 430#if USE_XIM
335 if (Input_Context) 431 if (Input_Context)
336 { 432 {
337 Status status_return; 433 Status status_return;
338 434
339#if 0 435#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 508#else
413 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
414#endif 510#endif
511 max_it (lnsppg, 1);
512
415 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
416 { 514 {
417 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
418 return; 516 return;
419 } 517 }
… …
472 selection_request (ev.time); 570 selection_request (ev.time);
473 return; 571 return;
474#if TODO 572#if TODO
475 /* rxvt extras */ 573 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 575 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 577 return;
482#endif 578#endif
483 } 579 }
484 } 580 }
485 } 581 }
486 582
487#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 584 // ISO 14755 support
489 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 586 {
491 int hv; 587 int hv;
492 588
493 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 620 scr_overlay_off ();
525# endif 621# endif
526 iso14755buf = 0; 622 iso14755buf = 0;
527 } 623 }
528 } 624 }
625 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
532 { 629 {
533 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 631# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 643 }
547#endif 644#endif
548 645
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
551 { 657 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 658#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 659 case XK_BackSpace:
554#ifdef XK_KP_Home 660 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 661 {
556 XK_KP_7, // XK_KP_Home 662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 663 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 664 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
571 691
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
573 { 772 {
574 unsigned int index = keysym - XK_KP_Home; 773 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
576 } 778 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 779 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 780 }
794 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
795 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
796 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
797 */ 801 */
798#ifdef META8_OPTION 802#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
801#endif 805#endif
806 }
802 807
803 } 808 }
804 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
805 { 810 {
806 len = 1; 811 len = 1;
… …
840 { 845 {
841 view_start = 0; 846 view_start = 0;
842 want_refresh = 1; 847 want_refresh = 1;
843 } 848 }
844 849
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */ 850 /* escape prefix */
860 if (meta 851 if (meta
861#ifdef META8_OPTION 852#ifdef META8_OPTION
862 && meta_char == C0_ESC 853 && meta_char == C0_ESC
863#endif 854#endif
… …
868 } 859 }
869 860
870 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
871} 862}
872 863
873void 864void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
875{ 866{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 868 KeySym keysym;
878 869
… …
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
947#endif 938#endif
948} 939}
949 940
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 941void
984rxvt_term::flush () 942rxvt_term::flush ()
985{ 943{
986 flush_ev.stop (); 944 flush_ev.stop ();
987 945
988#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
990 { 948 {
991// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 950 scr_touch (false);
993 } 951 }
994#endif 952#endif
995 953
996 if (want_refresh) 954 if (want_refresh)
… …
1032 } 990 }
1033 while (row < end_row); 991 while (row < end_row);
1034 } 992 }
1035 993
1036 scr_refresh (); 994 scr_refresh ();
1037 scrollbar_show (1); 995 scrollBar.show (1);
1038#ifdef USE_XIM 996#if USE_XIM
1039 IMSendSpot (); 997 im_send_spot ();
1040#endif 998#endif
1041 } 999 }
1042 1000
1043 display->flush (); 1001 display->flush ();
1044} 1002}
1045 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1046void 1005void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1006rxvt_term::refresh_check ()
1048{ 1007{
1049 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1010
1051 display->flush (); 1011 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1012}
1056 1013
1057void 1014void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1016{
… …
1063 flush (); 1020 flush ();
1064} 1021}
1065 1022
1066#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1067void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1041{
1070 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1043 want_refresh = 1;
1044 refresh_check ();
1072} 1045}
1073#endif 1046#endif
1074 1047
1075#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1076void 1049void
… …
1078{ 1051{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1053 {
1081 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1082 want_refresh = 1; 1055 want_refresh = 1;
1056 refresh_check ();
1083 } 1057 }
1084 else 1058 else
1085 w.stop (); 1059 w.stop ();
1086} 1060}
1087#endif 1061#endif
1088 1062
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1064void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1066{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1069 {
1095 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072 }
1096 else 1073 else
1097 w.stop (); 1074 w.stop ();
1098} 1075}
1099#endif 1076#endif
1100 1077
… …
1104{ 1081{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1083 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check ();
1109 } 1087 }
1110 else 1088 else
1111 w.stop (); 1089 w.stop ();
1112} 1090}
1113#endif 1091#endif
1114 1092
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1094void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1096{
1119 if (mouse_slip_wheel_speed == 0 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1098 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1099 want_refresh = 1;
1100 refresh_check ();
1101 }
1102
1103 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1104 {
1128 else 1105 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1106 w.stop ();
1107 }
1130} 1108}
1131#endif 1109#endif
1132 1110
1133#if LINUX_YIELD_HACK 1111#if LINUX_YIELD_HACK
1134static struct event_handler 1112static struct event_handler
… …
1139 { 1117 {
1140 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1144 1125
1145 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1147 1128
1148 w.stop (); 1129 w.stop ();
1149 } 1130 }
1150 1131
… …
1153 { 1134 {
1154 } 1135 }
1155} event_handler; 1136} event_handler;
1156#endif 1137#endif
1157 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1158bool 1172bool
1159rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1160{ 1174{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1162 1176
1163 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1178
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1166 n = 0;
1167 } 1180 {
1168 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1172 1186
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1188
1175 if (r > 0) 1189 if (r > 0)
1176 { 1190 {
1177 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1178 return true; 1192 return true;
… …
1200{ 1214{
1201 make_current (); 1215 make_current ();
1202 1216
1203 if (revents & ev::READ) 1217 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1220 cmd_parse ();
1207 break;
1208 1221
1209 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1210 pty_write (); 1223 pty_write ();
1211}
1212 1224
1213void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1214rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1215{ 1230{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1232 recolour_cursor ();
1218 1233
… …
1223 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1224#endif 1239#endif
1225} 1240}
1226 1241
1227#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1228void 1243void ecb_cold
1229rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1230{ 1245{
1231 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1232 return; 1247 return;
1233 1248
… …
1235 XFlush (dpy); 1250 XFlush (dpy);
1236 1251
1237 hidden_pointer = 1; 1252 hidden_pointer = 1;
1238} 1253}
1239 1254
1240void 1255void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1257{
1243 make_current (); 1258 make_current ();
1244 1259
1245 pointer_blank (); 1260 pointer_blank ();
… …
1251{ 1266{
1252 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1253 int x, y; 1268 int x, y;
1254 int code = 32; 1269 int code = 32;
1255 1270
1256 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1258 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1259 { 1275 {
1260 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1261 return; 1277 return;
1278
1262 mouse_row = x; 1279 mouse_row = x;
1263 mouse_col = y; 1280 mouse_col = y;
1264 code += 32; 1281 code += 32;
1265 } 1282 }
1266 1283
… …
1269 else 1286 else
1270 { 1287 {
1271 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1290 if (button_number >= 3)
1274 button_number += (64 - 3); 1291 button_number += 64 - 3;
1275 } 1292 }
1276 1293
1277 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1278 { 1295 {
1279 /* 1296 /*
… …
1311 fputc ('A', stderr); 1328 fputc ('A', stderr);
1312 if (key_state & 32) 1329 if (key_state & 32)
1313 fputc ('2', stderr); 1330 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1332 button_number,
1316 x + 1, 1333 x,
1317 y + 1); 1334 y);
1318#endif 1335#endif
1319 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1320 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1351 code + button_number + key_state,
1322 (32 + x + 1), 1352 32 + x,
1323 (32 + y + 1)); 1353 32 + y);
1324} 1354}
1325 1355
1326/*{{{ process an X event */ 1356/*{{{ process an X event */
1327void 1357void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1329{ 1359{
1330 make_current (); 1360 make_current ();
1331 1361
1332 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1461 focus_out ();
1432 break; 1462 break;
1433 1463
1434 case ConfigureNotify: 1464 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1439 { 1466 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472#ifdef HAVE_BG_PIXMAP
1473 if (bg_window_position_sensitive ())
1474 want_position_change = true;
1475#endif
1476
1477 bool moved = false;
1478
1479 if (want_position_change)
1480 {
1481 int x, y;
1482
1483 if (ev.xconfigure.send_event)
1484 {
1485 x = ev.xconfigure.x;
1486 y = ev.xconfigure.y;
1487 }
1488 else
1489 get_window_origin (x, y);
1490
1491 if (x != parent_x || y != parent_y)
1492 {
1493 parent_x = x;
1494 parent_y = y;
1495 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1496 }
1497
1498 if (bg_set_position (x, y)
1499 || !(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 }
1442 1502
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1504 {
1445 seen_resize = 1; 1505 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1507 }
1448 else 1508 else
1449 { 1509 {
1450#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1511 if (moved)
1452 update_background (); 1512 update_background ();
1453#endif 1513#endif
1454 } 1514 }
1515
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1517 }
1457 break; 1518 break;
1458 1519
1459 case PropertyNotify: 1520 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1522 break;
1466 1523
1467 case SelectionClear: 1524 case SelectionClear:
1468 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1526 break;
1475 1527
1476 case SelectionRequest: 1528 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1478 break; 1530 break;
1479 1531
1480 case MapNotify: 1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 /* This is needed specifically to fix the case of no window manager or a
1535 * non-reparenting window manager. In those cases we never get first
1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1538 * reparenting.
1539 * We should not render background immediately, as there could be several
1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1541 * by scheduling background redraw as soon as we can, but giving a short
1542 * bit of time for ConfigureNotifies to arrive.
1543 * We should render background PRIOR to drawing any text, but AFTER all
1544 * of ConfigureNotifys for the best results.
1545 */
1546 if (!(bg_flags & BG_IS_VALID))
1547 update_background_ev.start (0.025);
1548#endif
1481 mapped = 1; 1549 mapped = 1;
1482#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1551 text_blink_ev.start ();
1484#endif 1552#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1499 { 1567 {
1500 do 1568 do
1501 { 1569 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1572 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1574
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1576
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1578 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1581 }
1582
1514 want_refresh = 1; 1583 want_refresh = 1;
1515 } 1584 }
1516 else 1585 else
1517 { 1586 {
1518 XEvent unused_event; 1587 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1589 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1590 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1592 ;
1524 1593
1525 if (isScrollbarWindow (ev.xany.window)) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1595 {
1527 scrollBar.setIdle (); 1596 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1597 scrollBar.show (0);
1529 } 1598 }
1530 } 1599 }
1531 break; 1600 break;
1532 1601
1533 case MotionNotify: 1602 case MotionNotify:
… …
1579 int dist; 1648 int dist;
1580 1649
1581 /* don't clobber the current delay if we are 1650 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1651 * already in the middle of scrolling.
1583 */ 1652 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1653 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1654 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1655
1587 /* save the event params so we can highlight 1656 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1657 * the selection in the pending-scroll loop
1589 */ 1658 */
… …
1598 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1599 } 1668 }
1600 else 1669 else
1601 { 1670 {
1602 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1673 }
1605 1674
1606 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1677 + 1;
… …
1612 else 1681 else
1613 { 1682 {
1614 /* we are within the text window, so we 1683 /* we are within the text window, so we
1615 * shouldn't be scrolling 1684 * shouldn't be scrolling
1616 */ 1685 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1686 sel_scroll_ev.stop();
1619 } 1687 }
1620#endif 1688#endif
1621#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1622 } 1690 }
1623#endif 1691#endif
1624 } 1692 }
1625 } 1693 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1695 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1630 ; 1698 ;
1631 1699
1632 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1633 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1704 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1706 scrollBar.size ());
1639 want_refresh = 1; 1707 want_refresh = 1;
1640 scrollbar_show (1); 1708 scrollBar.show (1);
1641 } 1709 }
1642 break; 1710 break;
1643 } 1711 }
1644 1712
1645#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1646 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1647 {
1648 if (hidden_cursor)
1649 {
1650 hidden_cursor = 0;
1651 want_refresh = 1;
1652 }
1653
1654 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1655 }
1656#endif 1716#endif
1657 1717
1658#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1660 { 1720 {
… …
1666 1726
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1727 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1728 pointer_blank ();
1669 } 1729 }
1670#endif 1730#endif
1671}
1672 1731
1673void 1732 refresh_check ();
1733}
1734
1735#if ENABLE_FRILLS
1736void ecb_cold
1737rxvt_term::set_urgency (bool enable)
1738{
1739 if (enable == urgency_hint)
1740 return;
1741
1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1743 {
1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1745 XSetWMHints (dpy, parent, h);
1746 urgency_hint = enable;
1747 XFree (h);
1748 }
1749}
1750#endif
1751
1752void ecb_cold
1674rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1675{ 1754{
1676 if (!focus) 1755 if (!focus)
1677 { 1756 {
1678 focus = 1; 1757 focus = 1;
1679 want_refresh = 1; 1758 want_refresh = 1;
1680 1759
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682
1683#if USE_XIM 1760#if USE_XIM
1684 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1685 { 1762 {
1686 IMSetPosition (); 1763 im_set_position ();
1687 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1688 } 1765 }
1689#endif 1766#endif
1690#if CURSOR_BLINK 1767#if CURSOR_BLINK
1691 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1698 scr_recolour (); 1775 scr_recolour ();
1699 } 1776 }
1700#endif 1777#endif
1701#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1703 { 1780 set_urgency (0);
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif 1781#endif
1711 }
1712}
1713 1782
1714void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1715rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1716{ 1789{
1717 if (focus) 1790 if (focus)
1718 { 1791 {
1719 focus = 0; 1792 focus = 0;
1720 want_refresh = 1; 1793 want_refresh = 1;
1721 1794
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1723 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1724#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1800 if (iso14755buf)
1726 { 1801 {
1727 iso14755buf = 0; 1802 iso14755buf = 0;
1728# if ISO_14755 1803# if ISO_14755
… …
1745 { 1820 {
1746 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1822 scr_recolour ();
1748 } 1823 }
1749#endif 1824#endif
1750 }
1751}
1752 1825
1753void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1754rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1755{ 1832{
1756#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1758 { 1835 {
… …
1762 } 1839 }
1763#endif 1840#endif
1764} 1841}
1765 1842
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1844void ecb_hot
1768rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1846{
1770 make_current (); 1847 make_current ();
1771 1848
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return; 1851 return;
1775 1852
1776# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1853 switch (ev.type)
1778 { 1854 {
1779 case PropertyNotify: 1855 case PropertyNotify:
1780 /* 1856 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1782 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1783 */ 1859 */
1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1862 {
1863# if ENABLE_TRANSPARENCY
1787 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1788 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1789 } 1870 }
1871
1790 break; 1872 break;
1791 } 1873 }
1792# endif 1874
1875 refresh_check ();
1793} 1876}
1794#endif 1877#endif
1795 1878
1796void 1879void
1797rxvt_term::button_press (XButtonEvent &ev) 1880rxvt_term::button_press (XButtonEvent &ev)
… …
1828 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1829 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1830#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1831 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1832 { 1915 {
1833 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1834 MEvent.clicks++; 1917 MEvent.clicks++;
1835 1918
1836 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1837 { 1920 {
1838 /* only report double clicks */ 1921 /* only report double clicks */
… …
1910 } 1993 }
1911 1994
1912 /* 1995 /*
1913 * Scrollbar window processing of button press 1996 * Scrollbar window processing of button press
1914 */ 1997 */
1915 if (isScrollbarWindow (ev.window)) 1998 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 1999 {
1917 scrollBar.setIdle (); 2000 page_dirn direction = NO_DIR;
2001
2002 if (scrollBar.upButton (ev.y))
2003 direction = UP; /* up */
2004 else if (scrollBar.dnButton (ev.y))
2005 direction = DN; /* down */
2006
2007 scrollBar.state = SB_STATE_IDLE;
1918 /* 2008 /*
1919 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 2010 * move up if mouse is above slider
1921 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1922 * 2012 *
… …
1931 /* 2021 /*
1932 * Mouse report disabled scrollbar: 2022 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 2023 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 2024 * click on scrollbar - send pageup/down
1935 */ 2025 */
1936 if ((scrollBar.style == R_SB_NEXT 2026 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 2027 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 2028 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 2029 tt_printf ("\033[B");
1946 else 2030 else
1947 switch (ev.button) 2031 switch (ev.button)
1948 { 2032 {
1949 case Button2: 2033 case Button2:
… …
1957 break; 2041 break;
1958 } 2042 }
1959 } 2043 }
1960 else 2044 else
1961#endif /* NO_SCROLLBAR_REPORT */ 2045#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 2046 {
1968 if (scrollbarnext_upButton (ev.y)) 2047 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 2048 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2049#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2050 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2052#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2053 if (scr_page (direction, 1))
1986 { 2054 {
1987 if (upordown < 0) 2055 if (direction == UP)
1988 scrollBar.setUp (); 2056 scrollBar.state = SB_STATE_UP;
1989 else 2057 else
1990 scrollBar.setDn (); 2058 scrollBar.state = SB_STATE_DOWN;
1991 } 2059 }
1992 } 2060 }
1993 else 2061 else
1994 switch (ev.button) 2062 switch (ev.button)
1995 { 2063 {
1996 case Button2: 2064 case Button2:
1997 switch (scrollbar_align) 2065 switch (scrollBar.align)
1998 { 2066 {
1999 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2000 csrO = 0; 2068 csrO = 0;
2001 break; 2069 break;
2002 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2003 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2004 break; 2072 break;
2005 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2006 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2007 break; 2075 break;
2008 } 2076 }
2009 2077
2010 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2011 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2014 2082
2015 scrollBar.setMotion (); 2083 scrollBar.state = SB_STATE_MOTION;
2016 break; 2084 break;
2017 2085
2018 case Button1: 2086 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2022 2090
2023 case Button3: 2091 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2025 { 2093 {
2026 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2027# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2028 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2029# else 2097# else
2030 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2031# endif 2099# endif
2032 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2033# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2034 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2035# else 2103# else
2036 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2037# endif 2105# endif
2038 else 2106 else
2039 scrollBar.setMotion (); 2107 scrollBar.state = SB_STATE_MOTION;
2040 } 2108 }
2041 else 2109 else
2042 { 2110 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2112 (nrow
2045 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2046 / scrollbar_size ())); 2114 / scrollBar.size ()));
2047 } 2115 }
2048 2116
2049 break; 2117 break;
2050 } 2118 }
2051 } 2119 }
… …
2061 2129
2062 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2131 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2133
2066 if (scrollbar_isUpDn ()) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2067 { 2135 {
2068 scrollBar.setIdle (); 2136 scrollBar.state = SB_STATE_IDLE;
2069 scrollbar_show (0); 2137 scrollBar.show (0);
2070 } 2138 }
2071 2139
2072#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2075#endif 2142#endif
2076 2143
2077 if (ev.window == vt) 2144 if (ev.window == vt)
2078 { 2145 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2146 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2124 case Button3: 2191 case Button3:
2125 selection_make (ev.time); 2192 selection_make (ev.time);
2126 break; 2193 break;
2127 2194
2128 case Button2: 2195 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2198 break;
2132 2199
2133#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2134 case Button4: 2201 case Button4:
2135 case Button5: 2202 case Button5:
… …
2151 { 2218 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2219 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2220 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2221 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2222
2223 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2224 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2225 }
2158 else 2226 else
2227# endif
2159 { 2228 {
2160# endif
2161 scr_page (v, i); 2229 scr_page (v, i);
2162 scrollbar_show (1); 2230 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2231 }
2165# endif
2166 } 2232 }
2167 break; 2233 break;
2168#endif 2234#endif
2169 } 2235 }
2170 } 2236 }
2171} 2237}
2172 2238
2173/*}}} */ 2239/*}}} */
2174 2240
2175bool 2241void ecb_hot
2176rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2177{ 2243{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2181 2246
2182 for (;;) 2247 for (;;)
2183 { 2248 {
2184 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2185 { 2250 {
2186 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2252 ch = next_char ();
2188 2253
2189 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2190 break; 2255 break;
2191 } 2256 }
2192 2257
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2259 {
2195 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2196 { 2261 {
2197 seen_input = 1; 2262 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2278 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2280
2216 for (;;) 2281 for (;;)
2217 { 2282 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2284 break;
2220 2285
2221 *str++ = ch; 2286 *str++ = ch;
2222 2287
2223 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2289 {
2225 if (ch == C0_LF) 2290 if (ch == C0_LF)
2226 nlines++; 2291 nlines++;
2227 2292
2228 refresh_count++; 2293 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2342 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2279 */ 2344 */
2280 if (refreshnow) 2345 if (refreshnow)
2281 { 2346 {
2282 flag = true;
2283 scr_refresh (); 2347 scr_refresh ();
2284 want_refresh = 1; 2348 want_refresh = 1;
2285 } 2349 }
2286
2287 } 2350 }
2288 else 2351 else
2289 { 2352 {
2290 try 2353 try
2291 { 2354 {
… …
2299 } 2362 }
2300 2363
2301 ch = NOCHAR; 2364 ch = NOCHAR;
2302 } 2365 }
2303 } 2366 }
2304
2305 return flag;
2306} 2367}
2307 2368
2308// read the next character 2369// read the next character
2309wchar_t 2370wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2311{ 2372{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2374 {
2314 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2317 2378
2318 wchar_t wc; 2379 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2381
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2386 break;
2326 } 2387 }
2327 2388
2328 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2330 2394
2331 // assume wchar == unicode 2395 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2334 } 2398 }
2335 2399
2336 return NOCHAR; 2400 return NOCHAR;
2337} 2401}
2338 2402
2339// read the next octet 2403// read the next octet
2340uint32_t 2404uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () NOTHROW
2342{ 2406{
2343 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2409 : NOCHAR;
2346} 2410}
2347 2411
2348static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2349 2413
2350/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2416{
2358 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2359 2418
2360 if (c == NOCHAR) 2419 if (c == NOCHAR)
2361 throw out_of_input; 2420 throw out_of_input;
2362 2421
2363 return c; 2422 return c;
2364} 2423}
2365 2424
2366uint32_t 2425uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2368{ 2427{
2369 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2370 2429
2371 if (c == NOCHAR) 2430 if (c == NOCHAR)
… …
2375} 2434}
2376 2435
2377/*{{{ print pipe */ 2436/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2380FILE * 2439FILE * ecb_cold
2381rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2382{ 2441{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2443
2385 if (stream == NULL) 2444 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2446
2388 return stream; 2447 return stream;
2389} 2448}
2390 2449
2391int 2450int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2393{ 2452{
2394 fflush (stream); 2453 fflush (stream);
2395 return pclose (stream); 2454 return pclose (stream);
2396} 2455}
2397 2456
2398/* 2457/*
2399 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2400 */ 2459 */
2401void 2460void ecb_cold
2402rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2403{ 2462{
2404 int done; 2463 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2464
2407 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2408 return; 2466 return;
2409 2467
2410 /* 2468 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2470 * is received.
2413 */ 2471 */
2414 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2415 { 2473 {
2416 unsigned char buf[8]; 2474 unsigned char buf[8];
2417 unicode_t ch; 2475 unicode_t ch;
2418 unsigned int i, len; 2476 unsigned int i, len;
2419 2477
… …
2453 pclose_printer (fd); 2511 pclose_printer (fd);
2454} 2512}
2455#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2456/*}}} */ 2514/*}}} */
2457 2515
2458/* *INDENT-OFF* */
2459enum { 2516enum {
2460 C1_40 = 0x40, 2517 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2462 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2463 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2464 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2522};
2466/* *INDENT-ON* */
2467 2523
2468/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2469void 2525void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2527{
2472 switch (ch) 2528 switch (ch)
2473 { 2529 {
2474 case C0_ESC: 2530 case C0_ESC:
… …
2520} 2576}
2521/*}}} */ 2577/*}}} */
2522 2578
2523 2579
2524/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2525void 2581void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2583{
2528 int row, col; 2584 int row, col;
2529 2585
2530 switch (ch) 2586 switch (ch)
… …
2564 break; 2620 break;
2565 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2623 break;
2568 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2570 break; 2626 break;
2571 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2573 /* unimplemented */ 2629 /* unimplemented */
2574 break; 2630 break;
… …
2580} 2636}
2581/*}}} */ 2637/*}}} */
2582 2638
2583 2639
2584/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2585void 2641void ecb_hot
2586rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2587{ 2643{
2588 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2589 2645
2590 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2649 return;
2594 } 2650 }
2595 2651
2596 switch (ch) 2652 switch (ch)
2597 { 2653 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2654 case '#':
2600 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2601 scr_E (); 2656 scr_E ();
2602 break; 2657 break;
2603 case '(': 2658 case '(':
… …
2626#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2627 case '9': 2682 case '9':
2628 scr_forwardindex (); 2683 scr_forwardindex ();
2629 break; 2684 break;
2630#endif 2685#endif
2686 // DECPAM/DECPNM
2631 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2632 case '>': 2690 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
2634 break; 2692 break;
2635 2693
2636 case C1_40: 2694 case C1_40:
2637 cmd_getc (); 2695 cmd_getc ();
2638 break; 2696 break;
… …
2642 2700
2643 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2645 { 2703 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2706 }
2649 break; 2707 break;
2650 2708
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2709 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2710 case C1_ESA: /* ESC G */
2653 process_graphics (); 2711 // used by original rxvt for rob nations own graphics mode
2712 if (cmd_getc () == 'Q')
2713 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2714 break;
2655 2715
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2718 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2663 scr_index (DN); 2723 scr_index (DN);
2664 break; 2724 break;
2665 2725
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2668 2728
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2671 2731
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2734 process_dcs_seq ();
2675 break; 2735 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2681 2741
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2744 process_csi_seq ();
2685 break; 2745 break;
2686 2746
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2749 process_osc_seq ();
2690 break; 2750 break;
2691 2751
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2753 case 'c':
2694 mbstate.reset (); 2754 mbstate.reset ();
2695 scr_poweron (); 2755 scr_poweron ();
2696 scrollbar_show (1); 2756 scrollBar.show (1);
2697 break; 2757 break;
2698 2758
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2760 case 'n':
2701 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
2708 } 2768 }
2709} 2769}
2710/*}}} */ 2770/*}}} */
2711 2771
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2773enum {
2715 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2717 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2776 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2718 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2777 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2780 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2781 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2783};
2725 2784
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2790
2732const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2733 { 2792 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2794 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2795 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2796 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2738 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2797 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2739 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2740 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2741 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2801 };
2743/* *INDENT-ON* */
2744 2802
2745void 2803void ecb_hot
2746rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2747{ 2805{
2748 unicode_t ch, priv, i; 2806 unicode_t ch, priv, i;
2749 unsigned int nargs, p; 2807 unsigned int nargs, p;
2750 int n, ndef; 2808 int n, ndef;
… …
2752 2810
2753 nargs = 0; 2811 nargs = 0;
2754 2812
2755 priv = 0; 2813 priv = 0;
2756 ch = cmd_getc (); 2814 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2816 {
2759 /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2818 priv = ch;
2761 ch = cmd_getc (); 2819 ch = cmd_getc ();
2762 } 2820 }
2763 2821
2764 /* read any numerical arguments */ 2822 /* read any numerical arguments */
… …
2813 // versions. 2871 // versions.
2814 // 2872 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2873 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2874 }
2817 break; 2875 break;
2876
2818 case '?': 2877 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2822 } 2893 }
2894 break;
2895 }
2896
2823 return; 2897 return;
2824 } 2898 }
2825 2899
2826 switch (ch) 2900 switch (ch)
2827 { 2901 {
… …
2841 } 2915 }
2842 break; 2916 break;
2843#endif 2917#endif
2844 2918
2845 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2846 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2847 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2848 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2849 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2850 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2851 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2852 break; 2926 break;
2853 2927
2854 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2855 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3042 } 3116 }
3043} 3117}
3044/*}}} */ 3118/*}}} */
3045 3119
3046#if !ENABLE_MINIMAL 3120#if !ENABLE_MINIMAL
3047/* ARGSUSED */
3048void 3121void
3049rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3122rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3050{ 3123{
3051 int x, y; 3124 int x, y;
3052 XWindowAttributes wattr; 3125 XWindowAttributes wattr;
… …
3061 { 3134 {
3062 /* 3135 /*
3063 * commands 3136 * commands
3064 */ 3137 */
3065 case 1: /* deiconify window */ 3138 case 1: /* deiconify window */
3066 XMapWindow (dpy, parent[0]); 3139 XMapWindow (dpy, parent);
3067 break; 3140 break;
3068 case 2: /* iconify window */ 3141 case 2: /* iconify window */
3069 XIconifyWindow (dpy, parent[0], display->screen); 3142 XIconifyWindow (dpy, parent, display->screen);
3070 break; 3143 break;
3071 case 3: /* set position (pixels) */ 3144 case 3: /* set position (pixels) */
3072 XMoveWindow (dpy, parent[0], args[1], args[2]); 3145 XMoveWindow (dpy, parent, args[1], args[2]);
3073 break; 3146 break;
3074 case 4: /* set size (pixels) */ 3147 case 4: /* set size (pixels) */
3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3148 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3076 break; 3149 break;
3077 case 5: /* raise window */ 3150 case 5: /* raise window */
3078 XRaiseWindow (dpy, parent[0]); 3151 XRaiseWindow (dpy, parent);
3079 break; 3152 break;
3080 case 6: /* lower window */ 3153 case 6: /* lower window */
3081 XLowerWindow (dpy, parent[0]); 3154 XLowerWindow (dpy, parent);
3082 break; 3155 break;
3083 case 7: /* refresh window */ 3156 case 7: /* refresh window */
3084 scr_touch (true); 3157 scr_touch (true);
3085 break; 3158 break;
3086 case 8: /* set size (chars) */ 3159 case 8: /* set size (chars) */
… …
3089 break; 3162 break;
3090 3163
3091 //case 9: NYI, TODO, restore maximized window or maximize window 3164 //case 9: NYI, TODO, restore maximized window or maximize window
3092 default: 3165 default:
3093 if (args[0] >= 24) /* set height (chars) */ 3166 if (args[0] >= 24) /* set height (chars) */
3094 set_widthheight ((unsigned int)width, 3167 set_widthheight ((unsigned int)vt_width,
3095 (unsigned int) (args[1] * fheight)); 3168 (unsigned int) (args[1] * fheight));
3096 break; 3169 break;
3097 3170
3098 /* 3171 /*
3099 * reports - some output format copied from XTerm 3172 * reports - some output format copied from XTerm
3100 */ 3173 */
3101 case 11: /* report window state */ 3174 case 11: /* report window state */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3176 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3104 break; 3177 break;
3105 case 13: /* report window position */ 3178 case 13: /* report window position */
3106 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3107 XTranslateCoordinates (dpy, parent[0], wattr.root, 3180 XTranslateCoordinates (dpy, parent, wattr.root,
3108 -wattr.border_width, -wattr.border_width, 3181 -wattr.border_width, -wattr.border_width,
3109 &x, &y, &wdummy); 3182 &x, &y, &wdummy);
3110 tt_printf ("\033[3;%d;%dt", x, y); 3183 tt_printf ("\033[3;%d;%dt", x, y);
3111 break; 3184 break;
3112 case 14: /* report window size (pixels) */ 3185 case 14: /* report window size (pixels) */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3186 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3187 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3115 break; 3188 break;
3116 case 18: /* report text area size (chars) */ 3189 case 18: /* report text area size (chars) */
3117 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3118 break; 3191 break;
… …
3120 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3193 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3121 break; 3194 break;
3122 case 20: /* report icon label */ 3195 case 20: /* report icon label */
3123 { 3196 {
3124 char *s; 3197 char *s;
3125 XGetIconName (dpy, parent[0], &s); 3198 XGetIconName (dpy, parent, &s);
3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3199 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3127 XFree (s); 3200 XFree (s);
3128 } 3201 }
3129 break; 3202 break;
3130 case 21: /* report window title */ 3203 case 21: /* report window title */
3131 { 3204 {
3132 char *s; 3205 char *s;
3133 XFetchName (dpy, parent[0], &s); 3206 XFetchName (dpy, parent, &s);
3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3207 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3135 XFree (s); 3208 XFree (s);
3136 } 3209 }
3137 break; 3210 break;
3138 } 3211 }
… …
3194 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3267 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3195 */ 3268 */
3196void 3269void
3197rxvt_term::process_dcs_seq () 3270rxvt_term::process_dcs_seq ()
3198{ 3271{
3199 char *s;
3200 unicode_t eh;
3201
3202 /* 3272 /*
3203 * Not handled yet 3273 * Not handled yet
3204 */ 3274 */
3275
3276 unicode_t eh;
3205 s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3206 if (s) 3278 if (s)
3207 free (s); 3279 free (s);
3208 3280
3209 return; 3281 return;
3210} 3282}
… …
3214 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3286 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3215 */ 3287 */
3216void 3288void
3217rxvt_term::process_osc_seq () 3289rxvt_term::process_osc_seq ()
3218{ 3290{
3219 unicode_t ch, eh;
3220 int arg; 3291 int arg;
3221 3292
3222 ch = cmd_getc (); 3293 unicode_t ch = cmd_getc ();
3223 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3294 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3224 arg = arg * 10 + (ch - '0'); 3295 arg = arg * 10 + (ch - '0');
3225 3296
3226 if (ch == ';') 3297 if (ch == ';')
3227 { 3298 {
3299 unicode_t eh;
3228 char *s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3229 3301
3230 if (s) 3302 if (s)
3231 { 3303 {
3232 process_xterm_seq (arg, s, eh); 3304 process_xterm_seq (arg, s, eh);
… …
3256 3328
3257/* 3329/*
3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3330 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3259 */ 3331 */
3260void 3332void
3261rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3333rxvt_term::process_xterm_seq (int op, char *str, char resp)
3262{ 3334{
3263 int color; 3335 int color;
3264 char *buf, *name; 3336 char *buf, *name;
3265 bool query = str[0] == '?' && !str[1]; 3337 bool query = str[0] == '?' && !str[1];
3266 int saveop = op; 3338 int saveop = op;
… …
3293 unsigned long bytes_after; 3365 unsigned long bytes_after;
3294 unsigned char *value = 0; 3366 unsigned char *value = 0;
3295 const char *str = ""; 3367 const char *str = "";
3296 3368
3297 if (prop 3369 if (prop
3298 && XGetWindowProperty (dpy, parent[0], 3370 && XGetWindowProperty (dpy, parent,
3299 prop, 0, 1<<16, 0, AnyPropertyType, 3371 prop, 0, 1<<16, 0, AnyPropertyType,
3300 &actual_type, &actual_format, 3372 &actual_type, &actual_format,
3301 &nitems, &bytes_after, &value) == Success 3373 &nitems, &bytes_after, &value) == Success
3302 && actual_type != None 3374 && actual_type != None
3303 && actual_format == 8) 3375 && actual_format == 8)
… …
3307 3379
3308 XFree (value); 3380 XFree (value);
3309 } 3381 }
3310 else 3382 else
3311 { 3383 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3384 char *eq = strchr (str, '=');
3313 3385
3314 if (eq) 3386 if (eq)
3315 { 3387 {
3316 *eq = 0; 3388 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3389 set_utf8_property (display->atom (str), eq + 1);
3318 } 3390 }
3319 else 3391 else
3320 XDeleteProperty (dpy, parent[0], 3392 XDeleteProperty (dpy, parent,
3321 display->atom (str)); 3393 display->atom (str));
3322 } 3394 }
3323 break; 3395 break;
3324 3396
3325 case XTerm_Color: 3397 case XTerm_Color:
… …
3338 *buf++ = '\0'; 3410 *buf++ = '\0';
3339 3411
3340 process_color_seq (op, color, name, resp); 3412 process_color_seq (op, color, name, resp);
3341 } 3413 }
3342 break; 3414 break;
3415 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3416 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3417 process_color_seq (op, Color_fg, str, resp);
3345 break; 3418 break;
3419 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3420 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3421 process_color_seq (op, Color_bg, str, resp);
3348 break; 3422 break;
3349#ifndef NO_CURSORCOLOR 3423#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3424 case XTerm_Color_cursor:
… …
3355 process_color_seq (op, Color_pointer_fg, str, resp); 3429 process_color_seq (op, Color_pointer_fg, str, resp);
3356 break; 3430 break;
3357 case XTerm_Color_pointer_bg: 3431 case XTerm_Color_pointer_bg:
3358 process_color_seq (op, Color_pointer_bg, str, resp); 3432 process_color_seq (op, Color_pointer_bg, str, resp);
3359 break; 3433 break;
3434#ifdef OPTION_HC
3435 case XTerm_Color_HC:
3436 process_color_seq (op, Color_HC, str, resp);
3437 break;
3438 case XTerm_Color_HTC:
3439 process_color_seq (op, Color_HTC, str, resp);
3440 break;
3441#endif
3360#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3361 case XTerm_Color_RV:
3362 process_color_seq (op, Color_RV, str, resp);
3363 break;
3364 case Rxvt_Color_BD:
3365 case URxvt_Color_BD: 3443 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp); 3444 process_color_seq (op, Color_BD, str, resp);
3367 break; 3445 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL: 3446 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp); 3447 process_color_seq (op, Color_UL, str, resp);
3371 break; 3448 break;
3372 case URxvt_Color_IT: 3449 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3450 process_color_seq (op, Color_IT, str, resp);
3374 break; 3451 break;
3375#endif 3452#endif
3453 case URxvt_Color_border:
3454 process_color_seq (op, Color_border, str, resp);
3455 break;
3376#if ENABLE_TRANSPARENCY 3456#if ENABLE_TRANSPARENCY
3377 case URxvt_Color_tint: 3457 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3458 process_color_seq (op, Color_tint, str, resp);
3379 { 3459 {
3380 bool changed = false; 3460 bool changed = false;
3461
3381 if (ISSET_PIXCOLOR (Color_tint)) 3462 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3463 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3383 else 3464
3384 changed = bgPixmap.unset_tint ();
3385 if (changed) 3465 if (changed)
3386 update_background (); 3466 update_background ();
3387 } 3467 }
3388 3468
3389 break; 3469 break;
… …
3392#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3393 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3394 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3395 { 3475 {
3396 char str[256]; 3476 char str[256];
3477 int h_scale = fimage.h_scale;
3478 int v_scale = fimage.v_scale;
3479 int h_align = fimage.h_align;
3480 int v_align = fimage.v_align;
3397 3481
3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3482 sprintf (str, "[%dx%d+%d+%d]",
3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3483 h_scale, v_scale,
3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3484 h_align, v_align);
3401 process_xterm_seq (XTerm_title, str, CHAR_ST); 3485 process_xterm_seq (XTerm_title, str, CHAR_ST);
3402 } 3486 }
3403 else 3487 else
3404 { 3488 {
3405 int changed = 0; 3489 bool changed = false;
3406 3490
3407 if (*str != ';') 3491 if (*str != ';')
3408 { 3492 {
3409 /* reset to default scaling :*/ 3493 if (fimage.set_file_geometry (this, str))
3410 bgPixmap.unset_geometry ();
3411 if (bgPixmap.set_file (str)) /* change pixmap */
3412 changed++; 3494 changed = true;
3413 str = strchr (str, ';');
3414 if (str == NULL)
3415 bgPixmap.set_defaultGeometry ();
3416 } 3495 }
3417 while (str) 3496 else
3418 { 3497 {
3419 str++; 3498 str++;
3420 if (bgPixmap.set_geometry (str)) 3499 if (fimage.set_geometry (str, true))
3421 changed++; 3500 changed = true;
3422 str = strchr (str, ';');
3423 } 3501 }
3502
3424 if (changed) 3503 if (changed)
3504 {
3505 if (bg_window_position_sensitive ())
3506 {
3507 int x, y;
3508 get_window_origin (x, y);
3509 bg_set_position (x, y);
3510 }
3425 update_background (); 3511 update_background ();
3512 }
3426 } 3513 }
3427 break; 3514 break;
3428#endif 3515#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3516
3437 case XTerm_logfile: 3517 case XTerm_logfile:
3438 // TODO, when secure mode? 3518 // TODO, when secure mode?
3439 break; 3519 break;
3440 3520
… …
3507 break; 3587 break;
3508#endif 3588#endif
3509 3589
3510#if ENABLE_PERL 3590#if ENABLE_PERL
3511 case URxvt_perl: 3591 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3592 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3593 break;
3515#endif 3594#endif
3516 } 3595 }
3517} 3596}
3518/*----------------------------------------------------------------------*/ 3597/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3604 * 's' = save
3526 * 'r' = restore 3605 * 'r' = restore
3527 * 't' = toggle 3606 * 't' = toggle
3528 * so no need for fancy checking 3607 * so no need for fancy checking
3529 */ 3608 */
3530int 3609int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3610rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3611{
3533 int state; 3612 int state;
3534 3613
3535 if (mode == 's') 3614 if (mode == 's')
3536 { 3615 {
3537 SavedModes |= (priv_modes & bit); 3616 if (priv_modes & bit)
3617 SavedModes |= bit;
3618 else
3619 SavedModes &= ~bit;
3538 return -1; 3620 return -1;
3539 } 3621 }
3540 else 3622 else
3541 { 3623 {
3542 if (mode == 'r') 3624 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3625 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3626 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3627 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3628
3629 if (state)
3630 priv_modes |= bit;
3631 else
3632 priv_modes &= ~bit;
3547 } 3633 }
3548 3634
3549 return state; 3635 return state;
3550} 3636}
3551 3637
3552/* we're not using priv _yet_ */ 3638/* we're not using priv _yet_ */
3553void 3639void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3640rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3641{
3556 unsigned int i, j; 3642 unsigned int i, j;
3557 int state; 3643 int state;
3558 3644
3559 static const struct 3645 static const struct
3560 { 3646 {
3561 const int argval; 3647 const int argval;
3562 const unsigned long bit; 3648 const unsigned long bit;
3563 } argtopriv[] = { 3649 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3650 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3651 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3652 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3653 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3654 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3655 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3656 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3657 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3658 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3659 // 18 end FF to printer after print screen
3660 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3661 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3662#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3663 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3664#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3665 { 35, PrivMode_ShiftKeys }, // rxvt extension
3666 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3667 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3668 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3669 // 45 margin bell NYI
3582 // 46 start logging 3670 // 46 start logging
3583 { 47, PrivMode_Screen }, 3671 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3672 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3673#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3674 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3675#endif
3588 { 1000, PrivMode_MouseX11 }, 3676 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3677 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3678 { 1003, PrivMode_MouseAnyEvent },
3679#if ENABLE_FRILLS
3680 { 1005, PrivMode_ExtModeMouse },
3681#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3682 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3683 { 1011, PrivMode_Keypress }, // rxvt extension
3684#if ENABLE_FRILLS
3685 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3686#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3687 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3688 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3689 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3690 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3691 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3692 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3693 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3694 { 2004, PrivMode_BracketPaste },
3600 }; 3695 };
3601 3696
3602 if (nargs == 0) 3697 if (nargs == 0)
3603 return; 3698 return;
3604 3699
… …
3611 for (i = 0; i < nargs; i++) 3706 for (i = 0; i < nargs; i++)
3612 { 3707 {
3613 state = -1; 3708 state = -1;
3614 3709
3615 /* basic handling */ 3710 /* basic handling */
3616 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3711 for (j = 0; j < ecb_array_length (argtopriv); j++)
3617 if (argtopriv[j].argval == arg[i]) 3712 if (argtopriv[j].argval == arg[i])
3618 { 3713 {
3619 state = privcases (mode, argtopriv[j].bit); 3714 state = privcases (mode, argtopriv[j].bit);
3620 break; 3715 break;
3621 } 3716 }
… …
3629 3724
3630 scr_touch (true); 3725 scr_touch (true);
3631 break; 3726 break;
3632#endif 3727#endif
3633 case 1048: /* alternative cursor save */ 3728 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3729 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3730 if (mode == 0)
3637 scr_cursor (RESTORE); 3731 scr_cursor (RESTORE);
3638 else if (mode == 1) 3732 else if (mode == 1)
3639 scr_cursor (SAVE); 3733 scr_cursor (SAVE);
… …
3648 case 2: /* VT52 mode */ 3742 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3743 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3744 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3745 * within VT52 mode
3652 */ 3746 */
3653 PrivMode (1, PrivMode_vt52); 3747 priv_modes |= PrivMode_vt52;
3654 break; 3748 break;
3655 case 3: /* 80/132 */ 3749 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3750 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3751 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3752 break;
3659 case 4: /* smooth scrolling */ 3753 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3754 set_option (Opt_jumpScroll, !state);
3661 break; 3755 break;
3662 case 5: /* reverse video */ 3756 case 5: /* reverse video */
… …
3673 if (state) /* orthogonal */ 3767 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3768 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3769 break;
3676#ifdef scrollBar_esc 3770#ifdef scrollBar_esc
3677 case scrollBar_esc: 3771 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3772 scrollBar.map (state);
3679 {
3680 resize_all_windows (0, 0, 0); 3773 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3774 scr_touch (true);
3682 }
3683 break; 3775 break;
3684#endif 3776#endif
3685 case 25: /* visible/invisible cursor */ 3777 case 25: /* visible/invisible cursor */
3686 scr_cursor_visible (state); 3778 scr_cursor_visible (state);
3687 break; 3779 break;
… …
3700 case 1003: 3792 case 1003:
3701 if (state) 3793 if (state)
3702 { 3794 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3795 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3796 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3797 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3798 vt_emask_mouse = PointerMotionMask;
3706 } 3799 }
3707 else 3800 else
3708 vt_emask_mouse = NoEventMask; 3801 vt_emask_mouse = NoEventMask;
3802
3709 vt_select_input (); 3803 vt_select_input ();
3710 break; 3804 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3805 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3806 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3807 break;
3714 case 1011: /* scroll to bottom on key press */ 3808 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3809 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3810 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3811 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3812 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3813 if (!state)
3720 scr_erase_screen (2); 3814 scr_erase_screen (2);
3815
3721 scr_change_screen (state); 3816 scr_change_screen (state);
3722 break; 3817 break;
3723 case 1049: /* secondary screen w/ clearing first */ 3818 case 1049: /* secondary screen w/ clearing first */
3819 if (option (Opt_secondaryScreen))
3820 if (state)
3821 scr_cursor (SAVE);
3822
3724 scr_change_screen (state); 3823 scr_change_screen (state);
3824
3725 if (option (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3826 if (state)
3727 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828 else
3829 scr_cursor (RESTORE);
3728 break; 3830 break;
3729 default: 3831 default:
3730 break; 3832 break;
3731 } 3833 }
3732 } 3834 }
3733} 3835}
3734/*}}} */ 3836/*}}} */
3735 3837
3736/*{{{ process sgr sequences */ 3838/*{{{ process sgr sequences */
3737void 3839void ecb_hot
3738rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3840rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3739{ 3841{
3740 unsigned int i; 3842 unsigned int i;
3741 short rendset; 3843 short rendset;
3742 int rendstyle; 3844 int rendstyle;
… …
3885 } 3987 }
3886 } 3988 }
3887} 3989}
3888/*}}} */ 3990/*}}} */
3889 3991
3890/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3891void
3892rxvt_term::process_graphics ()
3893{
3894 unicode_t ch, cmd = cmd_getc ();
3895
3896 if (cmd == 'Q')
3897 {
3898 /* query graphics */
3899 tt_printf ("\033G0\012"); /* no graphics */
3900 return;
3901 }
3902 /* swallow other graphics sequences until terminating ':' */
3903 do
3904 ch = cmd_getc ();
3905 while (ch != ':');
3906}
3907/*}}} */
3908
3909/* ------------------------------------------------------------------------- */ 3992/* ------------------------------------------------------------------------- */
3910 3993
3911/* 3994/*
3912 * Send printf () formatted output to the command. 3995 * Send printf () formatted output to the command.
3913 * Only use for small amounts of data. 3996 * Only use for small amounts of data.
… …
3926 4009
3927/* ---------------------------------------------------------------------- */ 4010/* ---------------------------------------------------------------------- */
3928/* Write data to the pty as typed by the user, pasted with the mouse, 4011/* Write data to the pty as typed by the user, pasted with the mouse,
3929 * or generated by us in response to a query ESC sequence. 4012 * or generated by us in response to a query ESC sequence.
3930 */ 4013 */
3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4014static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3932 4015
3933void 4016void
3934rxvt_term::tt_write (const char *data, unsigned int len) 4017rxvt_term::tt_write (const char *data, unsigned int len)
3935{ 4018{
3936 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4019 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3941 4024
3942 if (v_buflen == 0) 4025 if (v_buflen == 0)
3943 { 4026 {
3944 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4027 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3945 4028
4029 max_it (written, 0);
4030
3946 if ((unsigned int)written == len) 4031 if (written == len)
3947 return; 4032 return;
3948 4033
3949 data += written; 4034 data += written;
3950 len -= written; 4035 len -= written;
3951 } 4036 }
3952 4037
3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4038 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3954 4039
3955 memcpy (v_buffer + v_buflen, data, len); 4040 memcpy (v_buffer + v_buflen, data, len);
3956 v_buflen += len; 4041 v_buflen += len;
3957 4042
3958 pty_ev.set (ev::READ | ev::WRITE); 4043 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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