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

Diff Legend

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