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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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#include <cwchar>
54#include <csignal>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
57
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
56 258
57/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
58void 260void
59rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
60{ 262{
… …
88#ifdef USE_XIM 290#ifdef USE_XIM
89 if (Input_Context) 291 if (Input_Context)
90 { 292 {
91 Status status_return; 293 Status status_return;
92 294
295#if 0
93#ifdef X_HAVE_UTF8_STRING 296#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 299 KBUFSZ, &keysym, &status_return);
97 else 300 else
301#endif
98#endif 302#endif
99 { 303 {
100 wchar_t wkbuf[KBUFSZ + 1]; 304 wchar_t wkbuf[KBUFSZ + 1];
101 305
102 // the XOpenIM manpage lies about hardcoding the locale 306 // the XOpenIM manpage lies about hardcoding the locale
… …
144 { 348 {
145 if (TermWin.saveLines) 349 if (TermWin.saveLines)
146 { 350 {
147#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 352 if (!ctrl && !meta)
149 {
150#else 353#else
151 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
152 { 356 {
153#endif
154 int lnsppg; 357 int lnsppg;
155 358
156#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
158#else 361#else
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 411 {
209 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
211 } 414 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 416 {
214 switch (keysym) 417 switch (keysym)
215 { 418 {
216 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
219 return; 422 return;
423#if TODO
220 /* rxvt extras */ 424 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 426 change_font (FONT_UP);
223 return; 427 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 429 change_font (FONT_DN);
226 return; 430 return;
431#endif
227 } 432 }
228 } 433 }
229 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
230#ifdef PRINTPIPE 482#ifdef PRINTPIPE
231 if (keysym == XK_Print) 483 if (keysym == XK_Print)
232 { 484 {
233 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
234 return; 486 return;
… …
236#endif 488#endif
237 489
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
239 { 491 {
240#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 494 {
243 unsigned int l; 495 unsigned int l;
244 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
245 497
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
266 newlen = 1; 518 newlen = 1;
267 switch (keysym) 519 switch (keysym)
268 { 520 {
269#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 522 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
272 { 524 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
276 } 528 }
277 else 529 else
278 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
279 break; 531 break;
280#endif 532#endif
281#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
282 case XK_Delete: 534 case XK_Delete:
283 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
284 break; 536 break;
285#endif 537#endif
286 case XK_Tab: 538 case XK_Tab:
287 if (shft) 539 if (shft)
288 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
289 else 541 else
290 { 542 {
291#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 544 if (ctrl)
293 meta = 1; 545 meta = 1;
… …
299 newlen = 0; 551 newlen = 0;
300 } 552 }
301 break; 553 break;
302 554
303#ifdef XK_KP_Left 555#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 561 {
310 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 564 break;
313 } 565 }
314 else 566 else
315 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
318#endif 570#endif
319 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 577 /* do Shift first */
326 if (shft) 578 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 580 else if (ctrl)
329 { 581 {
330 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 584 }
333 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
335 break; 587 break;
336 588
337#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
339 case XK_KP_Prior: 591 case XK_KP_Prior:
340 /* allow shift to override */ 592 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 594 {
343 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
344 break; 596 break;
345 } 597 }
346 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
347# endif 599# endif
348 case XK_Prior: 600 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
350 break; 602 break;
351# ifdef XK_KP_Next 603# ifdef XK_KP_Next
352 case XK_KP_Next: 604 case XK_KP_Next:
353 /* allow shift to override */ 605 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 607 {
356 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
357 break; 609 break;
358 } 610 }
359 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
360# endif 612# endif
361 case XK_Next: 613 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
363 break; 615 break;
364#endif 616#endif
365 case XK_KP_Enter: 617 case XK_KP_Enter:
366 /* allow shift to override */ 618 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 620 {
369 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
370 } 633 }
371 else 634 else
372 { 635 {
373 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
375 } 638 }
376 break; 639 break;
377 640
378#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
379 case XK_KP_Begin: 642 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
381 break; 644 break;
382 645
383 case XK_KP_Insert: 646 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
385 break; 648 break;
386 649
387 case XK_KP_Delete: 650 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
389 break; 652 break;
390#endif 653#endif
391 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
397 break; 660 break;
398 661
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 678 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 680 {
418 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 683 }
421 else 684 else
422 { 685 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
425 } 688 }
426 break; 689 break;
427 690
428 case XK_Find: 691 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
430 break; 693 break;
431 case XK_Insert: 694 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
433 break; 696 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 698 case DXK_Remove:
436 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
437#endif 700#endif
438 case XK_Execute: 701 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
440 break; 703 break;
441 case XK_Select: 704 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
443 break; 706 break;
444#ifdef XK_KP_End 707#ifdef XK_KP_End
445 case XK_KP_End: 708 case XK_KP_End:
446 /* allow shift to override */ 709 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 711 {
449 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
450 break; 713 break;
451 } 714 }
452 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
453#endif 716#endif
454 case XK_End: 717 case XK_End:
455 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
456 break; 719 break;
457#ifdef XK_KP_Home 720#ifdef XK_KP_Home
458 case XK_KP_Home: 721 case XK_KP_Home:
459 /* allow shift to override */ 722 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 724 {
462 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
463 break; 726 break;
464 } 727 }
465 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
466#endif 729#endif
467 case XK_Home: 730 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
469 break; 732 break;
470 733
471#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 736
… …
522 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
523 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
524 break; 787 break;
525#undef FKEY 788#undef FKEY
526 default: 789 default:
527 newlen = 0; 790 if (len == 0
528 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
529 } 795 }
796
530 if (newlen) 797 if (newlen)
531 len = STRLEN (kbuf); 798 len = strlen (kbuf);
532 } 799 }
533 800
534 /* 801 /*
535 * Pass meta for all function keys, if 'meta' option set 802 * Pass meta for all function keys, if 'meta' option set
536 */ 803 */
… …
543 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
544 { 811 {
545 len = 1; 812 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
548 else 827 else
549 { 828 {
550#ifdef META8_OPTION 829#ifdef META8_OPTION
551 /* set 8-bit on */ 830 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 831 if (meta && (meta_char == 0x80))
… …
564 } 843 }
565 844
566 if (len <= 0) 845 if (len <= 0)
567 return; /* not mapped */ 846 return; /* not mapped */
568 847
569 if (Options & Opt_scrollTtyKeypress) 848 if (options & Opt_scrollTtyKeypress)
570 if (TermWin.view_start) 849 if (TermWin.view_start)
571 { 850 {
572 TermWin.view_start = 0; 851 TermWin.view_start = 0;
573 want_refresh = 1; 852 want_refresh = 1;
574 } 853 }
… …
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 896/* attempt to `write' count to the input buffer */
618unsigned int 897unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 898rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
620{ 899{
621 unsigned int n, s; 900 unsigned int n, s;
622 901
623 n = cmdbuf_ptr - cmdbuf_base; 902 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 904
626 if (n > 0 && s < count) 905 if (n > 0 && s < count)
627 { 906 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 907 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 908 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 909 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 910 cmdbuf_endp -= n;
632 s += n; 911 s += n;
633 } 912 }
634 913
635 if (count > s) 914 if (count > s)
636 { 915 {
637 rxvt_print_error ("data loss: cmd_write too large"); 916 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 917 count = s;
639 } 918 }
640 919
641 for (; count--;) 920 for (; count--;)
642 *cmdbuf_endp++ = *str++; 921 *cmdbuf_endp++ = *str++;
… …
648#endif /* MENUBAR_MAX */ 927#endif /* MENUBAR_MAX */
649 928
650void 929void
651rxvt_term::flush () 930rxvt_term::flush ()
652{ 931{
932 flush_ev.stop ();
933
653#ifdef TRANSPARENT 934#ifdef TRANSPARENT
654 if (want_full_refresh) 935 if (want_full_refresh)
655 { 936 {
656 want_full_refresh = 0; 937 want_full_refresh = 0;
657 scr_clear (); 938 scr_clear ();
658 scr_touch (false); 939 scr_touch (false);
659 want_refresh = 1;
660 } 940 }
661#endif 941#endif
662 942
663 if (want_refresh) 943 if (want_refresh)
664 { 944 {
665 scr_refresh (refresh_type); 945 scr_refresh (refresh_type);
666 scrollbar_show (1); 946 scrollbar_show (1);
667#ifdef USE_XIM 947#ifdef USE_XIM
668 IMSendSpot (); 948 IMSendSpot ();
669#endif 949#endif
670
671 } 950 }
672 951
673 display->flush (); 952 display->flush ();
674} 953}
675 954
… …
677rxvt_term::check_cb (check_watcher &w) 956rxvt_term::check_cb (check_watcher &w)
678{ 957{
679 SET_R (this); 958 SET_R (this);
680 SET_LOCALE (locale); 959 SET_LOCALE (locale);
681 960
961 display->flush ();
962
963 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01);
965}
966
967void
968rxvt_term::flush_cb (time_watcher &w)
969{
970 SET_R (this);
971 SET_LOCALE (locale);
972
973 refresh_limit = 1;
974 refresh_count = 0;
682 flush (); 975 flush ();
683} 976}
684 977
685#ifdef CURSOR_BLINK 978#ifdef CURSOR_BLINK
686void 979void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 997 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 998 }
706} 999}
707#endif 1000#endif
708 1001
1002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1003void
1004rxvt_term::cont_scroll_cb (time_watcher &w)
1005{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 }
1013}
1014#endif
1015
1016#ifdef SELECTION_SCROLLING
1017void
1018rxvt_term::sel_scroll_cb (time_watcher &w)
1019{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 }
1027}
1028#endif
1029
1030#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1031void
1032rxvt_term::slip_wheel_cb (time_watcher &w)
1033{
1034 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed))
1037 {
1038 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 }
1042}
1043#endif
1044
709bool 1045bool
710rxvt_term::pty_fill () 1046rxvt_term::pty_fill ()
711{ 1047{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049
1050 if (CBUFSIZ == n)
1051 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0;
1054 }
713 1055
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1056 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1057 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1058 cmdbuf_endp = cmdbuf_ptr + n;
717 1059
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
719 1061
720 if (n > 0) 1062 if (n > 0)
721 { 1063 {
722 cmdbuf_endp += n; 1064 cmdbuf_endp += n;
723 return true; 1065 return true;
… …
732rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1075{
734 SET_R (this); 1076 SET_R (this);
735 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
736 1078
1079 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ())
1082 if (cmd_parse ())
1083 break;
1084
737 if (revents & EVENT_WRITE) 1085 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1086 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1087}
759 1088
760bool 1089void
761rxvt_term::cmd_parse () 1090rxvt_term::pointer_unblank ()
762{ 1091{
763 bool flag = false; 1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1093 recolour_cursor ();
765 1094
766 for (;;) 1095#ifdef POINTER_BLANK
767 { 1096 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1097
771 if (ch == NOCHAR) // TODO: improve 1098 if (options & Opt_pointerBlank)
772 break; 1099 pointer_ev.start (NOW + pointerBlankDelay);
773 1100#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868uint32_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1101}
920 1102
921#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
922void 1104void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1105rxvt_term::pointer_blank ()
936{ 1106{
937 if (! (Options & Opt_pointerBlank)) 1107 if (! (options & Opt_pointerBlank))
938 return; 1108 return;
939 1109
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1110 XDefineCursor (display->display, TermWin.vt, blank_cursor);
941 XFlush (display->display); 1111 XFlush (display->display);
942 1112
… …
962 x = ev.x; 1132 x = ev.x;
963 y = ev.y; 1133 y = ev.y;
964 pixel_position (&x, &y); 1134 pixel_position (&x, &y);
965 1135
966 if (MEvent.button == AnyButton) 1136 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1137 button_number = 3;
969 }
970 else 1138 else
971 { 1139 {
972 button_number = MEvent.button - Button1; 1140 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1141 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1142 if (button_number >= 3)
975 button_number += (64 - 3); 1143 button_number += (64 - 3);
976 } 1144 }
977 1145
978 if (PrivateModes & PrivMode_MouseX10) 1146 if (priv_modes & PrivMode_MouseX10)
979 { 1147 {
980 /* 1148 /*
981 * do not report ButtonRelease 1149 * do not report ButtonRelease
982 * no state info allowed 1150 * no state info allowed
983 */ 1151 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1166 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1167 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1168#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1169 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1170#endif
1003
1004 } 1171 }
1005 1172
1006#ifdef DEBUG_MOUSEREPORT 1173#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1174 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1175 if (key_state & 16)
1009 fputc ('C', stderr); 1176 fputc ('C', stderr);
1010 if (key_state & 4) 1177 if (key_state & 4)
1011 fputc ('S', stderr); 1178 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1182 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1183 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1184 button_number,
1018 x + 1, 1185 x + 1,
1019 y + 1); 1186 y + 1);
1020#else 1187#endif
1188
1021 tt_printf ("\033[M%c%c%c", 1189 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1190 (32 + button_number + key_state),
1023 (32 + x + 1), 1191 (32 + x + 1),
1024 (32 + y + 1)); 1192 (32 + y + 1));
1025#endif
1026} 1193}
1027 1194
1028#ifdef USING_W11LIB 1195#ifdef USING_W11LIB
1029void 1196void
1030rxvt_W11_process_x_event (XEvent *ev) 1197rxvt_W11_process_x_event (XEvent *ev)
… …
1041{ 1208{
1042 SET_R (this); 1209 SET_R (this);
1043 SET_LOCALE (locale); 1210 SET_LOCALE (locale);
1044 1211
1045#if defined(CURSOR_BLINK) 1212#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1047 { 1214 {
1048 if (hidden_cursor) 1215 if (hidden_cursor)
1049 { 1216 {
1050 hidden_cursor = 0; 1217 hidden_cursor = 0;
1051 want_refresh = 1; 1218 want_refresh = 1;
… …
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 } 1222 }
1056#endif 1223#endif
1057 1224
1058#if defined(POINTER_BLANK) 1225#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 { 1227 {
1061 if (ev.type == MotionNotify 1228 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress 1229 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease) 1230 || ev.type == ButtonRelease)
1064 if (hidden_pointer) 1231 if (hidden_pointer)
… …
1067 if (ev.type == KeyPress && hidden_pointer == 0) 1234 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank (); 1235 pointer_blank ();
1069 } 1236 }
1070#endif 1237#endif
1071 1238
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1239 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1240 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1241 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1128#endif
1129 1242
1130 switch (ev.type) 1243 switch (ev.type)
1131 { 1244 {
1132 case KeyPress: 1245 case KeyPress:
1246#if ISO_14755
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1133 lookup_key (ev.xkey); 1249 lookup_key (ev.xkey);
1250
1251 break;
1252
1253 case KeyRelease:
1254 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1134 break; 1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1135 1314
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 if (! (ev.xkey.state & ControlMask)) 1316 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1140 mouse_slip_wheel_speed = 0; 1319 mouse_slip_wheel_speed = 0;
1141 else 1320#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1321 break;
1150 } 1322 }
1151#endif
1152 1323
1153 case ButtonPress: 1324 case ButtonPress:
1154 button_press (ev.xbutton); 1325 button_press (ev.xbutton);
1155 break; 1326 break;
1156 1327
… …
1168 && (ev.xclient.data.l[0] == DndFile 1339 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1340 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1341 || ev.xclient.data.l[0] == DndLink))
1171 { 1342 {
1172 /* Get Dnd data */ 1343 /* Get Dnd data */
1173 Atom ActualType; 1344 Atom ActualType;
1174 int ActualFormat; 1345 int ActualFormat;
1175 unsigned char *data; 1346 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1347 unsigned long Size, RemainingBytes;
1177 1348
1178 XGetWindowProperty (display->display, display->root, 1349 XGetWindowProperty (display->display, display->root,
1179 xa[XA_DNDSELECTION], 1350 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1351 0L, 1000000L,
1181 False, AnyPropertyType, 1352 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1353 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1354 &Size, &RemainingBytes,
1184 &data); 1355 &data);
1185 XChangeProperty (display->display, display->root, 1356 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1357 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1358 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1191 } 1360 }
1192#endif /* OFFIX_DND */ 1361#endif /* OFFIX_DND */
1193 break; 1362 break;
1194 1363
1195 case MappingNotify: 1364 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1365 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1366 break;
1198 1367
1199 /* 1368 /*
1200 * XXX: this is not the _current_ arrangement 1369 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1370 * Here's my conclusion:
… …
1226 { 1395 {
1227 TermWin.focus = 1; 1396 TermWin.focus = 1;
1228 want_refresh = 1; 1397 want_refresh = 1;
1229#ifdef USE_XIM 1398#ifdef USE_XIM
1230 if (Input_Context != NULL) 1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1231 XSetICFocus (Input_Context); 1402 XSetICFocus (Input_Context);
1403 }
1232#endif 1404#endif
1233#ifdef CURSOR_BLINK 1405#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1406 if (options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1236#endif 1415#endif
1237 1416
1238 } 1417 }
1239 break; 1418 break;
1240 1419
1241 case FocusOut: 1420 case FocusOut:
1242 if (TermWin.focus) 1421 if (TermWin.focus)
1243 { 1422 {
1244 TermWin.focus = 0; 1423 TermWin.focus = 0;
1245 want_refresh = 1; 1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1246#ifdef USE_XIM 1432#ifdef USE_XIM
1247 if (Input_Context != NULL) 1433 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context); 1434 XUnsetICFocus (Input_Context);
1249#endif 1435#endif
1250#ifdef CURSOR_BLINK 1436#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1437 if (options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1438 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1439 hidden_cursor = 0;
1254#endif 1440#endif
1255 1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1256 } 1448 }
1257 break; 1449 break;
1258 1450
1259 case ConfigureNotify: 1451 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == TermWin.parent[0])
… …
1269 } 1461 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1463
1272 if (szHint.width != width || szHint.height != height) 1464 if (szHint.width != width || szHint.height != height)
1273 { 1465 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1466 seen_resize = 1;
1275 resize_all_windows (width, height, 1); 1467 resize_all_windows (width, height, 1);
1276 } 1468 }
1277#ifdef DEBUG_SIZE 1469
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1471 if (options & Opt_transparent)
1285 {
1286 check_our_parents (); 1472 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif 1473#endif
1291
1292 } 1474 }
1293 break; 1475 break;
1294 1476
1477 case PropertyNotify:
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481
1482 break;
1483
1295 case SelectionClear: 1484 case SelectionClear:
1296 display->set_selection_owner (0); 1485 selection_clear ();
1297 break; 1486 break;
1298 1487
1299 case SelectionNotify: 1488 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1489 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1490 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1491 break;
1304 1492
1305 case SelectionRequest: 1493 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1494 selection_send (ev.xselectionrequest);
1307 break; 1495 break;
… …
1328 1516
1329 case GraphicsExpose: 1517 case GraphicsExpose:
1330 case Expose: 1518 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1519 if (ev.xany.window == TermWin.vt)
1332 { 1520 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1521 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1525
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1531
1341 // ev.xexpose.width, TermWin.height, False); 1532 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1533 }
1345 else 1534 else
1346 { 1535 {
1347 XEvent unused_event; 1536 XEvent unused_event;
1348 1537
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1350 Expose, 1539 ;
1351 &unused_event)) ;
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1353 GraphicsExpose, 1541 ;
1354 &unused_event)) ; 1542
1355 if (isScrollbarWindow (ev.xany.window)) 1543 if (isScrollbarWindow (ev.xany.window))
1356 { 1544 {
1357 scrollBar.setIdle (); 1545 scrollBar.setIdle ();
1358 scrollbar_show (0); 1546 scrollbar_show (0);
1359 } 1547 }
1360#ifdef MENUBAR 1548#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1550 menubar_expose ();
1363#endif 1551#endif
1552
1553#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window);
1556#endif
1364 } 1557 }
1365 break; 1558 break;
1366 1559
1367 case MotionNotify: 1560 case MotionNotify:
1368#ifdef POINTER_BLANK 1561#ifdef POINTER_BLANK
… …
1374 { 1567 {
1375 menubar_control (ev.xbutton); 1568 menubar_control (ev.xbutton);
1376 break; 1569 break;
1377 } 1570 }
1378#endif 1571#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1573 break;
1381 1574
1382 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == TermWin.vt)
1383 { 1576 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1577 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1578 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1387 ; 1580 ;
1388 1581
1389 XQueryPointer (display->display, TermWin.vt, 1582 XQueryPointer (display->display, TermWin.vt,
1390 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1585 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1586 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1588 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1589 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1590 {
1398#endif 1591#endif
1592#if ISO_14755
1593 // 5.4
1594 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 {
1596 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1597 break;
1598 }
1599#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1600 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1601 ev.xbutton.state & Button3Mask ? 2 : 0);
1602
1401#ifdef SELECTION_SCROLLING 1603#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1604 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1606 {
1405 int dist; 1607 int dist;
1406 1608
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1411 */ 1611 */
1412 if (scroll_selection_delay<=0) 1612 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1613 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1614
1415 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1417 */ 1617 */
1418 selection_save_x=ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1619 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1621
1423 /* calc number of lines to scroll */ 1622 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1623 if (ev.xbutton.y < TermWin.int_bwidth)
1425 { 1624 {
1426 scroll_selection_dir = UP; 1625 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1626 dist = TermWin.int_bwidth - ev.xbutton.y;
1428 } 1627 }
1429 else 1628 else
1430 { 1629 {
1431 scroll_selection_dir = DN; 1630 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y -
1433 (TermWin.int_bwidth + TermWin.height); 1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1434 } 1632 }
1633
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1634 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1635 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1;
1437 MIN_IT (scroll_selection_lines, 1637 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1638 SELECTION_SCROLL_MAX_LINES);
1439 } 1639 }
1440 else 1640 else
1441 { 1641 {
1442 /* we are within the text window, so we 1642 /* we are within the text window, so we
1443 * shouldn't be scrolling 1643 * shouldn't be scrolling
1444 */ 1644 */
1445 pending_scroll_selection = 0; 1645 if (sel_scroll_ev.active)
1646 sel_scroll_ev.stop();
1446 } 1647 }
1447#endif 1648#endif
1448#ifdef MOUSE_THRESHOLD 1649#ifdef MOUSE_THRESHOLD
1449
1450 } 1650 }
1451#endif 1651#endif
1452
1453 } 1652 }
1454 } 1653 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1655 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1458 MotionNotify, &ev)) ; 1657 MotionNotify, &ev))
1658 ;
1659
1459 XQueryPointer (display->display, scrollBar.win, 1660 XQueryPointer (display->display, scrollBar.win,
1460 &unused_root, &unused_child, 1661 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1662 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1663 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1664 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1666 scrollbar_size ());
1466 scr_refresh (refresh_type); 1667 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1668 refresh_limit = 0;
… …
1469 } 1670 }
1470 break; 1671 break;
1471 } 1672 }
1472} 1673}
1473 1674
1675#if TRANSPARENT
1474void 1676void
1475rxvt_term::rootwin_cb (XEvent &ev) 1677rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1678{
1477 SET_R (this); 1679 SET_R (this);
1478 SET_LOCALE (locale); 1680 SET_LOCALE (locale);
1479 1681
1480 switch (ev.type) 1682 switch (ev.type)
1481 { 1683 {
1482 case PropertyNotify: 1684 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1685 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1686 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on. 1687 * use the property to determine the pixmap. We use it later on.
1495 */ 1688 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1691 return;
1501 }
1502 1692
1503 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1504 case ReparentNotify: 1694 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1696 want_refresh = want_full_refresh = 1;
1508 break; 1697 break;
1509#endif
1510 } 1698 }
1511} 1699}
1700#endif
1512 1701
1513void 1702void
1514rxvt_term::button_press (XButtonEvent &ev) 1703rxvt_term::button_press (XButtonEvent &ev)
1515{ 1704{
1516 int reportmode = 0, clickintime; 1705 int reportmode = 0, clickintime;
1517 1706
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate) 1708 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1709 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710
1521 /* 1711 /*
1522 * VT window processing of button press 1712 * VT window processing of button press
1523 */ 1713 */
1524 if (ev.window == TermWin.vt) 1714 if (ev.window == TermWin.vt)
1525 { 1715 {
1716#if ISO_14755
1717 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 {
1720 iso14755_54 (ev.x, ev.y);
1721 return;
1722 }
1723#endif
1724
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1725 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1726
1527 if (reportmode) 1727 if (reportmode)
1528 { 1728 {
1529 /* mouse report from vt window */ 1729 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1730 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1731 MEvent.state = ev.state;
… …
1560 } 1760 }
1561 else 1761 else
1562 { 1762 {
1563 if (ev.button != MEvent.button) 1763 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1764 MEvent.clicks = 0;
1765
1565 switch (ev.button) 1766 switch (ev.button)
1566 { 1767 {
1567 case Button1: 1768 case Button1:
1769 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */
1771#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask);
1773#else
1774 selection.rect = false;
1775#endif
1776
1568 /* allow shift+left click to extend selection */ 1777 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1779 {
1571 if (MEvent.button == Button1 && clickintime) 1780 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1781 selection_rotate (ev.x, ev.y);
1573 else 1782 else
1574 selection_extend (ev.x, ev.y, 1); 1783 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1798 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1799 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1800 selection_rotate (ev.x, ev.y);
1592 else 1801 else
1593 selection_extend (ev.x, ev.y, 1); 1802 selection_extend (ev.x, ev.y, 1);
1803
1594 MEvent.button = Button3; 1804 MEvent.button = Button3;
1595 break; 1805 break;
1596 } 1806 }
1597 } 1807 }
1808
1598 MEvent.time = ev.time; 1809 MEvent.time = ev.time;
1599 return; 1810 return;
1600 } 1811 }
1601 1812
1602 /* 1813 /*
… …
1668 upordown = 1; /* down */ 1879 upordown = 1; /* down */
1669 } 1880 }
1670 if (upordown) 1881 if (upordown)
1671 { 1882 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1883#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1884 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1885#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1886 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1887 {
1677 if (upordown < 0) 1888 if (upordown < 0)
1678 scrollBar.setUp (); 1889 scrollBar.setUp ();
… …
1694 break; 1905 break;
1695 case R_SB_ALIGN_BOTTOM: 1906 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1907 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1908 break;
1698 } 1909 }
1910
1699 if (scrollBar.style == R_SB_XTERM 1911 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1912 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1913 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1914 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1915
1704 scrollBar.setMotion (); 1916 scrollBar.setMotion ();
1705 break; 1917 break;
1706 1918
1707 case Button1: 1919 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1920 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1944 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1945 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1946 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1947 / scrollbar_size ()));
1736 } 1948 }
1949
1737 break; 1950 break;
1738 } 1951 }
1739 } 1952 }
1740 return; 1953 return;
1741 } 1954 }
… …
1753{ 1966{
1754 int reportmode = 0; 1967 int reportmode = 0;
1755 1968
1756 csrO = 0; /* reset csr Offset */ 1969 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 1970 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1971 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 1972
1760 if (scrollbar_isUpDn ()) 1973 if (scrollbar_isUpDn ())
1761 { 1974 {
1762 scrollBar.setIdle (); 1975 scrollBar.setIdle ();
1763 scrollbar_show (0); 1976 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 1978 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1979#endif
1767
1768 } 1980 }
1981
1769#ifdef SELECTION_SCROLLING 1982#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1983 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop();
1771#endif 1985#endif
1986
1772 if (ev.window == TermWin.vt) 1987 if (ev.window == TermWin.vt)
1773 { 1988 {
1989#if ISO_14755
1990 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return;
1993#endif
1774 if (reportmode) 1994 if (reportmode)
1775 { 1995 {
1776 /* mouse report from vt window */ 1996 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 1997 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 1998 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2012 MEvent.button = AnyButton;
1793 mouse_report (ev); 2013 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2014#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2015 return;
1796 } 2016 }
2017
1797 /* 2018 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2019 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2020 * when overriding mouse reporting
1800 */ 2021 */
1801 if (PrivateModes & PrivMode_mouse_report 2022 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2023 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2024 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2025 selection_extend (ev.x, ev.y, 0);
1805 2026
1806 switch (ev.button) 2027 switch (ev.button)
… …
1817 case Button5: 2038 case Button5:
1818 { 2039 {
1819 int i; 2040 int i;
1820 page_dirn v; 2041 page_dirn v;
1821 2042
1822 v = (ev.button == Button4) ? UP : DN; 2043 v = ev.button == Button4 ? UP : DN;
2044
1823 if (ev.state & ShiftMask) 2045 if (ev.state & ShiftMask)
1824 i = 1; 2046 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2047 else if (options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 2048 i = TermWin.nrow - 1;
1827 else 2049 else
1828 i = 5; 2050 i = 5;
2051
1829# ifdef MOUSE_SLIP_WHEELING 2052# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2053 if (ev.state & ControlMask)
1831 { 2054 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2055 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2058
2059 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061
2062 slip_wheel_ev.start ();
1834 } 2063 }
2064 else
2065 {
1835# endif 2066# endif
1836# ifdef JUMP_MOUSE_WHEEL 2067# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 2068 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2069 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1); 2070 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING
1846 } 2080 }
1847# endif 2081#endif
1848
1849 } 2082 }
1850 break; 2083 break;
1851#endif 2084#endif
1852
1853 } 2085 }
1854 } 2086 }
1855#ifdef MENUBAR 2087#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2088 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2089 menubar_control (ev);
1858#endif 2090#endif
1859} 2091}
1860 2092
1861
1862#ifdef TRANSPARENT 2093#ifdef TRANSPARENT
2094#if TINTING
2095/* taken from aterm-0.4.2 */
2096
2097typedef uint32_t RUINT32T;
2098
2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2100{
2101 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i;
2107
2108 Visual* visual = display->visual;
2109
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111
2112 /* for convenience */
2113 mask_r = visual->red_mask;
2114 mask_g = visual->green_mask;
2115 mask_b = visual->blue_mask;
2116
2117 /* boring lookup table pre-initialization */
2118 switch (srcImage->bits_per_pixel) {
2119 case 15:
2120 if ((mask_r != 0x7c00) ||
2121 (mask_g != 0x03e0) ||
2122 (mask_b != 0x001f))
2123 return;
2124 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2125 lookup_r = lookup;
2126 lookup_g = lookup+32;
2127 lookup_b = lookup+32+32;
2128 sh_r = 10;
2129 sh_g = 5;
2130 sh_b = 0;
2131 break;
2132 case 16:
2133 if ((mask_r != 0xf800) ||
2134 (mask_g != 0x07e0) ||
2135 (mask_b != 0x001f))
2136 return;
2137 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2138 lookup_r = lookup;
2139 lookup_g = lookup+32;
2140 lookup_b = lookup+32+64;
2141 sh_r = 11;
2142 sh_g = 5;
2143 sh_b = 0;
2144 break;
2145 case 24:
2146 if ((mask_r != 0xff0000) ||
2147 (mask_g != 0x00ff00) ||
2148 (mask_b != 0x0000ff))
2149 return;
2150 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2151 lookup_r = lookup;
2152 lookup_g = lookup+256;
2153 lookup_b = lookup+256+256;
2154 sh_r = 16;
2155 sh_g = 8;
2156 sh_b = 0;
2157 break;
2158 case 32:
2159 if ((mask_r != 0xff0000) ||
2160 (mask_g != 0x00ff00) ||
2161 (mask_b != 0x0000ff))
2162 return;
2163 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2164 lookup_r = lookup;
2165 lookup_g = lookup+256;
2166 lookup_b = lookup+256+256;
2167 sh_r = 16;
2168 sh_g = 8;
2169 sh_b = 0;
2170 break;
2171 default:
2172 return; /* we do not support this color depth */
2173 }
2174
2175 /* prepare limits for color transformation (each channel is handled separately) */
2176 if (shade < 0) {
2177 shade = -shade;
2178 if (shade < 0) shade = 0;
2179 if (shade > 100) shade = 100;
2180
2181 lower_lim_r = 65535-rm;
2182 lower_lim_g = 65535-gm;
2183 lower_lim_b = 65535-bm;
2184
2185 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2186 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2187 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2188
2189 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2190 } else {
2191 if (shade < 0) shade = 0;
2192 if (shade > 100) shade = 100;
2193
2194 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2195
2196 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2197 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2198 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2199 }
2200
2201 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2202 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2203 {
2204 unsigned int tmp;
2205
2206 tmp = lower_lim_r;
2207 lower_lim_r = lower_lim_b;
2208 lower_lim_b = tmp;
2209
2210 tmp = upper_lim_r;
2211 upper_lim_r = upper_lim_b;
2212 upper_lim_b = tmp;
2213 }
2214
2215 /* fill our lookup tables */
2216 for (i = 0; i <= mask_r>>sh_r; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2220 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2221 lookup_r[i] = (tmp/65535)<<sh_r;
2222 }
2223 for (i = 0; i <= mask_g>>sh_g; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2227 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2228 lookup_g[i] = (tmp/65535)<<sh_g;
2229 }
2230 for (i = 0; i <= mask_b>>sh_b; i++)
2231 {
2232 RUINT32T tmp;
2233 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2234 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2235 lookup_b[i] = (tmp/65535)<<sh_b;
2236 }
2237
2238 /* apply table to input image (replacing colors by newly calculated ones) */
2239 switch (srcImage->bits_per_pixel)
2240 {
2241 case 15:
2242 {
2243 unsigned short *p1, *pf, *p, *pl;
2244 p1 = (unsigned short *) srcImage->data;
2245 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2246 while (p1 < pf)
2247 {
2248 p = p1;
2249 pl = p1 + srcImage->width;
2250 for (; p < pl; p++)
2251 {
2252 *p = lookup_r[(*p & 0x7c00)>>10] |
2253 lookup_g[(*p & 0x03e0)>> 5] |
2254 lookup_b[(*p & 0x001f)];
2255 }
2256 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2257 }
2258 break;
2259 }
2260 case 16:
2261 {
2262 unsigned short *p1, *pf, *p, *pl;
2263 p1 = (unsigned short *) srcImage->data;
2264 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2265 while (p1 < pf)
2266 {
2267 p = p1;
2268 pl = p1 + srcImage->width;
2269 for (; p < pl; p++)
2270 {
2271 *p = lookup_r[(*p & 0xf800)>>11] |
2272 lookup_g[(*p & 0x07e0)>> 5] |
2273 lookup_b[(*p & 0x001f)];
2274 }
2275 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2276 }
2277 break;
2278 }
2279 case 24:
2280 {
2281 unsigned char *p1, *pf, *p, *pl;
2282 p1 = (unsigned char *) srcImage->data;
2283 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width * 3;
2288 for (; p < pl; p += 3)
2289 {
2290 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2291 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2292 p[2] = lookup_r[(p[2] & 0x0000ff)];
2293 }
2294 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 case 32:
2299 {
2300 RUINT32T *p1, *pf, *p, *pl;
2301 p1 = (RUINT32T *) srcImage->data;
2302 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2303
2304 while (p1 < pf)
2305 {
2306 p = p1;
2307 pl = p1 + srcImage->width;
2308 for (; p < pl; p++)
2309 {
2310 *p = lookup_r[(*p & 0xff0000)>>16] |
2311 lookup_g[(*p & 0x00ff00)>> 8] |
2312 lookup_b[(*p & 0x0000ff)] |
2313 (*p & ~0xffffff);
2314 }
2315 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2316 }
2317 break;
2318 }
2319 }
2320
2321 free (lookup);
2322}
2323#endif
2324
1863/* 2325/*
1864 * Check our parents are still who we think they are. 2326 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2327 * Do transparency updates if required
1866 */ 2328 */
1867int 2329int
1868rxvt_term::check_our_parents () 2330rxvt_term::check_our_parents ()
1869{ 2331{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2332 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2333 unsigned long nitems, bytes_after;
1872 Atom atype; 2334 Atom atype;
1873 unsigned char *prop = NULL; 2335 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2336 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2337 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2338 XWindowAttributes wattr, wrootattr;
1877 2339
1878 pchanged = 0; 2340 pchanged = 0;
1879 2341
1880 if (! (Options & Opt_transparent)) 2342 if (!(options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
1882 2344
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2346 rootdepth = wrootattr.depth;
1885 2347
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2349
1887 if (rootdepth != wattr.depth) 2350 if (rootdepth != wattr.depth)
1888 { 2351 {
1889 if (am_transparent) 2352 if (am_transparent)
1890 { 2353 {
1891 pchanged = 1; 2354 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2356 am_transparent = am_pixmap_trans = 0;
1895 } 2357 }
2358
1896 return pchanged; /* Don't try any more */ 2359 return pchanged; /* Don't try any more */
1897 } 2360 }
1898 2361
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2362 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2363 XSync (display->display, False);
… …
1902 /* 2365 /*
1903 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
1906 */ 2369 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2370 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2373 &nitems, &bytes_after, &prop) == Success);
2374
1911 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success);
2380
2381 if (!i || prop == NULL
2382#if TINTING
2383 || !rs[Rs_color + Color_tint]
2384#endif
2385 )
1912 have_pixmap = 0; 2386 have_pixmap = 0;
1913 else 2387 else
1914 { 2388 {
1915 have_pixmap = 1; 2389 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2390 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2391 XFree (prop);
1918 } 2392 }
2393
1919 if (have_pixmap) 2394 if (have_pixmap)
1920 { 2395 {
1921 /* 2396 /*
1922 * Copy display->root pixmap transparency 2397 * Copy display->root pixmap transparency
1923 */ 2398 */
… …
1927 XImage *image; 2402 XImage *image;
1928 GC gc; 2403 GC gc;
1929 XGCValues gcvalue; 2404 XGCValues gcvalue;
1930 2405
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2407 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2408 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2409 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2410 nx = ny = 0;
1936 2411
1937 if (sx < 0) 2412 if (sx < 0)
… …
1948 sy = 0; 2423 sy = 0;
1949 } 2424 }
1950 2425
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
1953 allowedxerror = -1; 2430 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2432
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2434 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2435 allowedxerror = 0;
2436
1959 if (image == NULL) 2437 if (image == NULL)
1960 { 2438 {
1961 if (am_transparent && am_pixmap_trans) 2439 if (am_transparent && am_pixmap_trans)
1962 { 2440 {
1963 pchanged = 1; 2441 pchanged = 1;
… …
1965 { 2443 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2444 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2445 TermWin.pixmap = None;
1968 } 2446 }
1969 } 2447 }
2448
1970 am_pixmap_trans = 0; 2449 am_pixmap_trans = 0;
1971 } 2450 }
1972 else 2451 else
1973 { 2452 {
1974 if (TermWin.pixmap != None) 2453 if (TermWin.pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2454 XFreePixmap (display->display, TermWin.pixmap);
2455
2456#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint))
2458 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2463
2464 ShadeXImage (display, image, shade, rm, gm, bm);
2465 }
2466#endif
2467
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2469 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2472 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2473 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2474 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2476 XClearWindow (display->display, TermWin.parent[0]);
2477
1988 if (!am_transparent || !am_pixmap_trans) 2478 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2479 pchanged = 1;
2480
1990 am_transparent = am_pixmap_trans = 1; 2481 am_transparent = am_pixmap_trans = 1;
1991 } 2482 }
1992 } 2483 }
1993 2484
1994 if (!am_pixmap_trans) 2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
1995 { 2488 {
1996 unsigned int n; 2489 unsigned int n;
1997 /* 2490 /*
1998 * InheritPixmap transparency 2491 * InheritPixmap transparency
1999 */ 2492 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2494 {
2004 oldp = TermWin.parent[i]; 2495 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2497 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2498 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2499
2009 if (TermWin.parent[i] == display->root) 2500 if (TermWin.parent[i] == display->root)
2010 { 2501 {
2011 if (oldp != None) 2502 if (oldp != None)
2012 pchanged = 1; 2503 pchanged = 1;
2504
2013 break; 2505 break;
2014 } 2506 }
2507
2015 if (oldp != TermWin.parent[i]) 2508 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2509 pchanged = 1;
2017 } 2510 }
2018 2511
2019 n = 0; 2512 n = 0;
… …
2021 if (pchanged) 2514 if (pchanged)
2022 { 2515 {
2023 for (; n < (unsigned int)i; n++) 2516 for (; n < (unsigned int)i; n++)
2024 { 2517 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2520 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2030 break; 2522 break;
2031 } 2523 }
2032 } 2524 }
2033 } 2525 }
2034 2526
2035 if (n > (int) (sizeof (TermWin.parent) 2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2528 {
2038 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2531 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2532 /* XXX: also turn off Opt_transparent? */
2045 } 2533 }
2046 else 2534 else
2047 { 2535 {
2536#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2537 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2538 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2539 sleep (1);
2058# endif 2540#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2541 for (n = 0; n < (unsigned int)i; n++)
2542 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2544 XClearWindow (display->display, TermWin.parent[n]);
2545 }
2546
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2548 am_transparent = 1;
2066 } 2549 }
2067 2550
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2552 TermWin.parent[i] = None;
2070 } 2553 }
2554
2555 if (scrollBar.win)
2556 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle ();
2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2567 }
2568
2071 return pchanged; 2569 return pchanged;
2072} 2570}
2073#endif 2571#endif
2074 2572
2075/*}}} */ 2573/*}}} */
2574
2575bool
2576rxvt_term::cmd_parse ()
2577{
2578 bool flag = false;
2579 unicode_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here
2581
2582 for (;;)
2583 {
2584 if (ch == NOCHAR)
2585 {
2586 seq_begin = cmdbuf_ptr;
2587 ch = next_char ();
2588 }
2589
2590 if (ch == NOCHAR) // TODO: improve
2591 break;
2592
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 {
2595 if (!seen_input)
2596 {
2597 seen_input = 1;
2598 // many badly-written programs (e.g. jed) contain a race condition:
2599 // they first read the screensize and then install a SIGWINCH handler.
2600 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized.
2605 if (seen_resize)
2606 kill (-cmd_pid, SIGWINCH);
2607 }
2608
2609 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ];
2611 bool refreshnow = false;
2612 int nlines = 0;
2613 unicode_t *str = buf;
2614
2615 for (;;)
2616 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break;
2619
2620 *str++ = ch;
2621
2622 if (ch == C0_LF)
2623 {
2624 nlines++;
2625 refresh_count++;
2626
2627 if (!(options & Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2629 {
2630 refreshnow = true;
2631 ch = NOCHAR;
2632 break;
2633 }
2634
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2636 if (nlines >= TermWin.nrow - 1)
2637 {
2638 scr_add_lines (buf, nlines, str - buf);
2639 nlines = 0;
2640 str = buf;
2641 }
2642 }
2643
2644 if (str >= buf + UBUFSIZ)
2645 {
2646 ch = NOCHAR;
2647 break;
2648 }
2649
2650 seq_begin = cmdbuf_ptr;
2651 ch = next_char ();
2652 }
2653
2654 scr_add_lines (buf, nlines, str - buf);
2655
2656 /*
2657 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling.
2661 */
2662 if (refreshnow)
2663 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++;
2666 else
2667 {
2668 flag = true;
2669 scr_refresh (refresh_type);
2670 }
2671 }
2672
2673 }
2674 else
2675 {
2676 try
2677 {
2678 process_nonprinting (ch);
2679 }
2680 catch (const class out_of_input &o)
2681 {
2682 // we ran out of input, retry later
2683 cmdbuf_ptr = seq_begin;
2684 break;
2685 }
2686
2687 ch = NOCHAR;
2688 }
2689 }
2690
2691 return flag;
2692}
2693
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character
2704unicode_t
2705rxvt_term::next_char ()
2706{
2707 while (cmdbuf_ptr < cmdbuf_endp)
2708 {
2709 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++;
2712
2713 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715
2716 if (len == (size_t)-2)
2717 {
2718 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp;
2720 break;
2721 }
2722
2723 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725
2726 // assume wchar == unicode
2727 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK;
2729 }
2730
2731 return NOCHAR;
2732}
2733
2734/* rxvt_cmd_getc () - Return next input character */
2735/*
2736 * Return the next input character after first passing any keyboard input
2737 * to the command.
2738 */
2739unicode_t
2740rxvt_term::cmd_getc ()
2741{
2742 unicode_t c = next_char ();
2743
2744 if (c == NOCHAR)
2745 throw out_of_input;
2746
2747 return c;
2748}
2749
2750unicode_t
2751rxvt_term::cmd_get8 ()
2752{
2753 unicode_t c = next_octet ();
2754
2755 if (c == NOCHAR)
2756 throw out_of_input;
2757
2758 return c;
2759}
2076 2760
2077/*{{{ print pipe */ 2761/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2762/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2763#ifdef PRINTPIPE
2080FILE * 2764FILE *
2081rxvt_term::popen_printer () 2765rxvt_term::popen_printer ()
2082{ 2766{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2767 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2768
2085 if (stream == NULL) 2769 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2770 rxvt_warn ("can't open printer pipe, not printing.\n");
2771
2087 return stream; 2772 return stream;
2088} 2773}
2089 2774
2090int 2775int
2091rxvt_term::pclose_printer (FILE *stream) 2776rxvt_term::pclose_printer (FILE *stream)
2092{ 2777{
2093 fflush (stream); 2778 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2779 return pclose (stream);
2100# endif
2101} 2780}
2102 2781
2103/* 2782/*
2104 * simulate attached vt100 printer 2783 * simulate attached vt100 printer
2105 */ 2784 */
2106void 2785void
2107rxvt_term::process_print_pipe () 2786rxvt_term::process_print_pipe ()
2108{ 2787{
2109 int done; 2788 int done;
2110 FILE *fd; 2789 FILE *fd;
2111 2790
2112 if ((fd = popen_printer ()) == NULL) 2791 if ((fd = popen_printer ()) == NULL)
2113 return; 2792 return;
2114 2793
2115 /* 2794 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2795 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2796 * is received.
2118 */ 2797 */
2119 for (done = 0; !done;) 2798 for (done = 0; !done;)
2120 { 2799 {
2121 unsigned char buf[8]; 2800 unsigned char buf[8];
2122 unsigned char ch; 2801 unicode_t ch;
2123 unsigned int i, len; 2802 unsigned int i, len;
2124 2803
2125 if ((ch = cmd_getc ()) != C0_ESC) 2804 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2805 {
2127 if (putc (ch, fd) == EOF) 2806 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2807 break; /* done = 1 */
… …
2143 { 2822 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2823 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2824 break; /* done = 1 */
2146 } 2825 }
2147 } 2826 }
2827
2148 for (i = 0; i < len; i++) 2828 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2829 if (putc (buf[i], fd) == EOF)
2150 { 2830 {
2151 done = 1; 2831 done = 1;
2152 break; 2832 break;
2153 } 2833 }
2154 } 2834 }
2155 } 2835 }
2836
2156 pclose_printer (fd); 2837 pclose_printer (fd);
2157} 2838}
2158#endif /* PRINTPIPE */ 2839#endif /* PRINTPIPE */
2159/*}}} */ 2840/*}}} */
2160 2841
2161/* *INDENT-OFF* */ 2842/* *INDENT-OFF* */
2162enum { 2843enum {
2163 C1_40 = 0x40, 2844 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2845 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2846 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2847 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2848 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2849};
2169/* *INDENT-ON* */ 2850/* *INDENT-ON* */
2170 2851
2171/*{{{ process non-printing single characters */ 2852/*{{{ process non-printing single characters */
2172void 2853void
2173rxvt_term::process_nonprinting (unsigned char ch) 2854rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2855{
2175 switch (ch) 2856 switch (ch)
2176 { 2857 {
2858 case C0_ESC:
2859 process_escape_seq ();
2860 break;
2177 case C0_ENQ: /* terminal Status */ 2861 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2862 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2865 else
2183 tt_write ((unsigned char *)VT100_ANS, 2866 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2867 (unsigned int)strlen (VT100_ANS));
2185 break; 2868 break;
2186 case C0_BEL: /* bell */ 2869 case C0_BEL: /* bell */
2187 scr_bell (); 2870 scr_bell ();
2188 break; 2871 break;
2189 case C0_BS: /* backspace */ 2872 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2887 scr_charset_choose (1);
2205 break; 2888 break;
2206 case C0_SI: /* shift in - acs */ 2889 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2890 scr_charset_choose (0);
2208 break; 2891 break;
2892
2893#ifdef EIGHT_BIT_CONTROLS
2894 // 8-bit controls
2895 case 0x90: /* DCS */
2896 process_dcs_seq ();
2897 break;
2898 case 0x9b: /* CSI */
2899 process_csi_seq ();
2900 break;
2901 case 0x9d: /* CSI */
2902 process_osc_seq ();
2903 break;
2904#endif
2209 } 2905 }
2210} 2906}
2211/*}}} */ 2907/*}}} */
2212 2908
2213 2909
2214/*{{{ process VT52 escape sequences */ 2910/*{{{ process VT52 escape sequences */
2215void 2911void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2912rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2913{
2218 int row, col; 2914 int row, col;
2219 2915
2220 switch (ch) 2916 switch (ch)
2221 { 2917 {
… …
2273 2969
2274/*{{{ process escape sequences */ 2970/*{{{ process escape sequences */
2275void 2971void
2276rxvt_term::process_escape_seq () 2972rxvt_term::process_escape_seq ()
2277{ 2973{
2278 unsigned char ch = cmd_getc (); 2974 unicode_t ch = cmd_getc ();
2279 2975
2280 if (PrivateModes & PrivMode_vt52) 2976 if (priv_modes & PrivMode_vt52)
2281 { 2977 {
2282 process_escape_vt52 (ch); 2978 process_escape_vt52 (ch);
2283 return; 2979 return;
2284 } 2980 }
2285 2981
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2996 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2997 break;
2302 case '+': 2998 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2999 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3000 break;
2305#ifndef NO_FRILLS 3001#if ENABLE_FRILLS
2306 case '6': 3002 case '6':
2307 scr_backindex (); 3003 scr_backindex ();
2308 break; 3004 break;
2309#endif 3005#endif
2310 case '7': 3006 case '7':
2311 scr_cursor (SAVE); 3007 scr_cursor (SAVE);
2312 break; 3008 break;
2313 case '8': 3009 case '8':
2314 scr_cursor (RESTORE); 3010 scr_cursor (RESTORE);
2315 break; 3011 break;
2316#ifndef NO_FRILLS 3012#if ENABLE_FRILLS
2317 case '9': 3013 case '9':
2318 scr_forwardindex (); 3014 scr_forwardindex ();
2319 break; 3015 break;
2320#endif 3016#endif
2321 case '=': 3017 case '=':
… …
2331 break; 3027 break;
2332 3028
2333 /* 8.3.87: NEXT LINE */ 3029 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3030 case C1_NEL: /* ESC E */
2335 { 3031 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3032 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3033 scr_add_lines (nlcr, 1, 2);
2338 } 3034 }
2339 break; 3035 break;
2340 3036
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3037 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3048 case C1_RI: /* ESC M */
2353 scr_index (DN); 3049 scr_index (DN);
2354 break; 3050 break;
2355 3051
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3052 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3053 /*case C1_SS2: scr_single_shift (2); break; */
2358 3054
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3055 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3056 /*case C1_SS3: scr_single_shift (3); break; */
2361 3057
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3058 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3059 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3060 process_dcs_seq ();
2365 break; 3061 break;
… …
2380 process_osc_seq (); 3076 process_osc_seq ();
2381 break; 3077 break;
2382 3078
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3079 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3080 case 'c':
3081 mbstate.reset ();
2385 scr_poweron (); 3082 scr_poweron ();
2386 scrollbar_show (1); 3083 scrollbar_show (1);
2387 break; 3084 break;
2388 3085
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3086 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3098
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3099/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3100/* *INDENT-OFF* */
2404enum { 3101enum {
2405 CSI_ICH = 0x40, 3102 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3103 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3104 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3105 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3106 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3107 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3108 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3123 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3124 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3125 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3126 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3127 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3128 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3129 };
2433/* *INDENT-ON* */ 3130/* *INDENT-ON* */
2434 3131
2435void 3132void
2436rxvt_term::process_csi_seq () 3133rxvt_term::process_csi_seq ()
2437{ 3134{
2438 unsigned char ch, priv, i; 3135 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3136 unsigned int nargs, p;
2440 int n, ndef; 3137 int n, ndef;
2441 int arg[ESC_ARGS]; 3138 int arg[ESC_ARGS];
2442 3139
2443 for (nargs = ESC_ARGS; nargs > 0;) 3140 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3141 arg[--nargs] = 0;
2445 3142
2446 priv = 0; 3143 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3145 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3146 { /* '<' '=' '>' '?' */
2450 priv = ch; 3147 priv = ch;
2451 ch = cmd_getc (); 3148 ch = cmd_getc ();
2452 } 3149 }
3150
2453 /* read any numerical arguments */ 3151 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3152 for (n = -1; ch < CSI_ICH; )
2455 { 3153 {
2456 if (isdigit (ch)) 3154 if (isdigit (ch))
2457 { 3155 {
… …
2464 { 3162 {
2465 if (nargs < ESC_ARGS) 3163 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3164 arg[nargs++] = n;
2467 n = -1; 3165 n = -1;
2468 } 3166 }
2469 else if (ch == '\b') 3167 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3168 process_nonprinting (ch);
2481 } 3169
2482 ch = cmd_getc (); 3170 ch = cmd_getc ();
2483 } 3171 }
2484 3172
2485 if (ch > CSI_7F) 3173 if (ch > CSI_7F)
2486 return; 3174 return;
… …
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2629 break; 3317 break;
2630 3318
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3320 tt_write ((const unsigned char *)VT100_ANS,
2633 (unsigned int) (sizeof (VT100_ANS) - 1)); 3321 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3322 break;
2635 3323
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3325 process_sgr_mode (nargs, arg);
2638 break; 3326 break;
… …
2644 tt_printf ("\033[0n"); 3332 tt_printf ("\033[0n");
2645 break; 3333 break;
2646 case 6: /* CPR requested */ 3334 case 6: /* CPR requested */
2647 scr_report_position (); 3335 scr_report_position ();
2648 break; 3336 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3337 case 7: /* unofficial extension */
3338 if (options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3339 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3340 break;
2653#endif
2654 case 8: /* unofficial extension */ 3341 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3343 break;
2657 } 3344 }
2658 break; 3345 break;
2659 3346
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3347 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3380 break;
2694 3381
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3382 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3383 if (arg[0] == 4)
2697 scr_insert_mode (0); 3384 scr_insert_mode (0);
3385 else if (arg[0] == 20)
3386 priv_modes &= ~PrivMode_LFNL;
2698 break; 3387 break;
2699 3388
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3389 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3390 if (arg[0] == 4)
2702 scr_insert_mode (1); 3391 scr_insert_mode (1);
3392 else if (arg[0] == 20)
3393 priv_modes |= PrivMode_LFNL;
2703 break; 3394 break;
2704 3395
2705 /* 3396 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3397 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3398 */
… …
2719 break; 3410 break;
2720 case CSI_75: 3411 case CSI_75:
2721 scr_cursor (RESTORE); 3412 scr_cursor (RESTORE);
2722 break; 3413 break;
2723 3414
2724#ifndef NO_FRILLS 3415#if ENABLE_FRILLS
2725 case CSI_74: 3416 case CSI_74:
2726 process_window_ops (arg, nargs); 3417 process_window_ops (arg, nargs);
2727 break; 3418 break;
2728#endif 3419#endif
2729 3420
2730 case CSI_78: /* DECREQTPARM */ 3421 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3422 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3423 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3424 break;
2734 3425
2735 default: 3426 default:
2736 break; 3427 break;
2737 } 3428 }
2738} 3429}
2739/*}}} */ 3430/*}}} */
2740 3431
2741#ifndef NO_FRILLS 3432#if ENABLE_FRILLS
2742/* ARGSUSED */ 3433/* ARGSUSED */
2743void 3434void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3435rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3436{
2746 int x, y; 3437 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3438 XWindowAttributes wattr;
2751 Window wdummy; 3439 Window wdummy;
2752 3440
2753 if (nargs == 0) 3441 if (nargs == 0)
2754 return; 3442 return;
3443
2755 switch (args[0]) 3444 switch (args[0])
2756 { 3445 {
2757 /* 3446 /*
2758 * commands 3447 * commands
2759 */ 3448 */
2760 case 1: /* deiconify window */ 3449 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3450 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3451 break;
2763 case 2: /* iconify window */ 3452 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3453 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3470 break;
2782 case 8: /* set size (chars) */ 3471 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3473 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3474 break;
3475
3476 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3477 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3478 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3479 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3480 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3481 break;
3482
3483
2791 /* 3484 /*
2792 * reports - some output format copied from XTerm 3485 * reports - some output format copied from XTerm
2793 */ 3486 */
2794 case 11: /* report window state */ 3487 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3490 break;
2798 case 13: /* report window position */ 3491 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3494 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3495 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3496 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3497 break;
2805 case 14: /* report window size (pixels) */ 3498 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3501 break;
2809 case 18: /* report window size (chars) */ 3502 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3504 break;
2812#if 0 /* XXX: currently disabled due to security concerns */ 3505 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3507 break;
2813 case 20: /* report icon label */ 3508 case 20: /* report icon label */
3509 {
3510 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3511 XGetIconName (display->display, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s);
3514 }
2816 break; 3515 break;
2817 case 21: /* report window title */ 3516 case 21: /* report window title */
3517 {
3518 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3519 XFetchName (display->display, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s);
3522 }
2820 break; 3523 break;
2821#endif
2822
2823 } 3524 }
2824} 3525}
2825#endif 3526#endif
2826 3527
2827/*----------------------------------------------------------------------*/ 3528/*----------------------------------------------------------------------*/
2828/* 3529/*
2829 * get input up until STRING TERMINATOR (or BEL) 3530 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3531 * ends_how is terminator used. returned input must be free()'d
2831 */ 3532 */
2832unsigned char * 3533unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3534rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3535{
2835 int seen_esc = 0; /* seen escape? */ 3536 unicode_t ch;
3537 bool seen_esc = false;
2836 unsigned int n = 0; 3538 unsigned int n = 0;
2837 unsigned char *s; 3539 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3540
2840 for (; (ch = cmd_getc ());) 3541 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3542 {
2842 if (ch == C0_BEL 3543 if (seen_esc)
2843 || ch == CHAR_ST 3544 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3545 if (ch == 0x5c) /* 7bit ST */
2845 break; 3546 break;
3547 else
3548 return NULL;
3549 }
2846 if (ch == C0_ESC) 3550 else if (ch == C0_ESC)
2847 { 3551 {
2848 seen_esc = 1; 3552 seen_esc = true;
2849 continue; 3553 continue;
2850 } 3554 }
2851 else if (ch == '\t') 3555 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3556 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3557 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3558 return NULL; /* other control character - exit */
3559
3560 seen_esc = false;
3561
2855 if (n < sizeof (string) - 1) 3562 if (n >= sizeof (string) - 1)
3563 // stop at some sane length
3564 return NULL;
3565
3566 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 ();
3568 else
2856 string[n++] = ch; 3569 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3570 }
3571
2859 string[n++] = '\0'; 3572 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3573
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3574 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3575
2864 return s; 3576 return (unsigned char *)rxvt_wcstombs (string);
2865} 3577}
2866 3578
2867/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
2868/* 3580/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3582 */
2871void 3583void
2872rxvt_term::process_dcs_seq () 3584rxvt_term::process_dcs_seq ()
2873{ 3585{
2874 unsigned char eh, *s; 3586 unsigned char *s;
3587 unicode_t eh;
3588
2875 /* 3589 /*
2876 * Not handled yet 3590 * Not handled yet
2877 */ 3591 */
2878 s = get_to_st (&eh); 3592 s = get_to_st (eh);
2879 if (s) 3593 if (s)
2880 free (s); 3594 free (s);
3595
2881 return; 3596 return;
2882} 3597}
2883 3598
2884/*----------------------------------------------------------------------*/ 3599/*----------------------------------------------------------------------*/
2885/* 3600/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3601 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3602 */
2888void 3603void
2889rxvt_term::process_osc_seq () 3604rxvt_term::process_osc_seq ()
2890{ 3605{
2891 unsigned char ch, eh, *s; 3606 unicode_t ch, eh;
2892 int arg; 3607 int arg;
2893 3608
2894 ch = cmd_getc (); 3609 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3610 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3611 arg = arg * 10 + (ch - '0');
2897 3612
2898 if (ch == ';') 3613 if (ch == ';')
2899 { 3614 {
2900 s = get_to_st (&eh); 3615 unsigned char *s = get_to_st (eh);
3616
2901 if (s) 3617 if (s)
2902 { 3618 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3619 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3620 free (s);
2916 } 3621 }
2917 } 3622 }
2918} 3623}
3624
3625void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3627{
3628 if (str[0] == '?' && !str[1])
3629 {
3630 unsigned short r, g, b;
3631 pix_colors_focused[color].get (display, r, g, b);
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3633 }
3634 else
3635 set_window_color (color, str);
3636}
3637
2919/* 3638/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3640 * 0 = change iconName/title
2922 * 1 = change iconName 3641 * 1 = change iconName
2923 * 2 = change title 3642 * 2 = change title
2924 * 4 = change color 3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
2925 * 12 = change text color 3646 * 12 = change text color
2926 * 13 = change mouse foreground color 3647 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3648 * 17 = change highlight character colour
2928 * 18 = change bold character color 3649 * 18 = change bold character color
2929 * 19 = change underlined character color 3650 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3651 * 46 = change logfile (not implemented)
2931 * 50 = change font 3652 * 50 = change font
2932 * 3653 *
2933 * rxvt extensions: 3654 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3655 * 20 = bg pixmap
2936 * 39 = change default fg color 3656 * 39 = change default fg color
2937 * 49 = change default bg color 3657 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3658 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3659 * 701 = change locale
2940 * 702 = find font 3660 * 702 = find font
3661 * 703 = menu
2941 */ 3662 */
2942void 3663void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2944{ 3665{
2945 int changed = 0; 3666 int changed = 0;
2946 int color; 3667 int color;
2947 char *buf, *name; 3668 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1];
3670 int saveop = op;
2948 3671
2949 assert (str != NULL); 3672 assert (str != NULL);
2950 switch (op) 3673 switch (op)
2951 { 3674 {
2952 case XTerm_name: 3675 case XTerm_name:
2953 set_title (str); 3676 set_title (str);
2954 /* FALLTHROUGH */ 3677 /* FALLTHROUGH */
2955 case XTerm_iconName: 3678 case XTerm_iconName:
2956 set_iconName (str); 3679 set_icon_name (str);
2957 break; 3680 break;
2958 case XTerm_title: 3681 case XTerm_title:
2959 set_title (str); 3682 set_title (str);
2960 break; 3683 break;
3684 case XTerm_property:
3685 if (str[0] == '?')
3686 {
3687 Atom prop = display->atom (str + 1);
3688 Atom actual_type;
3689 int actual_format;
3690 unsigned long nitems;
3691 unsigned long bytes_after;
3692 unsigned char *value = 0;
3693 const char *str = "";
3694
3695 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None
3701 && actual_format == 8)
3702 str = (const char *)(value);
3703
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3705
3706 XFree (value);
3707 }
3708 else
3709 {
3710 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3711
3712 if (eq)
3713 {
3714 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1);
3716 }
3717 else
3718 XDeleteProperty (display->display, TermWin.parent[0],
3719 display->atom (str));
3720 }
3721 break;
3722
2961 case XTerm_Color: 3723 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3724 for (buf = (char *)str; buf && *buf;)
2963 { 3725 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3726 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3727 break;
3728
2966 *name++ = '\0'; 3729 *name++ = '\0';
2967 color = atoi (buf); 3730 color = atoi (buf);
3731
2968 if (color < 0 || color >= TOTAL_COLORS) 3732 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3733 break;
3734
2970 if ((buf = STRCHR (name, ';')) != NULL) 3735 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3736 *buf++ = '\0';
3737
3738 if (name[0] == '?' && !name[1])
3739 {
3740 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 }
3744 else
2972 set_window_color (color + minCOLOR, name); 3745 set_window_color (color + minCOLOR, name);
2973 } 3746 }
3747 break;
3748 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3750 break;
3751 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3753 break;
2975#ifndef NO_CURSORCOLOR 3754#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3755 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3757 break;
2979#endif 3758#endif
2980 case XTerm_Color_pointer: 3759 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3761 break;
3762 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3764 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3765#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3766 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
2986 break; 3771 break;
2987 case XTerm_Color_UL: 3772 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3774 break;
2990 case XTerm_Color_RV: 3775 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3777 break;
2993#endif 3778#endif
2994 3779#if TRANSPARENT && TINTING
2995 case XTerm_Menu: 3780 case XTerm_Color_tint:
2996 /* 3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3782 check_our_parents ();
2998 * so DON'T do it here 3783 if (am_transparent)
2999 */ 3784 want_full_refresh = want_refresh = 1;
3000 break; 3785 break;
3786#endif
3787
3001 case XTerm_Pixmap: 3788 case XTerm_Pixmap:
3002 if (*str != ';') 3789 if (*str != ';')
3003 { 3790 {
3004#if XPM_BACKGROUND 3791#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3792 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3793 set_bgPixmap (str); /* change pixmap */
3007#endif 3794#endif
3008 scr_touch (true); 3795 scr_touch (true);
3009 } 3796 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3797 while ((str = strchr (str, ';')) != NULL)
3011 { 3798 {
3012 str++; 3799 str++;
3013#if XPM_BACKGROUND 3800#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3801 changed += scale_pixmap (str);
3015#endif 3802#endif
… …
3028 set_window_color (Color_fg, str); 3815 set_window_color (Color_fg, str);
3029 break; 3816 break;
3030 case XTerm_restoreBG: 3817 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3818 set_window_color (Color_bg, str);
3032 break; 3819 break;
3820
3033 case XTerm_logfile: 3821 case XTerm_logfile:
3822 // TODO, when secure mode?
3034 break; 3823 break;
3824
3035 case XTerm_font: 3825 case XTerm_font:
3036 change_font (str); 3826 op = URxvt_font;
3827 case URxvt_font:
3828#if ENABLE_STYLES
3829 case URxvt_boldFont:
3830 case URxvt_italicFont:
3831 case URxvt_boldItalicFont:
3832#endif
3833 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3837 resp);
3838 else
3839 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841
3842 res = strdup (str);
3843 allocated.push_back ((void *)res);
3844 set_fonts ();
3845 }
3037 break; 3846 break;
3038#ifndef NO_FRILLS 3847
3848#if ENABLE_FRILLS
3039 case XTerm_locale: 3849 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3850 if (query)
3041 tt_printf ("%-.250s\n", locale); 3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3042 else 3852 else
3043 { 3853 {
3044 set_locale (str); 3854 set_locale (str);
3045# ifdef USE_XIM 3855# ifdef USE_XIM
3046 im_cb (); 3856 im_cb ();
3047# endif 3857# endif
3048 } 3858 }
3049 break; 3859 break;
3860#endif
3861
3862#ifdef MENUBAR
3050 case XTerm_findfont: 3863 case XTerm_Menu:
3051 { 3864 if (options & Opt_insecure)
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break; 3866 break;
3056#endif 3867#endif
3057#if 0 3868#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3869 case XTerm_dumpscreen: /* no error notices */
3059 { 3870 {
3060 int fd; 3871 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3873 {
3063 scr_dump (fd); 3874 scr_dump (fd);
3064 close (fd); 3875 close (fd);
3065 } 3876 }
3066 } 3877 }
3067 break; 3878 break;
3068#endif 3879#endif
3069
3070 } 3880 }
3071} 3881}
3072/*----------------------------------------------------------------------*/ 3882/*----------------------------------------------------------------------*/
3073 3883
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3884/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3892 * so no need for fancy checking
3083 */ 3893 */
3084int 3894int
3085rxvt_term::privcases (int mode, unsigned long bit) 3895rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3896{
3087 int state; 3897 int state;
3088 3898
3089 if (mode == 's') 3899 if (mode == 's')
3090 { 3900 {
3091 SavedModes |= (PrivateModes & bit); 3901 SavedModes |= (priv_modes & bit);
3092 return -1; 3902 return -1;
3093 } 3903 }
3094 else 3904 else
3095 { 3905 {
3096 if (mode == 'r') 3906 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3907 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3908 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3909 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3910 PrivMode (state, bit);
3101 } 3911 }
3912
3102 return state; 3913 return state;
3103} 3914}
3104 3915
3105/* we're not using priv _yet_ */ 3916/* we're not using priv _yet_ */
3106void 3917void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 3919{
3109 unsigned int i, j; 3920 unsigned int i, j;
3110 int state; 3921 int state;
3922
3111 static const struct 3923 static const struct
3112 { 3924 {
3113 const int argval; 3925 const int argval;
3114 const unsigned long bit; 3926 const unsigned long bit;
3115 } 3927 }
3928
3116 argtopriv[] = { 3929 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3930 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3931 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3932 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3933 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3934 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3935 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3936 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3938 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3939#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 3940 { menuBar_esc, PrivMode_menuBar },
3127#endif 3941#endif
3942 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 3944#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3945 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3946#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 3947 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3948 { 40, PrivMode_132OK },
3949 // 41 xterm more fixes NYI
3950 // 45 margin bell NYI
3951 // 46 start logging
3134 { 47, PrivMode_Screen }, 3952 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3953 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3954#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3955 { 67, PrivMode_BackSpace },
3138#endif 3956#endif
3139 { 1000, PrivMode_MouseX11 }, 3957 { 1000, PrivMode_MouseX11 },
3958 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3959 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3960 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 3961 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 3962 { 1011, PrivMode_Keypress }, // rxvt extension
3963 // 1035 enable modifiers for alt, numlock NYI
3964 // 1036 send ESC for meta keys NYI
3965 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 3966 { 1047, PrivMode_Screen },
3967 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3968 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3969 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 3970 };
3145 3971
3146 if (nargs == 0) 3972 if (nargs == 0)
3147 return; 3973 return;
3148 3974
… …
3163 state = privcases (mode, argtopriv[j].bit); 3989 state = privcases (mode, argtopriv[j].bit);
3164 break; 3990 break;
3165 } 3991 }
3166 3992
3167 /* extra handling for values with state unkept */ 3993 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3994 switch (arg[i])
3170 { 3995 {
3171 case 1048: /* alternative cursor save */ 3996 case 1048: /* alternative cursor save */
3997 case 1049:
3998 if (options & Opt_secondaryScreen)
3172 if (mode == 0) 3999 if (mode == 0)
3173 scr_cursor (RESTORE); 4000 scr_cursor (RESTORE);
3174 else if (mode == 1) 4001 else if (mode == 1)
3175 scr_cursor (SAVE); 4002 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 break; 4003 break;
4004 }
4005
4006 if (state >= 0)
4007 /* extra handling for values with valid 0 or 1 state */
4008 switch (arg[i])
4009 {
4010 /* case 1: - application cursor keys */
4011 case 2: /* VT52 mode */
4012 /* oddball mode. should be set regardless of set/reset
4013 * parameter. Return from VT52 mode with an ESC < from
4014 * within VT52 mode
4015 */
4016 PrivMode (1, PrivMode_vt52);
4017 break;
3192 case 3: /* 80/132 */ 4018 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4019 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 4021 break;
3196 case 4: /* smooth scrolling */ 4022 case 4: /* smooth scrolling */
3197 if (state) 4023 if (state)
3198 Options &= ~Opt_jumpScroll; 4024 options &= ~Opt_jumpScroll;
3199 else 4025 else
3200 Options |= Opt_jumpScroll; 4026 options |= Opt_jumpScroll;
3201 break; 4027 break;
3202 case 5: /* reverse video */ 4028 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4029 scr_rvideo_mode (state);
3204 break; 4030 break;
3205 case 6: /* relative/absolute origins */ 4031 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4032 scr_relative_origin (state);
3207 break; 4033 break;
3208 case 7: /* autowrap */ 4034 case 7: /* autowrap */
3209 scr_autowrap (state); 4035 scr_autowrap (state);
3210 break; 4036 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4037 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4038 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4039 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4040 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4041 break;
3216#ifdef menuBar_esc 4042#ifdef menuBar_esc
3217 case menuBar_esc: 4043 case menuBar_esc:
3218#ifdef MENUBAR 4044#ifdef MENUBAR
3219 map_menuBar (state); 4045 map_menuBar (state);
3220#endif 4046#endif
3221 break; 4047 break;
3222#endif 4048#endif
3223#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
3224 case scrollBar_esc: 4050 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4051 if (scrollbar_mapping (state))
3226 { 4052 {
3227 resize_all_windows (0, 0, 0); 4053 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4054 scr_touch (true);
3229 } 4055 }
3230 break; 4056 break;
3231#endif 4057#endif
3232 case 25: /* visible/invisible cursor */ 4058 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4059 scr_cursor_visible (state);
3234 break; 4060 break;
3235 /* case 35: - shift keys */ 4061 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4062 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4063 case 47: /* secondary screen */
3238 scr_change_screen (state); 4064 scr_change_screen (state);
3239 break; 4065 break;
3240 /* case 66: - application key pad */ 4066 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4067 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4068 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4070 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4071 break;
3246#if 0 4072#if 0
3247 case 1001: 4073 case 1001:
3248 break; /* X11 mouse highlighting */ 4074 break; /* X11 mouse highlighting */
3249#endif 4075#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4076 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4077 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 4078 options &= ~Opt_scrollTtyOutput;
3253 else 4079 else
3254 Options |= Opt_scrollTtyOutput; 4080 options |= Opt_scrollTtyOutput;
3255 break; 4081 break;
3256 case 1011: /* scroll to bottom on key press */ 4082 case 1011: /* scroll to bottom on key press */
3257 if (state) 4083 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4084 options |= Opt_scrollTtyKeypress;
3259 else 4085 else
3260 Options &= ~Opt_scrollTtyKeypress; 4086 options &= ~Opt_scrollTtyKeypress;
3261 break; 4087 break;
3262 case 1047: /* secondary screen w/ clearing */ 4088 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4089 if (options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 4090 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4091 scr_erase_screen (2);
3266 scr_change_screen (state); 4092 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4093 break;
4094 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen)
4097 if (current_screen != PRIMARY)
4098 scr_erase_screen (2);
4099 break;
4100 default:
4101 break;
3270 } 4102 }
3271 } 4103 }
3272} 4104}
3273/*}}} */ 4105/*}}} */
3274 4106
3275/*{{{ process sgr sequences */ 4107/*{{{ process sgr sequences */
3276void 4108void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4109rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4110{
3279 unsigned int i; 4111 unsigned int i;
3280 short rendset; 4112 short rendset;
3281 int rendstyle; 4113 int rendstyle;
3282 4114
3283 if (nargs == 0) 4115 if (nargs == 0)
3284 { 4116 {
3285 scr_rendition (0, ~RS_None); 4117 scr_rendition (0, ~RS_None);
3286 return; 4118 return;
3287 } 4119 }
4120
3288 for (i = 0; i < nargs; i++) 4121 for (i = 0; i < nargs; i++)
3289 { 4122 {
3290 rendset = -1; 4123 rendset = -1;
3291 switch (arg[i]) 4124 switch (arg[i])
3292 { 4125 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4127 rendset = 0, rendstyle = ~RS_None;
3295 break; 4128 break;
3296 case 1: 4129 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4130 rendset = 1, rendstyle = RS_Bold;
3298 break; 4131 break;
4132 //case 2: // low intensity
4133 case 3:
4134 rendset = 1, rendstyle = RS_Italic;
4135 break;
3299 case 4: 4136 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4137 rendset = 1, rendstyle = RS_Uline;
3301 break; 4138 break;
3302 case 5: 4139 case 5: // slowly blinking
4140 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4141 rendset = 1, rendstyle = RS_Blink;
3304 break; 4142 break;
4143 //case 6: // scoansi light background
3305 case 7: 4144 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4145 rendset = 1, rendstyle = RS_RVid;
3307 break; 4146 break;
3308 case 22: 4147 case 8:
4148 // invisible. NYI
4149 break;
4150 //case 9: // crossed out
4151 //case 10: // scoansi acs off, primary font
4152 //case 11: // scoansi acs on, first alt font
4153 //case 12: // scoansi acs on, |0x80, second alt font
4154 //...
4155 //case 19: // ninth alt font
4156 //case 20: // gothic
4157 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4158 rendset = 0, rendstyle = RS_Bold;
4159 break;
4160 case 22: // normal intensity
4161 rendset = 0, rendstyle = RS_Bold;
4162 break;
4163 case 23: // disable italic
4164 rendset = 0, rendstyle = RS_Italic;
3310 break; 4165 break;
3311 case 24: 4166 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4167 rendset = 0, rendstyle = RS_Uline;
3313 break; 4168 break;
3314 case 25: 4169 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4170 rendset = 0, rendstyle = RS_Blink;
3316 break; 4171 break;
4172 case 26: // variable spacing (iso 8613)
4173 rendset = 0, rendstyle = RS_Blink;
4174 break;
3317 case 27: 4175 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4176 rendset = 0, rendstyle = RS_RVid;
3319 break; 4177 break;
4178 //case 28: // visible. NYI
4179 //case 29: // not crossed-out
3320 } 4180 }
4181
3321 if (rendset != -1) 4182 if (rendset != -1)
3322 { 4183 {
3323 scr_rendition (rendset, rendstyle); 4184 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4185 continue; /* for (;i;) */
3325 } 4186 }
… …
3332 case 33: 4193 case 33:
3333 case 34: 4194 case 34:
3334 case 35: 4195 case 35:
3335 case 36: 4196 case 36:
3336 case 37: 4197 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4199 break;
3340#ifdef TTY_256COLOR 4200 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4202 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4204 i += 2;
3347 } 4205 }
3348 break; 4206 break;
3349#endif
3350 case 39: /* default fg */ 4207 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4208 scr_color (Color_fg, Color_fg);
3352 break; 4209 break;
3353 4210
3354 case 40: 4211 case 40:
… …
3357 case 43: 4214 case 43:
3358 case 44: 4215 case 44:
3359 case 45: 4216 case 45:
3360 case 46: 4217 case 46:
3361 case 47: 4218 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4220 break;
3365#ifdef TTY_256COLOR 4221 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4223 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4225 i += 2;
3372 } 4226 }
3373 break; 4227 break;
3374#endif
3375 case 49: /* default bg */ 4228 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4229 scr_color (Color_bg, Color_bg);
3377 break; 4230 break;
4231
4232 //case 50: // not variable spacing
3378 4233
3379#ifndef NO_BRIGHTCOLOR 4234#ifndef NO_BRIGHTCOLOR
3380 case 90: 4235 case 90:
3381 case 91: /* set bright fg color */ 4236 case 91: /* set bright fg color */
3382 case 92: 4237 case 92:
3383 case 93: 4238 case 93:
3384 case 94: 4239 case 94:
3385 case 95: 4240 case 95:
3386 case 96: 4241 case 96:
3387 case 97: 4242 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4243 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4244 break;
3391 case 100: 4245 case 100:
3392 case 101: /* set bright bg color */ 4246 case 101: /* set bright bg color */
3393 case 102: 4247 case 102:
3394 case 103: 4248 case 103:
3395 case 104: 4249 case 104:
3396 case 105: 4250 case 105:
3397 case 106: 4251 case 106:
3398 case 107: 4252 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4254 break;
3402#endif 4255#endif
3403 4256
3404 } 4257 }
3405 } 4258 }
3406} 4259}
3407/*}}} */ 4260/*}}} */
3408 4261
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4262/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4263void
3411rxvt_term::process_graphics () 4264rxvt_term::process_graphics ()
3412{ 4265{
3413 unsigned char ch, cmd = cmd_getc (); 4266 unicode_t ch, cmd = cmd_getc ();
3414 4267
3415 if (cmd == 'Q') 4268 if (cmd == 'Q')
3416 { /* query graphics */ 4269 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4270 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4271 return;
3419 } 4272 }
3420 /* swallow other graphics sequences until terminating ':' */ 4273 /* swallow other graphics sequences until terminating ':' */
3421 do 4274 do
3422 ch = cmd_getc (); 4275 ch = cmd_getc ();
… …
3437 unsigned char buf[256]; 4290 unsigned char buf[256];
3438 4291
3439 va_start (arg_ptr, fmt); 4292 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4294 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4295 tt_write (buf, strlen (buf));
3443} 4296}
3444 4297
3445/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* Write data to the pty as typed by the user, pasted with the mouse,
3447 * or generated by us in response to a query ESC sequence. 4300 * or generated by us in response to a query ESC sequence.
3448 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
3449void 4304void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3451{ 4306{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3453 4310
3454 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
3455 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
3456 if (v_buflen == 0) 4334 if (v_buflen == 0)
3457 { 4335 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4336 free (v_buffer);
3485 v_buffer = 0; 4337 v_buffer = 0;
3486 v_buflen = 0; 4338 v_buflen = 0;
3487 4339
3488 pty_ev.set (EVENT_READ); 4340 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4341 return;
3501 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
3503} 4349}
3504 4350
3505/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
3506 4352

Diff Legend

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