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.402 by ayin, Fri Feb 1 14:13:52 2008 UTC vs.
Revision 1.522 by sf-exg, Mon Jun 11 14:45:53 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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
305{ 407{
306 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 409 KeySym keysym;
309 int valid_keysym; 410 int valid_keysym;
310 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
311 412
312#if ISO_14755 413#if ISO_14755
… …
322 */ 423 */
323 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
326 427
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 428 kbuf[0] = 0;
334 429
335#ifdef USE_XIM 430#if USE_XIM
336 if (Input_Context) 431 if (Input_Context)
337 { 432 {
338 Status status_return; 433 Status status_return;
339 434
340#if 0 435#if 0
… …
411#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 508#else
414 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
415#endif 510#endif
511 max_it (lnsppg, 1);
512
416 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
417 { 514 {
418 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
419 return; 516 return;
420 } 517 }
… …
473 selection_request (ev.time); 570 selection_request (ev.time);
474 return; 571 return;
475#if TODO 572#if TODO
476 /* rxvt extras */ 573 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 575 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 577 return;
483#endif 578#endif
484 } 579 }
485 } 580 }
486 } 581 }
487 582
488#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 584 // ISO 14755 support
490 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 586 {
492 int hv; 587 int hv;
493 588
494 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 620 scr_overlay_off ();
526# endif 621# endif
527 iso14755buf = 0; 622 iso14755buf = 0;
528 } 623 }
529 } 624 }
625 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
533 { 629 {
534 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 631# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 643 }
548#endif 644#endif
549 645
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 657 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 658#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 659 case XK_BackSpace:
555#ifdef XK_KP_Home 660 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 661 {
557 XK_KP_7, // XK_KP_Home 662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 663 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 664 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 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;
572 691
573 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:
574 { 772 {
575 unsigned int index = keysym - XK_KP_Home; 773 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
577 } 778 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 779 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 780 }
795 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
796 /* 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 /*
797 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
798 */ 801 */
799#ifdef META8_OPTION 802#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
801 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
802#endif 805#endif
806 }
803 807
804 } 808 }
805 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
806 { 810 {
807 len = 1; 811 len = 1;
… …
841 { 845 {
842 view_start = 0; 846 view_start = 0;
843 want_refresh = 1; 847 want_refresh = 1;
844 } 848 }
845 849
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859
860 /* escape prefix */ 850 /* escape prefix */
861 if (meta 851 if (meta
862#ifdef META8_OPTION 852#ifdef META8_OPTION
863 && meta_char == C0_ESC 853 && meta_char == C0_ESC
864#endif 854#endif
… …
869 } 859 }
870 860
871 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
872} 862}
873 863
874void 864void ecb_cold
875rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
876{ 866{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym; 868 KeySym keysym;
879 869
… …
899 commit_iso14755 (); 889 commit_iso14755 ();
900 890
901 return; 891 return;
902 } 892 }
903 893
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 895 if (i[0] == keysym)
906 { 896 {
907 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 898 commit_iso14755 ();
909 899
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
948#endif 938#endif
949} 939}
950 940
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 941void
985rxvt_term::flush () 942rxvt_term::flush ()
986{ 943{
987 flush_ev.stop (); 944 flush_ev.stop ();
988 945
989#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
991 { 948 {
992// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 950 scr_touch (false);
994 } 951 }
995#endif 952#endif
996 953
997 if (want_refresh) 954 if (want_refresh)
… …
1033 } 990 }
1034 while (row < end_row); 991 while (row < end_row);
1035 } 992 }
1036 993
1037 scr_refresh (); 994 scr_refresh ();
1038 scrollbar_show (1); 995 scrollBar.show (1);
1039#ifdef USE_XIM 996#if USE_XIM
1040 IMSendSpot (); 997 im_send_spot ();
1041#endif 998#endif
1042 } 999 }
1043 1000
1044 display->flush (); 1001 display->flush ();
1045} 1002}
1046 1003
1047/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1048void 1005void
1049rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1050{ 1007{
1051 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1062 refresh_count = 0; 1019 refresh_count = 0;
1063 flush (); 1020 flush ();
1064} 1021}
1065 1022
1066#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
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
1067void 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;
… …
1090 1062
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1064void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1066{
1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1069 {
1098 want_refresh = 1; 1070 want_refresh = 1;
1099 refresh_check (); 1071 refresh_check ();
1100 } 1072 }
1101 else 1073 else
… …
1145 { 1117 {
1146 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1148 // 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
1149 // 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.
1150 1125
1151 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1153 1128
1154 w.stop (); 1129 w.stop ();
1155 } 1130 }
1156 1131
… …
1159 { 1134 {
1160 } 1135 }
1161} event_handler; 1136} event_handler;
1162#endif 1137#endif
1163 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
1164bool 1172bool
1165rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1166{ 1174{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1168 1176
1169 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1178
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1172 n = 0;
1173 } 1180 {
1174 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1178 1186
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1188
1181 if (r > 0) 1189 if (r > 0)
1182 { 1190 {
1183 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1184 return true; 1192 return true;
… …
1206{ 1214{
1207 make_current (); 1215 make_current ();
1208 1216
1209 if (revents & ev::READ) 1217 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1220 cmd_parse ();
1213 break;
1214 1221
1215 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1216 pty_write (); 1223 pty_write ();
1217 1224
1218 refresh_check (); 1225 refresh_check ();
1219} 1226}
1220 1227
1221void 1228void ecb_cold
1222rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1223{ 1230{
1224 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1225 recolour_cursor (); 1232 recolour_cursor ();
1226 1233
… …
1231 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1232#endif 1239#endif
1233} 1240}
1234 1241
1235#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1236void 1243void ecb_cold
1237rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1238{ 1245{
1239 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1240 return; 1247 return;
1241 1248
… …
1243 XFlush (dpy); 1250 XFlush (dpy);
1244 1251
1245 hidden_pointer = 1; 1252 hidden_pointer = 1;
1246} 1253}
1247 1254
1248void 1255void ecb_cold
1249rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1250{ 1257{
1251 make_current (); 1258 make_current ();
1252 1259
1253 pointer_blank (); 1260 pointer_blank ();
… …
1259{ 1266{
1260 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1261 int x, y; 1268 int x, y;
1262 int code = 32; 1269 int code = 32;
1263 1270
1264 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1266 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1267 { 1275 {
1268 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1269 return; 1277 return;
1278
1270 mouse_row = x; 1279 mouse_row = x;
1271 mouse_col = y; 1280 mouse_col = y;
1272 code += 32; 1281 code += 32;
1273 } 1282 }
1274 1283
… …
1277 else 1286 else
1278 { 1287 {
1279 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1290 if (button_number >= 3)
1282 button_number += (64 - 3); 1291 button_number += 64 - 3;
1283 } 1292 }
1284 1293
1285 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1286 { 1295 {
1287 /* 1296 /*
… …
1319 fputc ('A', stderr); 1328 fputc ('A', stderr);
1320 if (key_state & 32) 1329 if (key_state & 32)
1321 fputc ('2', stderr); 1330 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1332 button_number,
1324 x + 1, 1333 x,
1325 y + 1); 1334 y);
1326#endif 1335#endif
1327 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
1328 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1351 code + button_number + key_state,
1330 (32 + x + 1), 1352 32 + x,
1331 (32 + y + 1)); 1353 32 + y);
1332} 1354}
1333 1355
1334/*{{{ process an X event */ 1356/*{{{ process an X event */
1335void 1357void ecb_hot
1336rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1337{ 1359{
1338 make_current (); 1360 make_current ();
1339 1361
1340 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1438 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1461 focus_out ();
1440 break; 1462 break;
1441 1463
1442 case ConfigureNotify: 1464 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1447 { 1466 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 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 moved = true;
1497 }
1498
1499 if (!(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 }
1450 1502
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1504 {
1453 seen_resize = 1; 1505 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1507 }
1456 else 1508 else
1457 { 1509 {
1458#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped) 1511 if (moved)
1462 update_background (); 1512 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif 1513#endif
1467 } 1514 }
1468 1515
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1517 }
1471 break; 1518 break;
1472 1519
1473 case PropertyNotify: 1520 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1522 break;
1480 1523
1481 case SelectionClear: 1524 case SelectionClear:
1482 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1526 break;
1489 1527
1490 case SelectionRequest: 1528 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1492 break; 1530 break;
1493 1531
1494 case MapNotify: 1532 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1534 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1535 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1538 * reparenting.
1501 * We should not render background immidiately, as there could be several 1539 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1541 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1542 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1543 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1544 * of ConfigureNotifys for the best results.
1507 */ 1545 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1546 if (!(bg_flags & BG_IS_VALID))
1509 update_background_ev.start (0.025); 1547 update_background_ev.start (0.025);
1510#endif 1548#endif
1511 mapped = 1; 1549 mapped = 1;
1512#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1551 text_blink_ev.start ();
… …
1528 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1529 { 1567 {
1530 do 1568 do
1531 { 1569 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1572 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1574
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1576
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1578 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1581 }
1544 1582
1545 want_refresh = 1; 1583 want_refresh = 1;
1546 } 1584 }
1547 else 1585 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1592 ;
1555 1593
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1595 {
1558 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1559 scrollbar_show (0); 1597 scrollBar.show (0);
1560 } 1598 }
1561 } 1599 }
1562 break; 1600 break;
1563 1601
1564 case MotionNotify: 1602 case MotionNotify:
… …
1629 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1630 } 1668 }
1631 else 1669 else
1632 { 1670 {
1633 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1634 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1635 } 1673 }
1636 1674
1637 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1638 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1; 1677 + 1;
… …
1651#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1652 } 1690 }
1653#endif 1691#endif
1654 } 1692 }
1655 } 1693 }
1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1695 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1660 ; 1698 ;
1661 1699
1662 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1704 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1706 scrollBar.size ());
1669 want_refresh = 1; 1707 want_refresh = 1;
1670 scrollbar_show (1); 1708 scrollBar.show (1);
1671 } 1709 }
1672 break; 1710 break;
1673 } 1711 }
1674 1712
1675#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1685 }
1686#endif 1716#endif
1687 1717
1688#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1720 {
… …
1700#endif 1730#endif
1701 1731
1702 refresh_check (); 1732 refresh_check ();
1703} 1733}
1704 1734
1705void 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
1706rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1707{ 1754{
1708 if (!focus) 1755 if (!focus)
1709 { 1756 {
1710 focus = 1; 1757 focus = 1;
1711 want_refresh = 1; 1758 want_refresh = 1;
1712 1759
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM 1760#if USE_XIM
1716 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1717 { 1762 {
1718 IMSetPosition (); 1763 im_set_position ();
1719 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1720 } 1765 }
1721#endif 1766#endif
1722#if CURSOR_BLINK 1767#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1730 scr_recolour (); 1775 scr_recolour ();
1731 } 1776 }
1732#endif 1777#endif
1733#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1735 { 1780 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1781#endif
1743 }
1744}
1745 1782
1746void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1747rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1748{ 1789{
1749 if (focus) 1790 if (focus)
1750 { 1791 {
1751 focus = 0; 1792 focus = 0;
1752 want_refresh = 1; 1793 want_refresh = 1;
1753 1794
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1755 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1756#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1800 if (iso14755buf)
1758 { 1801 {
1759 iso14755buf = 0; 1802 iso14755buf = 0;
1760# if ISO_14755 1803# if ISO_14755
… …
1777 { 1820 {
1778 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1822 scr_recolour ();
1780 } 1823 }
1781#endif 1824#endif
1782 }
1783}
1784 1825
1785void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1787{ 1832{
1788#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1790 { 1835 {
… …
1794 } 1839 }
1795#endif 1840#endif
1796} 1841}
1797 1842
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1799void 1844void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1846{
1802 make_current (); 1847 make_current ();
1803 1848
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return; 1851 return;
1807 1852
1808# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1853 switch (ev.type)
1810 { 1854 {
1811 case PropertyNotify: 1855 case PropertyNotify:
1812 /* 1856 /*
1813 * 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,
1814 * 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.
1815 */ 1859 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1862 {
1863# if ENABLE_TRANSPARENCY
1819 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1820 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1821 } 1870 }
1822 1871
1823 break; 1872 break;
1824 } 1873 }
1825# endif
1826 1874
1827 refresh_check (); 1875 refresh_check ();
1828} 1876}
1829#endif 1877#endif
1830 1878
… …
1863 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1867 { 1915 {
1868 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1869 MEvent.clicks++; 1917 MEvent.clicks++;
1870 1918
1871 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1872 { 1920 {
1873 /* only report double clicks */ 1921 /* only report double clicks */
… …
1947 /* 1995 /*
1948 * Scrollbar window processing of button press 1996 * Scrollbar window processing of button press
1949 */ 1997 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1998 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1999 {
1952 int upordown = 0; 2000 page_dirn direction = NO_DIR;
1953 2001
1954 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */ 2003 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */ 2005 direction = DN; /* down */
1958 2006
1959 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1960 /* 2008 /*
1961 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1962 * move up if mouse is above slider 2010 * move up if mouse is above slider
1963 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1964 * 2012 *
… …
1973 /* 2021 /*
1974 * Mouse report disabled scrollbar: 2022 * Mouse report disabled scrollbar:
1975 * arrow buttons - send up/down 2023 * arrow buttons - send up/down
1976 * click on scrollbar - send pageup/down 2024 * click on scrollbar - send pageup/down
1977 */ 2025 */
1978 if (upordown < 0) 2026 if (direction == UP)
1979 tt_printf ("\033[A"); 2027 tt_printf ("\033[A");
1980 else if (upordown > 0) 2028 else if (direction == DN)
1981 tt_printf ("\033[B"); 2029 tt_printf ("\033[B");
1982 else 2030 else
1983 switch (ev.button) 2031 switch (ev.button)
1984 { 2032 {
1985 case Button2: 2033 case Button2:
… …
1993 break; 2041 break;
1994 } 2042 }
1995 } 2043 }
1996 else 2044 else
1997#endif /* NO_SCROLLBAR_REPORT */ 2045#endif /* NO_SCROLLBAR_REPORT */
1998
1999 { 2046 {
2000 if (upordown) 2047 if (direction != NO_DIR)
2001 { 2048 {
2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2049#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ()) 2050 if (!cont_scroll_ev.is_active ())
2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005#endif 2052#endif
2006 if (scr_page (upordown < 0 ? UP : DN, 1)) 2053 if (scr_page (direction, 1))
2007 { 2054 {
2008 if (upordown < 0) 2055 if (direction == UP)
2009 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2010 else 2057 else
2011 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2012 } 2059 }
2013 } 2060 }
2014 else 2061 else
2015 switch (ev.button) 2062 switch (ev.button)
2016 { 2063 {
2017 case Button2: 2064 case Button2:
2018 switch (scrollBar.align) 2065 switch (scrollBar.align)
2019 { 2066 {
2020 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2021 csrO = 0; 2068 csrO = 0;
2022 break; 2069 break;
2023 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2024 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2025 break; 2072 break;
2026 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2027 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2028 break; 2075 break;
2029 } 2076 }
2030 2077
2031 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2032 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2033 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2035 2082
2036 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2037 break; 2084 break;
2038 2085
2039 case Button1: 2086 case Button1:
2040 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2041 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2042 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2043 2090
2044 case Button3: 2091 case Button3:
2045 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2046 { 2093 {
2047 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2049 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2050# else 2097# else
2051 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2052# endif 2099# endif
2053 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2054# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2055 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2056# else 2103# else
2057 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2058# endif 2105# endif
2059 else 2106 else
2060 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2061 } 2108 }
2062 else 2109 else
2063 { 2110 {
2064 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2065 (nrow 2112 (nrow
2066 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2067 / scrollbar_size ())); 2114 / scrollBar.size ()));
2068 } 2115 }
2069 2116
2070 break; 2117 break;
2071 } 2118 }
2072 } 2119 }
… …
2082 2129
2083 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2084 if (!bypass_keystate) 2131 if (!bypass_keystate)
2085 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2086 2133
2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2088 { 2135 {
2089 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2090 scrollbar_show (0); 2137 scrollBar.show (0);
2091 } 2138 }
2092 2139
2093#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2094 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2095#endif 2142#endif
… …
2144 case Button3: 2191 case Button3:
2145 selection_make (ev.time); 2192 selection_make (ev.time);
2146 break; 2193 break;
2147 2194
2148 case Button2: 2195 case Button2:
2149 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?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2198 break;
2152 2199
2153#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2154 case Button4: 2201 case Button4:
2155 case Button5: 2202 case Button5:
… …
2178 } 2225 }
2179 else 2226 else
2180# endif 2227# endif
2181 { 2228 {
2182 scr_page (v, i); 2229 scr_page (v, i);
2183 scrollbar_show (1); 2230 scrollBar.show (1);
2184 } 2231 }
2185 } 2232 }
2186 break; 2233 break;
2187#endif 2234#endif
2188 } 2235 }
2189 } 2236 }
2190} 2237}
2191 2238
2192/*}}} */ 2239/*}}} */
2193 2240
2194bool 2241void ecb_hot
2195rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2196{ 2243{
2197 bool flag = false;
2198 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2199 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2200 2246
2201 for (;;) 2247 for (;;)
2202 { 2248 {
2203 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2204 { 2250 {
2205 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2206 ch = next_char (); 2252 ch = next_char ();
2207 2253
2208 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2209 break; 2255 break;
2210 } 2256 }
2211 2257
2212 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))
2213 { 2259 {
2214 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2215 { 2261 {
2216 seen_input = 1; 2262 seen_input = 1;
2217 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2218 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2219 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2232 wchar_t *str = buf; 2278 wchar_t *str = buf;
2233 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2234 2280
2235 for (;;) 2281 for (;;)
2236 { 2282 {
2237 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)))
2238 break; 2284 break;
2239 2285
2240 *str++ = ch; 2286 *str++ = ch;
2241 2287
2242 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2243 { 2289 {
2244 if (ch == C0_LF) 2290 if (ch == C0_LF)
2245 nlines++; 2291 nlines++;
2246 2292
2247 refresh_count++; 2293 refresh_count++;
… …
2296 * 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.
2297 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2298 */ 2344 */
2299 if (refreshnow) 2345 if (refreshnow)
2300 { 2346 {
2301 flag = true;
2302 scr_refresh (); 2347 scr_refresh ();
2303 want_refresh = 1; 2348 want_refresh = 1;
2304 } 2349 }
2305
2306 } 2350 }
2307 else 2351 else
2308 { 2352 {
2309 try 2353 try
2310 { 2354 {
… …
2318 } 2362 }
2319 2363
2320 ch = NOCHAR; 2364 ch = NOCHAR;
2321 } 2365 }
2322 } 2366 }
2323
2324 return flag;
2325} 2367}
2326 2368
2327// read the next character 2369// read the next character
2328wchar_t 2370wchar_t ecb_hot
2329rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2330{ 2372{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2374 {
2333 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2334 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2336 2378
2337 wchar_t wc; 2379 wchar_t wc;
2338 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);
2339 2381
… …
2343 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2344 break; 2386 break;
2345 } 2387 }
2346 2388
2347 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2348 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 }
2349 2394
2350 // assume wchar == unicode 2395 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2352 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2353 } 2398 }
2354 2399
2355 return NOCHAR; 2400 return NOCHAR;
2356} 2401}
2357 2402
2358// read the next octet 2403// read the next octet
2359uint32_t 2404uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () NOTHROW
2361{ 2406{
2362 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2409 : NOCHAR;
2365} 2410}
2366 2411
2367static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2368 2413
2369/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2416{
2377 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2378 2418
2379 if (c == NOCHAR) 2419 if (c == NOCHAR)
2380 throw out_of_input; 2420 throw out_of_input;
2381 2421
2382 return c; 2422 return c;
2383} 2423}
2384 2424
2385uint32_t 2425uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2427{
2388 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2389 2429
2390 if (c == NOCHAR) 2430 if (c == NOCHAR)
… …
2394} 2434}
2395 2435
2396/*{{{ print pipe */ 2436/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2399FILE * 2439FILE * ecb_cold
2400rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2401{ 2441{
2402 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2443
2404 if (stream == NULL) 2444 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2446
2407 return stream; 2447 return stream;
2408} 2448}
2409 2449
2410int 2450int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2412{ 2452{
2413 fflush (stream); 2453 fflush (stream);
2414 return pclose (stream); 2454 return pclose (stream);
2415} 2455}
2416 2456
2417/* 2457/*
2418 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2419 */ 2459 */
2420void 2460void ecb_cold
2421rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2422{ 2462{
2423 int done; 2463 FILE *fd = popen_printer ();
2424 FILE *fd;
2425 2464
2426 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2427 return; 2466 return;
2428 2467
2429 /* 2468 /*
2430 * 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
2431 * is received. 2470 * is received.
2432 */ 2471 */
2433 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2434 { 2473 {
2435 unsigned char buf[8]; 2474 unsigned char buf[8];
2436 unicode_t ch; 2475 unicode_t ch;
2437 unsigned int i, len; 2476 unsigned int i, len;
2438 2477
… …
2472 pclose_printer (fd); 2511 pclose_printer (fd);
2473} 2512}
2474#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2475/*}}} */ 2514/*}}} */
2476 2515
2477/* *INDENT-OFF* */
2478enum { 2516enum {
2479 C1_40 = 0x40, 2517 C1_40 = 0x40,
2480 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,
2481 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,
2482 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,
2483 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,
2484}; 2522};
2485/* *INDENT-ON* */
2486 2523
2487/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2488void 2525void ecb_hot
2489rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2527{
2491 switch (ch) 2528 switch (ch)
2492 { 2529 {
2493 case C0_ESC: 2530 case C0_ESC:
… …
2539} 2576}
2540/*}}} */ 2577/*}}} */
2541 2578
2542 2579
2543/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2544void 2581void ecb_cold
2545rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2546{ 2583{
2547 int row, col; 2584 int row, col;
2548 2585
2549 switch (ch) 2586 switch (ch)
… …
2583 break; 2620 break;
2584 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2623 break;
2587 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2588 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2589 break; 2626 break;
2590 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2592 /* unimplemented */ 2629 /* unimplemented */
2593 break; 2630 break;
… …
2599} 2636}
2600/*}}} */ 2637/*}}} */
2601 2638
2602 2639
2603/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2604void 2641void ecb_hot
2605rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2606{ 2643{
2607 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2608 2645
2609 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2612 return; 2649 return;
2613 } 2650 }
2614 2651
2615 switch (ch) 2652 switch (ch)
2616 { 2653 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2654 case '#':
2619 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2620 scr_E (); 2656 scr_E ();
2621 break; 2657 break;
2622 case '(': 2658 case '(':
… …
2645#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2646 case '9': 2682 case '9':
2647 scr_forwardindex (); 2683 scr_forwardindex ();
2648 break; 2684 break;
2649#endif 2685#endif
2686 // DECPAM/DECPNM
2650 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2651 case '>': 2690 case '>':
2652 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
2653 break; 2692 break;
2654 2693
2655 case C1_40: 2694 case C1_40:
2656 cmd_getc (); 2695 cmd_getc ();
2657 break; 2696 break;
… …
2661 2700
2662 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2664 { 2703 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2706 }
2668 break; 2707 break;
2669 2708
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2709 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2710 case C1_ESA: /* ESC G */
2672 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 */
2673 break; 2714 break;
2674 2715
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2718 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2682 scr_index (DN); 2723 scr_index (DN);
2683 break; 2724 break;
2684 2725
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2687 2728
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2690 2731
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2734 process_dcs_seq ();
2694 break; 2735 break;
… …
2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2697 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2699 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2700 2741
2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2702 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2703 process_csi_seq (); 2744 process_csi_seq ();
2704 break; 2745 break;
2705 2746
2706 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2707 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
2708 process_osc_seq (); 2749 process_osc_seq ();
2709 break; 2750 break;
2710 2751
2711 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2712 case 'c': 2753 case 'c':
2713 mbstate.reset (); 2754 mbstate.reset ();
2714 scr_poweron (); 2755 scr_poweron ();
2715 scrollbar_show (1); 2756 scrollBar.show (1);
2716 break; 2757 break;
2717 2758
2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2719 case 'n': 2760 case 'n':
2720 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
2727 } 2768 }
2728} 2769}
2729/*}}} */ 2770/*}}} */
2730 2771
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2773enum {
2734 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
2735 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,
2736 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 ,
2737 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,
… …
2740 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,
2741 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 ,
2742 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
2743}; 2783};
2744 2784
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2790
2751const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
2752 { 2792 {
2753 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, */
2754 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, */
2755 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, */
2756 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, [, \, ], ^, _, */
2757 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, */
2758 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, */
2759 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, */
2760 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, {, |, }, ~, */
2761 }; 2801 };
2762/* *INDENT-ON* */
2763 2802
2764void 2803void ecb_hot
2765rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2766{ 2805{
2767 unicode_t ch, priv, i; 2806 unicode_t ch, priv, i;
2768 unsigned int nargs, p; 2807 unsigned int nargs, p;
2769 int n, ndef; 2808 int n, ndef;
… …
2771 2810
2772 nargs = 0; 2811 nargs = 0;
2773 2812
2774 priv = 0; 2813 priv = 0;
2775 ch = cmd_getc (); 2814 ch = cmd_getc ();
2776 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 { 2816 {
2778 /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2818 priv = ch;
2780 ch = cmd_getc (); 2819 ch = cmd_getc ();
2781 } 2820 }
2782 2821
2783 /* read any numerical arguments */ 2822 /* read any numerical arguments */
… …
2837 2876
2838 case '?': 2877 case '?':
2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2840 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2841 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);
2842 } 2893 }
2894 break;
2895 }
2896
2843 return; 2897 return;
2844 } 2898 }
2845 2899
2846 switch (ch) 2900 switch (ch)
2847 { 2901 {
… …
2861 } 2915 }
2862 break; 2916 break;
2863#endif 2917#endif
2864 2918
2865 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2866 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2867 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2868 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2869 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2870 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2871 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2872 break; 2926 break;
2873 2927
2874 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2875 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3062 } 3116 }
3063} 3117}
3064/*}}} */ 3118/*}}} */
3065 3119
3066#if !ENABLE_MINIMAL 3120#if !ENABLE_MINIMAL
3067/* ARGSUSED */
3068void 3121void
3069rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3122rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3070{ 3123{
3071 int x, y; 3124 int x, y;
3072 XWindowAttributes wattr; 3125 XWindowAttributes wattr;
… …
3081 { 3134 {
3082 /* 3135 /*
3083 * commands 3136 * commands
3084 */ 3137 */
3085 case 1: /* deiconify window */ 3138 case 1: /* deiconify window */
3086 XMapWindow (dpy, parent[0]); 3139 XMapWindow (dpy, parent);
3087 break; 3140 break;
3088 case 2: /* iconify window */ 3141 case 2: /* iconify window */
3089 XIconifyWindow (dpy, parent[0], display->screen); 3142 XIconifyWindow (dpy, parent, display->screen);
3090 break; 3143 break;
3091 case 3: /* set position (pixels) */ 3144 case 3: /* set position (pixels) */
3092 XMoveWindow (dpy, parent[0], args[1], args[2]); 3145 XMoveWindow (dpy, parent, args[1], args[2]);
3093 break; 3146 break;
3094 case 4: /* set size (pixels) */ 3147 case 4: /* set size (pixels) */
3095 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3148 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3096 break; 3149 break;
3097 case 5: /* raise window */ 3150 case 5: /* raise window */
3098 XRaiseWindow (dpy, parent[0]); 3151 XRaiseWindow (dpy, parent);
3099 break; 3152 break;
3100 case 6: /* lower window */ 3153 case 6: /* lower window */
3101 XLowerWindow (dpy, parent[0]); 3154 XLowerWindow (dpy, parent);
3102 break; 3155 break;
3103 case 7: /* refresh window */ 3156 case 7: /* refresh window */
3104 scr_touch (true); 3157 scr_touch (true);
3105 break; 3158 break;
3106 case 8: /* set size (chars) */ 3159 case 8: /* set size (chars) */
… …
3109 break; 3162 break;
3110 3163
3111 //case 9: NYI, TODO, restore maximized window or maximize window 3164 //case 9: NYI, TODO, restore maximized window or maximize window
3112 default: 3165 default:
3113 if (args[0] >= 24) /* set height (chars) */ 3166 if (args[0] >= 24) /* set height (chars) */
3114 set_widthheight ((unsigned int)width, 3167 set_widthheight ((unsigned int)vt_width,
3115 (unsigned int) (args[1] * fheight)); 3168 (unsigned int) (args[1] * fheight));
3116 break; 3169 break;
3117 3170
3118 /* 3171 /*
3119 * reports - some output format copied from XTerm 3172 * reports - some output format copied from XTerm
3120 */ 3173 */
3121 case 11: /* report window state */ 3174 case 11: /* report window state */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3123 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3176 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3124 break; 3177 break;
3125 case 13: /* report window position */ 3178 case 13: /* report window position */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3127 XTranslateCoordinates (dpy, parent[0], wattr.root, 3180 XTranslateCoordinates (dpy, parent, wattr.root,
3128 -wattr.border_width, -wattr.border_width, 3181 -wattr.border_width, -wattr.border_width,
3129 &x, &y, &wdummy); 3182 &x, &y, &wdummy);
3130 tt_printf ("\033[3;%d;%dt", x, y); 3183 tt_printf ("\033[3;%d;%dt", x, y);
3131 break; 3184 break;
3132 case 14: /* report window size (pixels) */ 3185 case 14: /* report window size (pixels) */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3186 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3187 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3135 break; 3188 break;
3136 case 18: /* report text area size (chars) */ 3189 case 18: /* report text area size (chars) */
3137 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3138 break; 3191 break;
… …
3140 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3193 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3141 break; 3194 break;
3142 case 20: /* report icon label */ 3195 case 20: /* report icon label */
3143 { 3196 {
3144 char *s; 3197 char *s;
3145 XGetIconName (dpy, parent[0], &s); 3198 XGetIconName (dpy, parent, &s);
3146 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 */
3147 XFree (s); 3200 XFree (s);
3148 } 3201 }
3149 break; 3202 break;
3150 case 21: /* report window title */ 3203 case 21: /* report window title */
3151 { 3204 {
3152 char *s; 3205 char *s;
3153 XFetchName (dpy, parent[0], &s); 3206 XFetchName (dpy, parent, &s);
3154 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 */
3155 XFree (s); 3208 XFree (s);
3156 } 3209 }
3157 break; 3210 break;
3158 } 3211 }
… …
3214 * 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)'
3215 */ 3268 */
3216void 3269void
3217rxvt_term::process_dcs_seq () 3270rxvt_term::process_dcs_seq ()
3218{ 3271{
3219 char *s;
3220 unicode_t eh;
3221
3222 /* 3272 /*
3223 * Not handled yet 3273 * Not handled yet
3224 */ 3274 */
3275
3276 unicode_t eh;
3225 s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3226 if (s) 3278 if (s)
3227 free (s); 3279 free (s);
3228 3280
3229 return; 3281 return;
3230} 3282}
… …
3234 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3286 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3235 */ 3287 */
3236void 3288void
3237rxvt_term::process_osc_seq () 3289rxvt_term::process_osc_seq ()
3238{ 3290{
3239 unicode_t ch, eh;
3240 int arg; 3291 int arg;
3241 3292
3242 ch = cmd_getc (); 3293 unicode_t ch = cmd_getc ();
3243 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3294 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3244 arg = arg * 10 + (ch - '0'); 3295 arg = arg * 10 + (ch - '0');
3245 3296
3246 if (ch == ';') 3297 if (ch == ';')
3247 { 3298 {
3299 unicode_t eh;
3248 char *s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3249 3301
3250 if (s) 3302 if (s)
3251 { 3303 {
3252 process_xterm_seq (arg, s, eh); 3304 process_xterm_seq (arg, s, eh);
… …
3276 3328
3277/* 3329/*
3278 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3330 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3279 */ 3331 */
3280void 3332void
3281rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3333rxvt_term::process_xterm_seq (int op, char *str, char resp)
3282{ 3334{
3283 int color; 3335 int color;
3284 char *buf, *name; 3336 char *buf, *name;
3285 bool query = str[0] == '?' && !str[1]; 3337 bool query = str[0] == '?' && !str[1];
3286 int saveop = op; 3338 int saveop = op;
… …
3313 unsigned long bytes_after; 3365 unsigned long bytes_after;
3314 unsigned char *value = 0; 3366 unsigned char *value = 0;
3315 const char *str = ""; 3367 const char *str = "";
3316 3368
3317 if (prop 3369 if (prop
3318 && XGetWindowProperty (dpy, parent[0], 3370 && XGetWindowProperty (dpy, parent,
3319 prop, 0, 1<<16, 0, AnyPropertyType, 3371 prop, 0, 1<<16, 0, AnyPropertyType,
3320 &actual_type, &actual_format, 3372 &actual_type, &actual_format,
3321 &nitems, &bytes_after, &value) == Success 3373 &nitems, &bytes_after, &value) == Success
3322 && actual_type != None 3374 && actual_type != None
3323 && actual_format == 8) 3375 && actual_format == 8)
… …
3327 3379
3328 XFree (value); 3380 XFree (value);
3329 } 3381 }
3330 else 3382 else
3331 { 3383 {
3332 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3384 char *eq = strchr (str, '=');
3333 3385
3334 if (eq) 3386 if (eq)
3335 { 3387 {
3336 *eq = 0; 3388 *eq = 0;
3337 set_utf8_property (display->atom (str), eq + 1); 3389 set_utf8_property (display->atom (str), eq + 1);
3338 } 3390 }
3339 else 3391 else
3340 XDeleteProperty (dpy, parent[0], 3392 XDeleteProperty (dpy, parent,
3341 display->atom (str)); 3393 display->atom (str));
3342 } 3394 }
3343 break; 3395 break;
3344 3396
3345 case XTerm_Color: 3397 case XTerm_Color:
… …
3377 process_color_seq (op, Color_pointer_fg, str, resp); 3429 process_color_seq (op, Color_pointer_fg, str, resp);
3378 break; 3430 break;
3379 case XTerm_Color_pointer_bg: 3431 case XTerm_Color_pointer_bg:
3380 process_color_seq (op, Color_pointer_bg, str, resp); 3432 process_color_seq (op, Color_pointer_bg, str, resp);
3381 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
3382#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3383 case XTerm_Color_RV:
3384 process_color_seq (op, Color_RV, str, resp);
3385 break;
3386 case Rxvt_Color_BD:
3387 case URxvt_Color_BD: 3443 case URxvt_Color_BD:
3388 process_color_seq (op, Color_BD, str, resp); 3444 process_color_seq (op, Color_BD, str, resp);
3389 break; 3445 break;
3390 case Rxvt_Color_UL:
3391 case URxvt_Color_UL: 3446 case URxvt_Color_UL:
3392 process_color_seq (op, Color_UL, str, resp); 3447 process_color_seq (op, Color_UL, str, resp);
3393 break; 3448 break;
3394 case URxvt_Color_IT: 3449 case URxvt_Color_IT:
3395 process_color_seq (op, Color_IT, str, resp); 3450 process_color_seq (op, Color_IT, str, resp);
3396 break; 3451 break;
3397#endif 3452#endif
3453 case URxvt_Color_border:
3454 process_color_seq (op, Color_border, str, resp);
3455 break;
3398#if ENABLE_TRANSPARENCY 3456#if ENABLE_TRANSPARENCY
3399 case URxvt_Color_tint: 3457 case URxvt_Color_tint:
3400 process_color_seq (op, Color_tint, str, resp); 3458 process_color_seq (op, Color_tint, str, resp);
3401 { 3459 {
3402 bool changed = false; 3460 bool changed = false;
3403 3461
3404 if (ISSET_PIXCOLOR (Color_tint)) 3462 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3463 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3408 3464
3409 if (changed) 3465 if (changed)
3410 update_background (); 3466 update_background ();
3411 } 3467 }
3412 3468
… …
3416#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3417 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3418 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3419 { 3475 {
3420 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;
3421 3481
3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3482 sprintf (str, "[%dx%d+%d+%d]",
3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3483 h_scale, v_scale,
3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3484 h_align, v_align);
3425 process_xterm_seq (XTerm_title, str, CHAR_ST); 3485 process_xterm_seq (XTerm_title, str, CHAR_ST);
3426 } 3486 }
3427 else 3487 else
3428 { 3488 {
3429 int changed = 0; 3489 bool changed = false;
3430 3490
3431 if (*str != ';') 3491 if (*str != ';')
3432 { 3492 {
3433 /* reset to default scaling :*/ 3493 try
3434 bgPixmap.unset_geometry (); 3494 {
3435 if (bgPixmap.set_file (str)) /* change pixmap */ 3495 fimage.set_file_geometry (this, str);
3436 changed++; 3496 changed = true;
3437 str = strchr (str, ';'); 3497 }
3438 if (str == NULL) 3498 catch (const class rxvt_failure_exception &e)
3439 bgPixmap.set_defaultGeometry (); 3499 {
3500 }
3440 } 3501 }
3441 3502 else
3442 while (str)
3443 { 3503 {
3444 str++; 3504 str++;
3445 if (bgPixmap.set_geometry (str)) 3505 if (fimage.set_geometry (str, true))
3446 changed++; 3506 changed = true;
3447 str = strchr (str, ';');
3448 } 3507 }
3449 3508
3450 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 parent_x = x;
3516 parent_y = y;
3517 }
3451 update_background (); 3518 update_background ();
3519 }
3452 } 3520 }
3453 break; 3521 break;
3454#endif 3522#endif
3455 3523
3456 case XTerm_logfile: 3524 case XTerm_logfile:
… …
3526 break; 3594 break;
3527#endif 3595#endif
3528 3596
3529#if ENABLE_PERL 3597#if ENABLE_PERL
3530 case URxvt_perl: 3598 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3599 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3600 break;
3534#endif 3601#endif
3535 } 3602 }
3536} 3603}
3537/*----------------------------------------------------------------------*/ 3604/*----------------------------------------------------------------------*/
… …
3544 * 's' = save 3611 * 's' = save
3545 * 'r' = restore 3612 * 'r' = restore
3546 * 't' = toggle 3613 * 't' = toggle
3547 * so no need for fancy checking 3614 * so no need for fancy checking
3548 */ 3615 */
3549int 3616int ecb_cold
3550rxvt_term::privcases (int mode, unsigned long bit) 3617rxvt_term::privcases (int mode, unsigned long bit)
3551{ 3618{
3552 int state; 3619 int state;
3553 3620
3554 if (mode == 's') 3621 if (mode == 's')
3555 { 3622 {
3556 SavedModes |= (priv_modes & bit); 3623 if (priv_modes & bit)
3624 SavedModes |= bit;
3625 else
3626 SavedModes &= ~bit;
3557 return -1; 3627 return -1;
3558 } 3628 }
3559 else 3629 else
3560 { 3630 {
3561 if (mode == 'r') 3631 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3632 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3633 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3634 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3635
3636 if (state)
3637 priv_modes |= bit;
3638 else
3639 priv_modes &= ~bit;
3566 } 3640 }
3567 3641
3568 return state; 3642 return state;
3569} 3643}
3570 3644
3571/* we're not using priv _yet_ */ 3645/* we're not using priv _yet_ */
3572void 3646void
3573rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3647rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3574{ 3648{
3575 unsigned int i, j; 3649 unsigned int i, j;
3576 int state; 3650 int state;
3577 3651
3578 static const struct 3652 static const struct
3579 { 3653 {
3580 const int argval; 3654 const int argval;
3581 const unsigned long bit; 3655 const unsigned long bit;
3582 } argtopriv[] = { 3656 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3657 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3658 { 2, PrivMode_vt52 }, // DECANM
3585 { 3, PrivMode_132 }, 3659 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3660 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3661 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3662 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3663 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3664 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3665 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3666 // 18 end FF to printer after print screen
3667 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3668 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3669#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3670 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3671#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3672 { 35, PrivMode_ShiftKeys }, // rxvt extension
3673 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3674 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3675 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3676 // 45 margin bell NYI
3601 // 46 start logging 3677 // 46 start logging
3602 { 47, PrivMode_Screen }, 3678 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3679 { 66, PrivMode_aplKP }, // DECNKM
3604#ifndef NO_BACKSPACE_KEY 3680#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3681 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3682#endif
3607 { 1000, PrivMode_MouseX11 }, 3683 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3684 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3685 { 1003, PrivMode_MouseAnyEvent },
3686#if ENABLE_FRILLS
3687 { 1005, PrivMode_ExtModeMouse },
3688#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3689 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3690 { 1011, PrivMode_Keypress }, // rxvt extension
3691#if ENABLE_FRILLS
3692 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3693#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3694 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3695 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3696 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3697 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3698 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3699 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3700 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste }, 3701 { 2004, PrivMode_BracketPaste },
3620 }; 3702 };
3621 3703
… …
3631 for (i = 0; i < nargs; i++) 3713 for (i = 0; i < nargs; i++)
3632 { 3714 {
3633 state = -1; 3715 state = -1;
3634 3716
3635 /* basic handling */ 3717 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3718 for (j = 0; j < ecb_array_length (argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3719 if (argtopriv[j].argval == arg[i])
3638 { 3720 {
3639 state = privcases (mode, argtopriv[j].bit); 3721 state = privcases (mode, argtopriv[j].bit);
3640 break; 3722 break;
3641 } 3723 }
… …
3649 3731
3650 scr_touch (true); 3732 scr_touch (true);
3651 break; 3733 break;
3652#endif 3734#endif
3653 case 1048: /* alternative cursor save */ 3735 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3736 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3737 if (mode == 0)
3657 scr_cursor (RESTORE); 3738 scr_cursor (RESTORE);
3658 else if (mode == 1) 3739 else if (mode == 1)
3659 scr_cursor (SAVE); 3740 scr_cursor (SAVE);
… …
3668 case 2: /* VT52 mode */ 3749 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3750 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3751 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3752 * within VT52 mode
3672 */ 3753 */
3673 PrivMode (1, PrivMode_vt52); 3754 priv_modes |= PrivMode_vt52;
3674 break; 3755 break;
3675 case 3: /* 80/132 */ 3756 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3757 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3758 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3680 }
3681 break; 3759 break;
3682 case 4: /* smooth scrolling */ 3760 case 4: /* smooth scrolling */
3683 set_option (Opt_jumpScroll, !state); 3761 set_option (Opt_jumpScroll, !state);
3684 break; 3762 break;
3685 case 5: /* reverse video */ 3763 case 5: /* reverse video */
… …
3696 if (state) /* orthogonal */ 3774 if (state) /* orthogonal */
3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3775 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3698 break; 3776 break;
3699#ifdef scrollBar_esc 3777#ifdef scrollBar_esc
3700 case scrollBar_esc: 3778 case scrollBar_esc:
3701 if (scrollbar_mapping (state)) 3779 scrollBar.map (state);
3702 {
3703 resize_all_windows (0, 0, 0); 3780 resize_all_windows (0, 0, 0);
3704 scr_touch (true); 3781 scr_touch (true);
3705 }
3706 break; 3782 break;
3707#endif 3783#endif
3708 case 25: /* visible/invisible cursor */ 3784 case 25: /* visible/invisible cursor */
3709 scr_cursor_visible (state); 3785 scr_cursor_visible (state);
3710 break; 3786 break;
… …
3723 case 1003: 3799 case 1003:
3724 if (state) 3800 if (state)
3725 { 3801 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3802 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3803 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3804 mouse_row = mouse_col = 0;
3728 vt_emask_mouse = PointerMotionMask; 3805 vt_emask_mouse = PointerMotionMask;
3729 } 3806 }
3730 else 3807 else
3731 vt_emask_mouse = NoEventMask; 3808 vt_emask_mouse = NoEventMask;
3809
3732 vt_select_input (); 3810 vt_select_input ();
3733 break; 3811 break;
3734 case 1010: /* scroll to bottom on TTY output inhibit */ 3812 case 1010: /* scroll to bottom on TTY output inhibit */
3735 set_option (Opt_scrollTtyOutput, !state); 3813 set_option (Opt_scrollTtyOutput, !state);
3736 break; 3814 break;
3737 case 1011: /* scroll to bottom on key press */ 3815 case 1011: /* scroll to bottom on key press */
3738 set_option (Opt_scrollTtyKeypress, state); 3816 set_option (Opt_scrollTtyKeypress, state);
3739 break; 3817 break;
3740 case 1047: /* secondary screen w/ clearing last */ 3818 case 1047: /* secondary screen w/ clearing last */
3741 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
3742 if (current_screen != PRIMARY) 3820 if (!state)
3743 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822
3744 scr_change_screen (state); 3823 scr_change_screen (state);
3745 break; 3824 break;
3746 case 1049: /* secondary screen w/ clearing first */ 3825 case 1049: /* secondary screen w/ clearing first */
3826 if (option (Opt_secondaryScreen))
3827 if (state)
3828 scr_cursor (SAVE);
3829
3747 scr_change_screen (state); 3830 scr_change_screen (state);
3831
3748 if (option (Opt_secondaryScreen)) 3832 if (option (Opt_secondaryScreen))
3749 if (current_screen != PRIMARY) 3833 if (state)
3750 scr_erase_screen (2); 3834 scr_erase_screen (2);
3835 else
3836 scr_cursor (RESTORE);
3751 break; 3837 break;
3752 default: 3838 default:
3753 break; 3839 break;
3754 } 3840 }
3755 } 3841 }
3756} 3842}
3757/*}}} */ 3843/*}}} */
3758 3844
3759/*{{{ process sgr sequences */ 3845/*{{{ process sgr sequences */
3760void 3846void ecb_hot
3761rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3847rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3762{ 3848{
3763 unsigned int i; 3849 unsigned int i;
3764 short rendset; 3850 short rendset;
3765 int rendstyle; 3851 int rendstyle;
… …
3908 } 3994 }
3909 } 3995 }
3910} 3996}
3911/*}}} */ 3997/*}}} */
3912 3998
3913/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3914void
3915rxvt_term::process_graphics ()
3916{
3917 unicode_t ch, cmd = cmd_getc ();
3918
3919 if (cmd == 'Q')
3920 {
3921 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 3999/* ------------------------------------------------------------------------- */
3933 4000
3934/* 4001/*
3935 * Send printf () formatted output to the command. 4002 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 4003 * Only use for small amounts of data.
… …
3949 4016
3950/* ---------------------------------------------------------------------- */ 4017/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 4018/* Write data to the pty as typed by the user, pasted with the mouse,
3952 * or generated by us in response to a query ESC sequence. 4019 * or generated by us in response to a query ESC sequence.
3953 */ 4020 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4021static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4022
3956void 4023void
3957rxvt_term::tt_write (const char *data, unsigned int len) 4024rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 4025{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4026 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3964 4031
3965 if (v_buflen == 0) 4032 if (v_buflen == 0)
3966 { 4033 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4034 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 4035
4036 max_it (written, 0);
4037
3969 if ((unsigned int)written == len) 4038 if (written == len)
3970 return; 4039 return;
3971 4040
3972 data += written; 4041 data += written;
3973 len -= written; 4042 len -= written;
3974 } 4043 }
3975 4044
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4045 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4046
3978 memcpy (v_buffer + v_buflen, data, len); 4047 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4048 v_buflen += len;
3980 4049
3981 pty_ev.set (ev::READ | ev::WRITE); 4050 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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