ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.212 by root, Wed Dec 21 14:19:19 2005 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
… …
113 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 119 XK_Print, 0x2399,
116 120
117 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
119 0, 131 0,
120}; 132};
121 133
122void 134void
123rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
124{ 136{
125 x = Pixel2Col (x); 137 x = Pixel2Col (x);
126 y = Pixel2Row (y); 138 y = Pixel2Row (y);
127 139
128 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 142 return;
131 143
132 for (;;) 144 for (;;)
133 { 145 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(-view_start);
147
148 text_t t = l.t[x];
135 149
136 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
137 { 151 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 152 iso14755_51 (l.t[x], l.r[x]);
139 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
140 break; 154 break;
141 } 155 }
142 156
143 x--; 157 x--;
144 } 158 }
145
146} 159}
147#endif 160#endif
148 161
149#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
150void 163void
151rxvt_term::iso14755_51 (wchar_t ch) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
152{ 165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 168 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
155 172
156#if ENABLE_COMBINING 173#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
158 { 175 {
159 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
161 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
162 } 179 }
163 else 180 else
164#endif 181#endif
165 { 182 {
183 ch2 = ch;
184
166 alloc = 0; 185 alloc = 0;
167 chr = &ch; 186 chr = &ch2;
168 len = 1; 187 len = 1;
169 } 188 }
170 189
171 scr_overlay_new (0, -1, 8 + 5, len); 190 int width = wcswidth (fname, wcslen (fname));
191
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
193
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 195
173 for (int y = 0; y < len; y++) 196 for (int y = 0; y < len; y++)
174 { 197 {
175 char buf[9]; 198 char buf[9];
176 199
… …
181 scr_overlay_set (9, y, '='); 204 scr_overlay_set (9, y, '=');
182#if !UNICODE3 205#if !UNICODE3
183 if (ch >= 0x10000) 206 if (ch >= 0x10000)
184 ch = 0xfffd; 207 ch = 0xfffd;
185#endif 208#endif
186 scr_overlay_set (11, y, ch); 209 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 210 scr_overlay_set (12, y, NOCHAR, r);
188 } 211 }
212
213 scr_overlay_set (0, len, fname);
214
215 free (fname);
189 216
190#if ENABLE_COMBINING 217#if ENABLE_COMBINING
191 if (alloc) 218 if (alloc)
192 delete [] alloc; 219 delete [] alloc;
193#endif 220#endif
… …
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
263 * 290 *
264 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
265 */ 292 */
266 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
269 296
270 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
271 { 298 {
272 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 320
294 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
298 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
301 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 331 SET_LOCALE (locale);
303 332
304 if (status_return == XLookupChars 333 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
332 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
333 } 362 }
334 363
335 if (valid_keysym) 364 if (valid_keysym)
336 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
337 if (TermWin.saveLines) 371 if (saveLines)
338 { 372 {
339#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 374 if (!ctrl && !meta)
341#else 375#else
342 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
343#endif 377#endif
344 { 378 {
345 int lnsppg; 379 int lnsppg;
346 380
347#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 383#else
350 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
351#endif 385#endif
352 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
353 { 387 {
354 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
355 return; 389 return;
… …
406 { 440 {
407 /* normal XTerm key bindings */ 441 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 442 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 443 selection_request (ev.time, 0, 0);
410 return; 444 return;
411#if TODO // TODO 445#if TODO
412 /* rxvt extras */ 446 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 447 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 448 change_font (FONT_UP);
415 return; 449 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 450 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 509 }
476#endif 510#endif
477 511
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 513 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 514 {
506 newlen = 1; 515 newlen = 1;
507 switch (keysym) 516 switch (keysym)
508 { 517 {
509#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
517 else 526 else
518 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
519 break; 528 break;
520#endif 529#endif
521#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
522 case XK_Delete: 541 case XK_Delete:
523 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
524 break; 543 break;
525#endif 544#endif
526 case XK_Tab: 545 case XK_Tab:
… …
629#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
630 case XK_KP_Begin: 649 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
632 break; 651 break;
633 652
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 653#endif
642 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
677 break; 689 break;
678 690
679 case XK_Find: 691 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
681 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
682 case XK_Insert: 705 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
684 break; 707 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 709 case DXK_Remove:
… …
776#undef FKEY 799#undef FKEY
777 default: 800 default:
778 newlen = 0; 801 newlen = 0;
779 break; 802 break;
780 } 803 }
804
781 if (newlen) 805 if (newlen)
782 len = strlen (kbuf); 806 len = strlen (kbuf);
783 } 807 }
784 808
785 /* 809 /*
… …
794 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
795 { 819 {
796 len = 1; 820 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
827 }
799 else 828 else
800 { 829 {
801#ifdef META8_OPTION 830#ifdef META8_OPTION
802 /* set 8-bit on */ 831 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 832 if (meta && (meta_char == 0x80))
… …
816 845
817 if (len <= 0) 846 if (len <= 0)
818 return; /* not mapped */ 847 return; /* not mapped */
819 848
820 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
821 if (TermWin.view_start) 850 if (view_start)
822 { 851 {
823 TermWin.view_start = 0; 852 view_start = 0;
824 want_refresh = 1; 853 want_refresh = 1;
825 } 854 }
826 855
827 /* 856 /*
828 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
861#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
863} 892}
864/*}}} */ 893/*}}} */
865 894
866#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
869unsigned int 898unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871{ 900{
… …
894 923
895 cmd_parse (); 924 cmd_parse ();
896 925
897 return 0; 926 return 0;
898} 927}
899#endif /* MENUBAR_MAX */ 928#endif
900 929
901void 930void
902rxvt_term::flush () 931rxvt_term::flush ()
903{ 932{
933 flush_ev.stop ();
934
904#ifdef TRANSPARENT 935#ifdef TRANSPARENT
905 if (want_full_refresh) 936 if (want_full_refresh)
906 { 937 {
907 want_full_refresh = 0; 938 want_full_refresh = 0;
908 scr_clear (); 939 scr_clear ();
… …
918 IMSendSpot (); 949 IMSendSpot ();
919#endif 950#endif
920 } 951 }
921 952
922 display->flush (); 953 display->flush ();
923
924 flush_ev.stop ();
925} 954}
926 955
927void 956void
928rxvt_term::check_cb (check_watcher &w) 957rxvt_term::check_cb (check_watcher &w)
929{ 958{
… …
1005{ 1034{
1006 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1038 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1010 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1044 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1046 }
1014} 1047}
… …
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1080{
1048 SET_R (this); 1081 SET_R (this);
1049 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
1050 1083
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1086 while (pty_fill ())
1056 if (cmd_parse ()) 1087 if (cmd_parse ())
1057 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1058} 1092}
1059 1093
1060void 1094void
1061rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1062{ 1096{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1098 recolour_cursor ();
1065 1099
1066#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1101 hidden_pointer = 0;
1068 1102
… …
1076rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1077{ 1111{
1078 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1079 return; 1113 return;
1080 1114
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1116 XFlush (display->display);
1083 1117
1084 hidden_pointer = 1; 1118 hidden_pointer = 1;
1085} 1119}
1086 1120
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1171 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1172 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1173#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1174 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1175#endif
1142
1143 } 1176 }
1144 1177
1145#ifdef DEBUG_MOUSEREPORT 1178#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1179 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1180 if (key_state & 16)
1148 fputc ('C', stderr); 1181 fputc ('C', stderr);
1149 if (key_state & 4) 1182 if (key_state & 4)
1150 fputc ('S', stderr); 1183 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1187 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1188 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1189 button_number,
1157 x + 1, 1190 x + 1,
1158 y + 1); 1191 y + 1);
1159#else 1192#endif
1193
1160 tt_printf ("\033[M%c%c%c", 1194 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1195 (32 + button_number + key_state),
1162 (32 + x + 1), 1196 (32 + x + 1),
1163 (32 + y + 1)); 1197 (32 + y + 1));
1164#endif
1165} 1198}
1166 1199
1167#ifdef USING_W11LIB 1200#ifdef USING_W11LIB
1168void 1201void
1169rxvt_W11_process_x_event (XEvent *ev) 1202rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1209
1177/*{{{ process an X event */ 1210/*{{{ process an X event */
1178void 1211void
1179rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1180{ 1213{
1214 dDisp;
1215
1181 SET_R (this); 1216 SET_R (this);
1182 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1183 1218
1184#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1206 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank (); 1242 pointer_blank ();
1208 } 1243 }
1209#endif 1244#endif
1210 1245
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return;
1214#endif
1215
1216 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1248 unsigned int unused_mask;
1219 1249
1220 switch (ev.type) 1250 switch (ev.type)
1221 { 1251 {
1222 case KeyPress: 1252 case KeyPress:
1223#if ISO_14755 1253#if ISO_14755
… …
1227 1257
1228 break; 1258 break;
1229 1259
1230 case KeyRelease: 1260 case KeyRelease:
1231 { 1261 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233 KeySym ks; 1263 KeySym ks;
1234 1264
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1266#endif
1237 1267
… …
1306 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1307 break; 1337 break;
1308 1338
1309 case ClientMessage: 1339 case ClientMessage:
1310 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1313#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1319 { 1367 {
1320 /* Get Dnd data */ 1368 /* Get Dnd data */
1321 Atom ActualType; 1369 Atom ActualType;
1322 int ActualFormat; 1370 int ActualFormat;
1323 unsigned char *data; 1371 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1325 1373
1326 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1376 0L, 1000000L,
1329 False, AnyPropertyType, 1377 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1332 &data); 1380 &data);
1333 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1382 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1385 }
1341#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1342 break; 1387 break;
1343 1388
1344 case MappingNotify: 1389 case MappingNotify:
… …
1369 break; 1414 break;
1370 } 1415 }
1371 break; 1416 break;
1372 1417
1373 case FocusIn: 1418 case FocusIn:
1374 if (!TermWin.focus) 1419 focus_in ();
1420 break;
1421
1422 case FocusOut:
1423 focus_out ();
1424 break;
1425
1426 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0])
1375 { 1428 {
1376 TermWin.focus = 1; 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1430 ;
1378#ifdef USE_XIM 1431
1379 if (Input_Context != NULL) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1433 {
1381 IMSetStatusPosition (); 1434 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1436 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1437
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1439 if (options & Opt_transparent)
1447 {
1448 check_our_parents (); 1440 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1441#endif
1453 } 1442 }
1454 break; 1443 break;
1455 1444
1456 case PropertyNotify: 1445 case PropertyNotify:
… …
1464 selection_clear (); 1453 selection_clear ();
1465 break; 1454 break;
1466 1455
1467 case SelectionNotify: 1456 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1457 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1459 break;
1472 1460
1473 case SelectionRequest: 1461 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1475 break; 1463 break;
1476 1464
1477 case UnmapNotify: 1465 case UnmapNotify:
1478 TermWin.mapped = 0; 1466 mapped = 0;
1479#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1481#endif 1469#endif
1482 break; 1470 break;
1483 1471
1484 case MapNotify: 1472 case MapNotify:
1485 TermWin.mapped = 1; 1473 mapped = 1;
1486#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1476#endif
1489 break; 1477 break;
1490 1478
… …
1494 break; 1482 break;
1495#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1496 1484
1497 case GraphicsExpose: 1485 case GraphicsExpose:
1498 case Expose: 1486 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1500 { 1488 {
1501 do 1489 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1493
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1495
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1511 1499
1512 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1513 } 1501 }
1514 else 1502 else
1515 { 1503 {
1516 XEvent unused_event; 1504 XEvent unused_event;
1517 1505
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1507 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1509 ;
1522 1510
1523 if (isScrollbarWindow (ev.xany.window)) 1511 if (isScrollbarWindow (ev.xany.window))
1524 { 1512 {
1525 scrollBar.setIdle (); 1513 scrollBar.setIdle ();
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1518 menubar_expose ();
1531#endif 1519#endif
1532 1520
1533#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1536#endif 1524#endif
1537 } 1525 }
1538 break; 1526 break;
1539 1527
1540 case MotionNotify: 1528 case MotionNotify:
… …
1547 { 1535 {
1548 menubar_control (ev.xbutton); 1536 menubar_control (ev.xbutton);
1549 break; 1537 break;
1550 } 1538 }
1551#endif 1539#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1541 break;
1554 1542
1555 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1556 { 1544 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1546 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1548 ;
1561 1549
1562 XQueryPointer (display->display, TermWin.vt, 1550 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1553 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1554 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1556 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1557 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1558 {
1571#endif 1559#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1564 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1565 break;
1578 } 1566 }
1579#endif 1567#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1570
1582#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1574 {
1586 int dist; 1575 int dist;
1587 1576
1588 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1589
1601 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1603 { 1592 {
1604 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1606 } 1595 }
1607 else 1596 else
1608 { 1597 {
1609 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1599 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1600 }
1612 1601
1613 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1604 + 1;
1616 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1618 } 1607 }
1619 else 1608 else
1620 { 1609 {
1621 /* we are within the text window, so we 1610 /* we are within the text window, so we
… …
1630#endif 1619#endif
1631 } 1620 }
1632 } 1621 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1623 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1625 MotionNotify, &ev))
1626 ;
1627
1637 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1632 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1634 scrollbar_size ());
1644 scr_refresh (refresh_type); 1635 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1636 refresh_limit = 0;
… …
1647 } 1638 }
1648 break; 1639 break;
1649 } 1640 }
1650} 1641}
1651 1642
1643void
1644rxvt_term::focus_in ()
1645{
1646 if (!focus)
1647 {
1648 focus = 1;
1649 want_refresh = 1;
1650#if USE_XIM
1651 if (Input_Context != NULL)
1652 {
1653 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context);
1655 }
1656#endif
1657#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink)
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif
1661#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade])
1663 {
1664 pix_colors = pix_colors_focused;
1665 scr_recolour ();
1666 }
1667#endif
1668 }
1669}
1670
1671void
1672rxvt_term::focus_out ()
1673{
1674 if (focus)
1675 {
1676 focus = 0;
1677 want_refresh = 1;
1678
1679#if ENABLE_FRILLS || ISO_14755
1680 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY
1683 scr_overlay_off ();
1684#endif
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context);
1688#endif
1689#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink)
1691 cursor_blink_ev.stop ();
1692 hidden_cursor = 0;
1693#endif
1694#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade])
1696 {
1697 pix_colors = pix_colors_unfocused;
1698 scr_recolour ();
1699 }
1700#endif
1701 }
1702}
1703
1652#if TRANSPARENT 1704#if TRANSPARENT
1653void 1705void
1654rxvt_term::rootwin_cb (XEvent &ev) 1706rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1707{
1656 SET_R (this); 1708 SET_R (this);
… …
1661 case PropertyNotify: 1713 case PropertyNotify:
1662 /* 1714 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1715 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1716 * use the property to determine the pixmap. We use it later on.
1665 */ 1717 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1720 return;
1671 1721
1672 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1673 case ReparentNotify: 1723 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1739
1690 /* 1740 /*
1691 * VT window processing of button press 1741 * VT window processing of button press
1692 */ 1742 */
1693 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1694 { 1744 {
1695#if ISO_14755 1745#if ISO_14755
1696 // 5.4 1746 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1748 {
… …
1700 return; 1750 return;
1701 } 1751 }
1702#endif 1752#endif
1703 1753
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1754 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1755
1705 if (reportmode) 1756 if (reportmode)
1706 { 1757 {
1707 /* mouse report from vt window */ 1758 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1759 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1760 MEvent.state = ev.state;
… …
1738 } 1789 }
1739 else 1790 else
1740 { 1791 {
1741 if (ev.button != MEvent.button) 1792 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1793 MEvent.clicks = 0;
1794
1743 switch (ev.button) 1795 switch (ev.button)
1744 { 1796 {
1745 case Button1: 1797 case Button1:
1798 /* allow meta + click to select rectangular areas */
1799 /* should be done in screen.C */
1800#if ENABLE_FRILLS
1801 selection.rect = !!(ev.state & ModMetaMask);
1802#else
1803 selection.rect = false;
1804#endif
1805
1746 /* allow shift+left click to extend selection */ 1806 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748 { 1808 {
1749 if (MEvent.button == Button1 && clickintime) 1809 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1810 selection_rotate (ev.x, ev.y);
… …
1893 case Button3: 1953 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1895 { 1955 {
1896 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1899# else 1959# else
1900 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1901# endif 1961# endif
1902 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1905# else 1965# else
1906 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1907# endif 1967# endif
1908 else 1968 else
1909 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1910 } 1970 }
1911 else 1971 else
1912 { 1972 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 1974 (nrow
1915 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 1976 / scrollbar_size ()));
1917 } 1977 }
1918 1978
1919 break; 1979 break;
… …
1951#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
1954#endif 2014#endif
1955 2015
1956 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
1957 { 2017 {
1958#if ISO_14755 2018#if ISO_14755
1959 // 5.4 2019 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2021 return;
… …
2012 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
2013 2073
2014 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
2015 i = 1; 2075 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
2017 i = TermWin.nrow - 1; 2077 i = nrow - 1;
2018 else 2078 else
2019 i = 5; 2079 i = 5;
2020 2080
2021# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
2023 { 2083 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2087
2028 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2090
2031 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2135 int i;
2076 2136
2077 Visual* visual = display->visual; 2137 Visual *visual = display->visual;
2078 2138
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2140
2081 /* for convenience */ 2141 /* for convenience */
2082 mask_r = visual->red_mask; 2142 mask_r = visual->red_mask;
… …
2303 Atom atype; 2363 Atom atype;
2304 unsigned char *prop = NULL; 2364 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2365 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2366 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2308 2369
2309 pchanged = 0; 2370 pchanged = 0;
2310 2371
2311 if (!(options & Opt_transparent)) 2372 if (!(options & Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2313 2374
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2316 2377
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2379
2319 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2320 { 2381 {
2321 if (am_transparent) 2382 if (am_transparent)
2322 { 2383 {
2323 pchanged = 1; 2384 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2326 } 2387 }
2327 2388
2328 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2329 } 2390 }
2330 2391
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2393 XSync (disp, False);
2333 2394
2334 /* 2395 /*
2335 * Make the frame window set by the window manager have 2396 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2397 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2398 * windows for each client, so we have to take care about that.
2338 */ 2399 */
2339 i = (xa[XA_XROOTPMAPID] 2400 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2343 2404
2344 if (!i || prop == NULL) 2405 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2406 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2409 &nitems, &bytes_after, &prop) == Success);
2349 2410
2350 if (!i || prop == NULL 2411 if (!i || prop == NULL
2351#if TINTING 2412#if TINTING
… …
2370 Window cr; 2431 Window cr;
2371 XImage *image; 2432 XImage *image;
2372 GC gc; 2433 GC gc;
2373 XGCValues gcvalue; 2434 XGCValues gcvalue;
2374 2435
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2440 nx = ny = 0;
2380 2441
… …
2390 nh += sy; 2451 nh += sy;
2391 ny = -sy; 2452 ny = -sy;
2392 sy = 0; 2453 sy = 0;
2393 } 2454 }
2394 2455
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2397 allowedxerror = -1; 2460 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2462
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2464 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2465 allowedxerror = 0;
2403 2466
2404 if (image == NULL) 2467 if (image == NULL)
2405 { 2468 {
2406 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2407 { 2470 {
2408 pchanged = 1; 2471 pchanged = 1;
2409 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2410 { 2473 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2475 pixmap = None;
2413 } 2476 }
2414 } 2477 }
2415 2478
2416 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2417 } 2480 }
2418 else 2481 else
2419 { 2482 {
2420 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2422 2485
2423#if TINTING 2486#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2488 {
2426 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
… …
2430 2493
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2495 }
2433#endif 2496#endif
2434 2497
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2503 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2504 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2444 2507
2445 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2509 pchanged = 1;
2447 2510
2448 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2449 } 2512 }
2450 } 2513 }
2451 2514
2452 if (!am_pixmap_trans) 2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2453 { 2518 {
2454 unsigned int n; 2519 unsigned int n;
2455 /* 2520 /*
2456 * InheritPixmap transparency 2521 * InheritPixmap transparency
2457 */ 2522 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2524 {
2460 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2463 XFree (list); 2528 XFree (list);
2464 2529
2465 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2466 { 2531 {
2467 if (oldp != None) 2532 if (oldp != None)
2468 pchanged = 1; 2533 pchanged = 1;
2469 2534
2470 break; 2535 break;
2471 } 2536 }
2472 2537
2473 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2474 pchanged = 1; 2539 pchanged = 1;
2475 } 2540 }
2476 2541
2477 n = 0; 2542 n = 0;
2478 2543
2479 if (pchanged) 2544 if (pchanged)
2480 { 2545 {
2481 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2482 { 2547 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2550 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2552 break;
2488 } 2553 }
2489 } 2554 }
2490 } 2555 }
2491 2556
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2558 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2561 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2498 } 2563 }
2499 else 2564 else
2500 { 2565 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2569 sleep (1);
2505#endif 2570#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2507 { 2572 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2510 } 2575 }
2511 2576
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2578 am_transparent = 1;
2514 } 2579 }
2515 2580
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2582 parent[i] = None;
2518 } 2583 }
2519 2584
2520 // this is experimental
2521 if (scrollBar.win) 2585 if (scrollBar.win)
2522 { 2586 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2588 scrollBar.setIdle ();
2526 scrollbar_show (0); 2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2527 } 2597 }
2528 2598
2529 return pchanged; 2599 return pchanged;
2530} 2600}
2531#endif 2601#endif
… …
2557 seen_input = 1; 2627 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2628 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2629 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2630 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2631 // then sometimes get the size wrong.
2632 // unfortunately other programs are even more buggy and dislike
2633 // being sent SIGWINCH, so only do it when we were in fact being
2634 // resized.
2635 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2636 kill (-cmd_pid, SIGWINCH);
2563 } 2637 }
2564 2638
2565 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2641 bool refreshnow = false;
2568 int nlines = 0; 2642 int nlines = 0;
2569 unicode_t *str = buf; 2643 unicode_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2570 2645
2571 for (;;) 2646 for (;;)
2572 { 2647 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2649 break;
2575 2650
2576 *str++ = ch; 2651 *str++ = ch;
2577 2652
2578 if (ch == C0_LF) 2653 if (ch == C0_LF || str >= eol)
2579 { 2654 {
2655 if (ch == C0_LF)
2580 nlines++; 2656 nlines++;
2657
2581 refresh_count++; 2658 refresh_count++;
2582 2659
2583 if (!(options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2662 {
2586 refreshnow = true; 2663 refreshnow = true;
2587 ch = NOCHAR; 2664 ch = NOCHAR;
2588 break; 2665 break;
2589 } 2666 }
2590 2667
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2593 { 2670 {
2594 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2595 nlines = 0; 2672 nlines = 0;
2596 str = buf; 2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2597 } 2675 }
2598 }
2599 2676
2600 if (str >= buf + UBUFSIZ) 2677 if (str >= eol)
2601 { 2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2602 ch = NOCHAR; 2681 ch = NOCHAR;
2603 break; 2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2604 } 2688 }
2605 2689
2606 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2691 ch = next_char ();
2608 } 2692 }
… …
2679 if (len == (size_t)-1) 2763 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2765
2682 // assume wchar == unicode 2766 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2767 cmdbuf_ptr += len;
2684 return wc; 2768 return wc & UNICODE_MASK;
2685 } 2769 }
2686 2770
2687 return NOCHAR; 2771 return NOCHAR;
2688} 2772}
2689 2773
… …
3152 { 3236 {
3153 switch (priv) 3237 switch (priv)
3154 { 3238 {
3155 case '>': 3239 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3240 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3242 break;
3159 case '?': 3243 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3245 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3246 break;
… …
3267 3351
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3357 break;
3274 3358
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3277 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3475rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3476{
3393 int x, y; 3477 int x, y;
3394 XWindowAttributes wattr; 3478 XWindowAttributes wattr;
3395 Window wdummy; 3479 Window wdummy;
3480 dDisp;
3396 3481
3397 if (nargs == 0) 3482 if (nargs == 0)
3398 return; 3483 return;
3399 3484
3400 switch (args[0]) 3485 switch (args[0])
3401 { 3486 {
3402 /* 3487 /*
3403 * commands 3488 * commands
3404 */ 3489 */
3405 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3407 break; 3492 break;
3408 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3494 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3495 break;
3412 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3498 break;
3415 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3501 break;
3418 case 5: /* raise window */ 3502 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3420 break; 3504 break;
3421 case 6: /* lower window */ 3505 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3423 break; 3507 break;
3424 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3425 scr_touch (true); 3509 scr_touch (true);
3426 break; 3510 break;
3427 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3430 break; 3514 break;
3431 3515
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3517 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3437 break; 3521 break;
3438 3522
3439 3523
3440 /* 3524 /*
3441 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3442 */ 3526 */
3443 case 11: /* report window state */ 3527 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3530 break;
3447 case 13: /* report window position */ 3531 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3537 break;
3454 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3541 break;
3458 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3544 break;
3461 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3547 break;
3464 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3465 { 3549 {
3466 char *s; 3550 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3553 XFree (s);
3470 } 3554 }
3471 break; 3555 break;
3472 case 21: /* report window title */ 3556 case 21: /* report window title */
3473 { 3557 {
3474 char *s; 3558 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3561 XFree (s);
3478 } 3562 }
3479 break; 3563 break;
3480 } 3564 }
… …
3487 * ends_how is terminator used. returned input must be free()'d 3571 * ends_how is terminator used. returned input must be free()'d
3488 */ 3572 */
3489unsigned char * 3573unsigned char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3574rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3575{
3492 unicode_t prev = 0, ch; 3576 unicode_t ch;
3577 bool seen_esc = false;
3493 unsigned int n = 0; 3578 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3579 wchar_t string[STRING_MAX];
3496 3580
3497 while ((ch = cmd_getc ()) != NOCHAR) 3581 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3582 {
3499 if (prev == C0_ESC) 3583 if (seen_esc)
3500 { 3584 {
3501 if (ch == 0x5c) /* 7bit ST */ 3585 if (ch == 0x5c) /* 7bit ST */
3502 break; 3586 break;
3503 else 3587 else
3504 return NULL; 3588 return NULL;
3505 } 3589 }
3590 else if (ch == C0_ESC)
3591 {
3592 seen_esc = true;
3593 continue;
3594 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3595 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3596 break;
3508 else if (ch < 0x20) 3597 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3598 return NULL; /* other control character - exit */
3510 3599
3511 if (n >= sizeof (string) - 1) 3600 seen_esc = false;
3601
3602 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3603 // stop at some sane length
3513 return NULL; 3604 return NULL;
3514 3605
3515 if (ch == C0_SYN) 3606 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3607 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3608 else
3521 string[n++] = prev = ch; 3609 string[n++] = ch;
3522 } 3610 }
3523 3611
3524 string[n++] = '\0'; 3612 string[n++] = '\0';
3525 3613
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3614 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3615
3531 return s; 3616 return (unsigned char *)rxvt_wcstombs (string);
3532} 3617}
3533 3618
3534/*----------------------------------------------------------------------*/ 3619/*----------------------------------------------------------------------*/
3535/* 3620/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3590 set_window_color (color, str); 3675 set_window_color (color, str);
3591} 3676}
3592 3677
3593/* 3678/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3680 */
3618void 3681void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3620{ 3683{
3621 int changed = 0; 3684 int changed = 0;
3622 int color; 3685 int color;
3623 char *buf, *name; 3686 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3687 bool query = str[0] == '?' && !str[1];
3688 int saveop = op;
3689 dDisp;
3625 3690
3626 assert (str != NULL); 3691 assert (str != NULL);
3627 switch (op) 3692 switch (op)
3628 { 3693 {
3629 case XTerm_name: 3694 case XTerm_name:
… …
3636 set_title (str); 3701 set_title (str);
3637 break; 3702 break;
3638 case XTerm_property: 3703 case XTerm_property:
3639 if (str[0] == '?') 3704 if (str[0] == '?')
3640 { 3705 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3706 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3707 Atom actual_type;
3643 int actual_format; 3708 int actual_format;
3644 unsigned long nitems; 3709 unsigned long nitems;
3645 unsigned long bytes_after; 3710 unsigned long bytes_after;
3646 unsigned char *value = 0; 3711 unsigned char *value = 0;
3647 const char *str = ""; 3712 const char *str = "";
3648 3713
3649 if (prop 3714 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3719 && actual_type != None
3655 && actual_format == 8) 3720 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3729 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3730
3666 if (eq) 3731 if (eq)
3667 { 3732 {
3668 *eq = 0; 3733 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3734 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3735 }
3674 else 3736 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3738 display->atom (str));
3677 } 3739 }
3678 break; 3740 break;
3679 3741
3680 case XTerm_Color: 3742 case XTerm_Color:
… …
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break; 3790 break;
3729 case XTerm_Color_RV: 3791 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3793 break;
3794 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break;
3797#endif
3798#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3801 check_our_parents ();
3802 if (am_transparent)
3803 want_full_refresh = want_refresh = 1;
3804 break;
3732#endif 3805#endif
3733 3806
3734 case XTerm_Pixmap: 3807 case XTerm_Pixmap:
3735 if (*str != ';') 3808 if (*str != ';')
3736 { 3809 {
… …
3744 { 3817 {
3745 str++; 3818 str++;
3746#if XPM_BACKGROUND 3819#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3820 changed += scale_pixmap (str);
3748#endif 3821#endif
3749
3750 } 3822 }
3823
3751 if (changed) 3824 if (changed)
3752 { 3825 {
3753#ifdef XPM_BACKGROUND 3826#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3827 resize_pixmap ();
3755#endif 3828#endif
… …
3766 3839
3767 case XTerm_logfile: 3840 case XTerm_logfile:
3768 // TODO, when secure mode? 3841 // TODO, when secure mode?
3769 break; 3842 break;
3770 3843
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR 3844#ifdef MENUBAR
3806 case XTerm_Menu: 3845 case URxvt_Menu:
3807 if (options & Opt_insecure) 3846 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break; 3848 break;
3810#endif 3849#endif
3811#if 0 3850#if 0
… …
3816 { 3855 {
3817 scr_dump (fd); 3856 scr_dump (fd);
3818 close (fd); 3857 close (fd);
3819 } 3858 }
3820 } 3859 }
3860 break;
3861#endif
3862 case XTerm_font:
3863 op = URxvt_font;
3864 case URxvt_font:
3865#if ENABLE_STYLES
3866 case URxvt_boldFont:
3867 case URxvt_italicFont:
3868 case URxvt_boldItalicFont:
3869#endif
3870 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp);
3875 else
3876 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3878
3879 res = strdup (str);
3880 allocated.push_back ((void *)res);
3881 set_fonts ();
3882 }
3883 break;
3884
3885#if ENABLE_FRILLS
3886 case URxvt_locale:
3887 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3889 else
3890 {
3891 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale ();
3894 }
3895 break;
3896
3897 case URxvt_view_up:
3898 case URxvt_view_down:
3899 int lines = atoi (str);
3900
3901 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else
3904 {
3905 scr_erase_savelines ();
3906 }
3907
3821 break; 3908 break;
3822#endif 3909#endif
3823 } 3910 }
3824} 3911}
3825/*----------------------------------------------------------------------*/ 3912/*----------------------------------------------------------------------*/
… …
3935 4022
3936 /* extra handling for values with state unkept */ 4023 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4024 switch (arg[i])
3938 { 4025 {
3939 case 1048: /* alternative cursor save */ 4026 case 1048: /* alternative cursor save */
4027 case 1049:
3940 if (options & Opt_secondaryScreen) 4028 if (options & Opt_secondaryScreen)
3941 if (mode == 0) 4029 if (mode == 0)
3942 scr_cursor (RESTORE); 4030 scr_cursor (RESTORE);
3943 else if (mode == 1) 4031 else if (mode == 1)
3944 scr_cursor (SAVE); 4032 scr_cursor (SAVE);
… …
3957 */ 4045 */
3958 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
3959 break; 4047 break;
3960 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4051 break;
3964 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
3965 if (state) 4053 if (state)
3966 options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
3967 else 4055 else
… …
4069 rendset = 0, rendstyle = ~RS_None; 4157 rendset = 0, rendstyle = ~RS_None;
4070 break; 4158 break;
4071 case 1: 4159 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4160 rendset = 1, rendstyle = RS_Bold;
4073 break; 4161 break;
4074 //case 2: // faint or second colour 4162 //case 2: // low intensity
4075 //case 3: // italic 4163 case 3:
4164 rendset = 1, rendstyle = RS_Italic;
4165 break;
4076 case 4: 4166 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4167 rendset = 1, rendstyle = RS_Uline;
4078 break; 4168 break;
4079 case 5: // slowly blinking 4169 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4170 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4182 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4183 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4184 //...
4095 //case 19: // ninth alt font 4185 //case 19: // ninth alt font
4096 //case 20: // gothic 4186 //case 20: // gothic
4097 case 21: // disable bold, faint 4187 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4188 rendset = 0, rendstyle = RS_Bold;
4099 break; 4189 break;
4100 case 22: 4190 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4191 rendset = 0, rendstyle = RS_Bold;
4102 break; 4192 break;
4103 //case 23: disable italic 4193 case 23: // disable italic
4194 rendset = 0, rendstyle = RS_Italic;
4195 break;
4104 case 24: 4196 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4197 rendset = 0, rendstyle = RS_Uline;
4106 break; 4198 break;
4107 case 25: 4199 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4200 rendset = 0, rendstyle = RS_Blink;
4109 break; 4201 break;
4110 case 26: 4202 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4203 rendset = 0, rendstyle = RS_Blink;
4112 break; 4204 break;
4113 case 27: 4205 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4206 rendset = 0, rendstyle = RS_RVid;
4115 break; 4207 break;
… …
4133 case 35: 4225 case 35:
4134 case 36: 4226 case 36:
4135 case 37: 4227 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4228 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4229 break;
4138#ifdef TTY_256COLOR 4230 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4231 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4232 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4233 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4234 i += 2;
4144 } 4235 }
4145 break; 4236 break;
4146#endif
4147 case 39: /* default fg */ 4237 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4238 scr_color (Color_fg, Color_fg);
4149 break; 4239 break;
4150 4240
4151 case 40: 4241 case 40:
… …
4156 case 45: 4246 case 45:
4157 case 46: 4247 case 46:
4158 case 47: 4248 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4249 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4250 break;
4161#ifdef TTY_256COLOR 4251 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4252 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4253 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4254 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4255 i += 2;
4167 } 4256 }
4168 break; 4257 break;
4169#endif
4170 case 49: /* default bg */ 4258 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4259 scr_color (Color_bg, Color_bg);
4172 break; 4260 break;
4261
4262 //case 50: // not variable spacing
4173 4263
4174#ifndef NO_BRIGHTCOLOR 4264#ifndef NO_BRIGHTCOLOR
4175 case 90: 4265 case 90:
4176 case 91: /* set bright fg color */ 4266 case 91: /* set bright fg color */
4177 case 92: 4267 case 92:
4178 case 93: 4268 case 93:
4179 case 94: 4269 case 94:
4180 case 95: 4270 case 95:
4181 case 96: 4271 case 96:
4182 case 97: 4272 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4273 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4274 break;
4186 case 100: 4275 case 100:
4187 case 101: /* set bright bg color */ 4276 case 101: /* set bright bg color */
4188 case 102: 4277 case 102:
4189 case 103: 4278 case 103:
4190 case 104: 4279 case 104:
4191 case 105: 4280 case 105:
4192 case 106: 4281 case 106:
4193 case 107: 4282 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4284 break;
4197#endif 4285#endif
4198 4286
4199 } 4287 }
4200 } 4288 }
… …
4239 4327
4240/* ---------------------------------------------------------------------- */ 4328/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4329/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4330 * or generated by us in response to a query ESC sequence.
4243 */ 4331 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333
4244void 4334void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4335rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246{ 4336{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4337 if (v_buflen == 0)
4338 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4248 4340
4249 if (len) 4341 if ((unsigned int)written == len)
4342 return;
4343
4344 data += written;
4345 len -= written;
4250 { 4346 }
4347
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4349
4350 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len;
4352
4353 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354}
4355
4356void rxvt_term::pty_write ()
4357{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359
4360 if (written > 0)
4361 {
4362 v_buflen -= written;
4363
4251 if (v_buflen == 0) 4364 if (v_buflen == 0)
4252 { 4365 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4366 free (v_buffer);
4280 v_buffer = 0; 4367 v_buffer = 0;
4281 v_buflen = 0; 4368 v_buflen = 0;
4282 4369
4283 pty_ev.set (EVENT_READ); 4370 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4371 return;
4296 } 4372 }
4373
4374 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4375 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this...
4378 destroy ();
4298} 4379}
4299 4380
4300/*----------------------- end-of-file (C source) -----------------------*/ 4381/*----------------------- end-of-file (C source) -----------------------*/
4301 4382

Diff Legend

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