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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
306 newlen = 0; 551 newlen = 0;
307 } 552 }
308 break; 553 break;
309 554
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
… …
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677 } 934 }
678 935
679 display->flush (); 936 display->flush ();
680
681 flush_ev.stop ();
682} 937}
683 938
684void 939void
685rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
686{ 941{
687 SET_R (this); 942 SET_R (this);
688 SET_LOCALE (locale); 943 SET_LOCALE (locale);
689 944
690 display->flush (); 945 display->flush ();
691 946
692 if (!flush_ev.active) 947 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 948 flush_ev.start (NOW + 0.01);
694} 949}
695 950
696void 951void
697rxvt_term::flush_cb (time_watcher &w) 952rxvt_term::flush_cb (time_watcher &w)
… …
784 1039
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
788 1043
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1045
791 if (n > 0) 1046 if (n > 0)
792 { 1047 {
793 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
794 return true; 1049 return true;
… …
821 recolour_cursor (); 1076 recolour_cursor ();
822 1077
823#ifdef POINTER_BLANK 1078#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1079 hidden_pointer = 0;
825 1080
826 if (Options & Opt_pointerBlank) 1081 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1082 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1083#endif
829} 1084}
830 1085
831#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
832void 1087void
833rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
834{ 1089{
835 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
836 return; 1091 return;
837 1092
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
839 XFlush (display->display); 1094 XFlush (display->display);
840 1095
… …
860 x = ev.x; 1115 x = ev.x;
861 y = ev.y; 1116 y = ev.y;
862 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
863 1118
864 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1120 button_number = 3;
867 }
868 else 1121 else
869 { 1122 {
870 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1125 if (button_number >= 3)
873 button_number += (64 - 3); 1126 button_number += (64 - 3);
874 } 1127 }
875 1128
876 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
877 { 1130 {
878 /* 1131 /*
879 * do not report ButtonRelease 1132 * do not report ButtonRelease
880 * no state info allowed 1133 * no state info allowed
881 */ 1134 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1153#endif
901
902 } 1154 }
903 1155
904#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1158 if (key_state & 16)
907 fputc ('C', stderr); 1159 fputc ('C', stderr);
908 if (key_state & 4) 1160 if (key_state & 4)
909 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1165 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1167 button_number,
916 x + 1, 1168 x + 1,
917 y + 1); 1169 y + 1);
918#else 1170#endif
1171
919 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
921 (32 + x + 1), 1174 (32 + x + 1),
922 (32 + y + 1)); 1175 (32 + y + 1));
923#endif
924} 1176}
925 1177
926#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
927void 1179void
928rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
939{ 1191{
940 SET_R (this); 1192 SET_R (this);
941 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
942 1194
943#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1197 {
946 if (hidden_cursor) 1198 if (hidden_cursor)
947 { 1199 {
948 hidden_cursor = 0; 1200 hidden_cursor = 0;
949 want_refresh = 1; 1201 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1205 }
954#endif 1206#endif
955 1207
956#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1210 {
959 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1214 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1218 pointer_blank ();
967 } 1219 }
968#endif 1220#endif
969 1221
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1224 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1225
1028 switch (ev.type) 1226 switch (ev.type)
1029 { 1227 {
1030 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1031 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1032 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1033 1297
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1300 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1046 } 1303#endif
1047 break; 1304 break;
1048 } 1305 }
1049#endif
1050 1306
1051 case ButtonPress: 1307 case ButtonPress:
1052 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1053 break; 1309 break;
1054 1310
… …
1078 0L, 1000000L, 1334 0L, 1000000L,
1079 False, AnyPropertyType, 1335 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1082 &data); 1338 &data);
1083 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1340 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1090 } 1343 }
1091#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1092 break; 1345 break;
1093 1346
… …
1125 { 1378 {
1126 TermWin.focus = 1; 1379 TermWin.focus = 1;
1127 want_refresh = 1; 1380 want_refresh = 1;
1128#ifdef USE_XIM 1381#ifdef USE_XIM
1129 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1130 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1131#endif 1387#endif
1132#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif 1391#endif
1136#ifdef OFF_FOCUS_FADING 1392#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade]) 1393 if (rs[Rs_fade])
1138 { 1394 {
1139 PixColors = PixColorsFocused; 1395 pix_colors = pix_colors_focused;
1140 set_colorfgbg ();
1141 scr_clear (); 1396 scr_recolour ();
1142 scr_touch (true);
1143 } 1397 }
1144#endif 1398#endif
1145 1399
1146 } 1400 }
1147 break; 1401 break;
… …
1149 case FocusOut: 1403 case FocusOut:
1150 if (TermWin.focus) 1404 if (TermWin.focus)
1151 { 1405 {
1152 TermWin.focus = 0; 1406 TermWin.focus = 0;
1153 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1154#ifdef USE_XIM 1415#ifdef USE_XIM
1155 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1157#endif 1418#endif
1158#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1160 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1161 hidden_cursor = 0; 1422 hidden_cursor = 0;
1162#endif 1423#endif
1163#ifdef OFF_FOCUS_FADING 1424#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade]) 1425 if (rs[Rs_fade])
1165 { 1426 {
1166 PixColors = PixColorsUnFocused; 1427 pix_colors = pix_colors_unfocused;
1167 set_colorfgbg ();
1168 scr_clear (); 1428 scr_recolour ();
1169 scr_touch (true);
1170 } 1429 }
1171#endif 1430#endif
1172
1173 } 1431 }
1174 break; 1432 break;
1175 1433
1176 case ConfigureNotify: 1434 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1444 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1446
1189 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1448 {
1449 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1451 }
1191 1452
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1455 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1456#endif
1200 } 1457 }
1458 break;
1459
1460 case PropertyNotify:
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1201 break; 1465 break;
1202 1466
1203 case SelectionClear: 1467 case SelectionClear:
1204 selection_clear (); 1468 selection_clear ();
1205 break; 1469 break;
1206 1470
1207 case SelectionNotify: 1471 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1474 break;
1212 1475
1213 case SelectionRequest: 1476 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1215 break; 1478 break;
… …
1287 { 1550 {
1288 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1289 break; 1552 break;
1290 } 1553 }
1291#endif 1554#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1556 break;
1294 1557
1295 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1296 { 1559 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1561 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1300 ; 1563 ;
1301 1564
1302 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1303 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1569 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1573 {
1311#endif 1574#endif
1575#if ISO_14755
1576 // 5.4
1577 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1578 {
1579 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1580 break;
1581 }
1582#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1314#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1589 {
1318 int dist; 1590 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1597
1326 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1328 */ 1600 */
1329 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1604
1334 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1607 {
1337 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1610 }
1340 else 1611 else
1341 { 1612 {
1342 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1615 }
1616
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1348 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1350 } 1622 }
1351 else 1623 else
1352 { 1624 {
1353 /* we are within the text window, so we 1625 /* we are within the text window, so we
1354 * shouldn't be scrolling 1626 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1628 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1629 sel_scroll_ev.stop();
1358 } 1630 }
1359#endif 1631#endif
1360#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1361
1362 } 1633 }
1363#endif 1634#endif
1364
1365 } 1635 }
1366 } 1636 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1638 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1370 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1371 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1372 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1647 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1649 scrollbar_size ());
1378 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1381 } 1653 }
1382 break; 1654 break;
1383 } 1655 }
1384} 1656}
1385 1657
1658#if TRANSPARENT
1386void 1659void
1387rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1661{
1389 SET_R (this); 1662 SET_R (this);
1390 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1391 1664
1392 switch (ev.type) 1665 switch (ev.type)
1393 { 1666 {
1394 case PropertyNotify: 1667 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1668 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1669 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1670 * use the property to determine the pixmap. We use it later on.
1407 */ 1671 */
1408 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410 1674
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return; 1676 return;
1413 }
1414 1677
1415 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1416 case ReparentNotify: 1679 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1419 break; 1682 break;
1420#endif
1421 } 1683 }
1422} 1684}
1685#endif
1423 1686
1424void 1687void
1425rxvt_term::button_press (XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1426{ 1689{
1427 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1428 1691
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1693 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1432 /* 1696 /*
1433 * VT window processing of button press 1697 * VT window processing of button press
1434 */ 1698 */
1435 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1436 { 1700 {
1701#if ISO_14755
1702 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 {
1705 iso14755_54 (ev.x, ev.y);
1706 return;
1707 }
1708#endif
1709
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1438 if (reportmode) 1712 if (reportmode)
1439 { 1713 {
1440 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1471 } 1745 }
1472 else 1746 else
1473 { 1747 {
1474 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1476 switch (ev.button) 1751 switch (ev.button)
1477 { 1752 {
1478 case Button1: 1753 case Button1:
1754 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */
1756#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask);
1758#else
1759 selection.rect = false;
1760#endif
1761
1479 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1764 {
1482 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1484 else 1767 else
1485 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1783 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1503 else 1786 else
1504 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1505 MEvent.button = Button3; 1789 MEvent.button = Button3;
1506 break; 1790 break;
1507 } 1791 }
1508 } 1792 }
1793
1509 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1510 return; 1795 return;
1511 } 1796 }
1512 1797
1513 /* 1798 /*
… …
1605 break; 1890 break;
1606 case R_SB_ALIGN_BOTTOM: 1891 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1892 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1893 break;
1609 } 1894 }
1895
1610 if (scrollBar.style == R_SB_XTERM 1896 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1897 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1898 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1899 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1900
1615 scrollBar.setMotion (); 1901 scrollBar.setMotion ();
1616 break; 1902 break;
1617 1903
1618 case Button1: 1904 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1905 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1929 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1930 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1931 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1932 / scrollbar_size ()));
1647 } 1933 }
1934
1648 break; 1935 break;
1649 } 1936 }
1650 } 1937 }
1651 return; 1938 return;
1652 } 1939 }
… …
1664{ 1951{
1665 int reportmode = 0; 1952 int reportmode = 0;
1666 1953
1667 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1955 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 1957
1671 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1672 { 1959 {
1673 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1674 scrollbar_show (0); 1961 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 1964#endif
1678
1679 } 1965 }
1966
1680#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 1968 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 1969 sel_scroll_ev.stop();
1683#endif 1970#endif
1971
1684 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1685 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1686 if (reportmode) 1979 if (reportmode)
1687 { 1980 {
1688 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1705 mouse_report (ev); 1998 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2000 return;
1708 } 2001 }
2002
1709 /* 2003 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2005 * when overriding mouse reporting
1712 */ 2006 */
1713 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2008 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1717 2011
1718 switch (ev.button) 2012 switch (ev.button)
… …
1733 2027
1734 v = ev.button == Button4 ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
1735 2029
1736 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1737 i = 1; 2031 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2032 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1740 else 2034 else
1741 i = 5; 2035 i = 5;
1742 2036
1743# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
… …
2028 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
2030 2324
2031 pchanged = 0; 2325 pchanged = 0;
2032 2326
2033 if (!(Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2035 2329
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
2038 2332
… …
2041 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
2042 { 2336 {
2043 if (am_transparent) 2337 if (am_transparent)
2044 { 2338 {
2045 pchanged = 1; 2339 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
2048 } 2342 }
2049 2343
2050 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
2051 } 2345 }
… …
2114 sy = 0; 2408 sy = 0;
2115 } 2409 }
2116 2410
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2119 allowedxerror = -1; 2415 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2417
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2146 if (ISSET_PIXCOLOR (Color_tint)) 2442 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2443 {
2148 unsigned short rm, gm, bm; 2444 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2446
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2448
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2449 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2450 }
2155#endif 2451#endif
2156 2452
… …
2169 2465
2170 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2171 } 2467 }
2172 } 2468 }
2173 2469
2174 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2175 { 2473 {
2176 unsigned int n; 2474 unsigned int n;
2177 /* 2475 /*
2178 * InheritPixmap transparency 2476 * InheritPixmap transparency
2179 */ 2477 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2479 {
2183 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2483 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2484
2189 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2190 { 2486 {
2191 if (oldp != None) 2487 if (oldp != None)
2192 pchanged = 1; 2488 pchanged = 1;
… …
2203 if (pchanged) 2499 if (pchanged)
2204 { 2500 {
2205 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2206 { 2502 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2505 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2507 break;
2213 } 2508 }
2214 } 2509 }
2215 } 2510 }
2216 2511
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2513 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2516 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2224 } 2518 }
2225 else 2519 else
2226 { 2520 {
2227#if WAIT_FOR_WM 2521#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2524 sleep (1);
2231#endif 2525#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2234 { 2527 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2529 XClearWindow (display->display, TermWin.parent[n]);
2237 } 2530 }
… …
2242 2535
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2245 } 2538 }
2246 2539
2247 // this is experimental
2248 if (scrollBar.win) 2540 if (scrollBar.win)
2249 { 2541 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2543 scrollBar.setIdle ();
2253 scrollbar_show (0); 2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2254 } 2552 }
2255 2553
2256 return pchanged; 2554 return pchanged;
2257} 2555}
2258#endif 2556#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2575 if (ch == NOCHAR) // TODO: improve
2278 break; 2576 break;
2279 2577
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2579 {
2580 if (!seen_input)
2581 {
2582 seen_input = 1;
2583 // many badly-written programs (e.g. jed) contain a race condition:
2584 // they first read the screensize and then install a SIGWINCH handler.
2585 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized.
2590 if (seen_resize)
2591 kill (-cmd_pid, SIGWINCH);
2592 }
2593
2282 /* Read a text string from the input buffer */ 2594 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2595 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2596 bool refreshnow = false;
2285 int nlines = 0; 2597 int nlines = 0;
2286 unicode_t *str = buf; 2598 unicode_t *str = buf;
2287 2599
2288 *str++ = ch;
2289
2290 for (;;) 2600 for (;;)
2291 { 2601 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2602 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2603 break;
2297 2604
2298 *str++ = ch; 2605 *str++ = ch;
2299 2606
2300 if (ch == C0_LF) 2607 if (ch == C0_LF)
2301 { 2608 {
2302 nlines++; 2609 nlines++;
2303 refresh_count++; 2610 refresh_count++;
2304 2611
2305 if (! (Options & Opt_jumpScroll) 2612 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2614 {
2308 refreshnow = true; 2615 refreshnow = true;
2309 ch = NOCHAR; 2616 ch = NOCHAR;
2310 break; 2617 break;
2311 } 2618 }
2312 2619
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2621 if (nlines >= TermWin.nrow - 1)
2315 { 2622 {
2316 scr_add_lines (buf, nlines, str - buf); 2623 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2624 nlines = 0;
2318 str = buf; 2625 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2629 if (str >= buf + UBUFSIZ)
2323 { 2630 {
2324 ch = NOCHAR; 2631 ch = NOCHAR;
2325 break; 2632 break;
2326 } 2633 }
2634
2635 seq_begin = cmdbuf_ptr;
2636 ch = next_char ();
2327 } 2637 }
2328 2638
2329 scr_add_lines (buf, nlines, str - buf); 2639 scr_add_lines (buf, nlines, str - buf);
2330 2640
2331 /* 2641 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2644 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2645 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2646 */
2337 if (refreshnow) 2647 if (refreshnow)
2338 { 2648 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2650 refresh_limit++;
2341 else 2651 else
2342 { 2652 {
2343 flag = true; 2653 flag = true;
2344 scr_refresh (refresh_type); 2654 scr_refresh (refresh_type);
… …
2534 process_escape_seq (); 2844 process_escape_seq ();
2535 break; 2845 break;
2536 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2850 else
2541 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2543 break; 2853 break;
2544 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2545 scr_bell (); 2855 scr_bell ();
2546 break; 2856 break;
2547 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2646void 2956void
2647rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2648{ 2958{
2649 unicode_t ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2650 2960
2651 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2652 { 2962 {
2653 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2654 return; 2964 return;
2655 } 2965 }
2656 2966
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2982 break;
2673 case '+': 2983 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2985 break;
2676#ifndef NO_FRILLS 2986#if ENABLE_FRILLS
2677 case '6': 2987 case '6':
2678 scr_backindex (); 2988 scr_backindex ();
2679 break; 2989 break;
2680#endif 2990#endif
2681 case '7': 2991 case '7':
2682 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2683 break; 2993 break;
2684 case '8': 2994 case '8':
2685 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2686 break; 2996 break;
2687#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2688 case '9': 2998 case '9':
2689 scr_forwardindex (); 2999 scr_forwardindex ();
2690 break; 3000 break;
2691#endif 3001#endif
2692 case '=': 3002 case '=':
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3302 break;
2993 3303
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3307 break;
2998 3308
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
3001 break; 3311 break;
… …
3008 break; 3318 break;
3009 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
3010 scr_report_position (); 3320 scr_report_position ();
3011 break; 3321 break;
3012 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3323 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3325 break;
3016 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3328 break;
3019 } 3329 }
… …
3055 break; 3365 break;
3056 3366
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3368 if (arg[0] == 4)
3059 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
3060 break; 3372 break;
3061 3373
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3375 if (arg[0] == 4)
3064 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
3065 break; 3379 break;
3066 3380
3067 /* 3381 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3383 */
… …
3081 break; 3395 break;
3082 case CSI_75: 3396 case CSI_75:
3083 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
3084 break; 3398 break;
3085 3399
3086#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
3087 case CSI_74: 3401 case CSI_74:
3088 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
3089 break; 3403 break;
3090#endif 3404#endif
3091 3405
… …
3098 break; 3412 break;
3099 } 3413 }
3100} 3414}
3101/*}}} */ 3415/*}}} */
3102 3416
3103#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3104/* ARGSUSED */ 3418/* ARGSUSED */
3105void 3419void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3421{
3108 int x, y; 3422 int x, y;
… …
3175 break; 3489 break;
3176 case 19: /* report window size (chars) */ 3490 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3492 break;
3179 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3494 {
3182 char *s; 3495 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s);
3185 } 3499 }
3186 break; 3500 break;
3187 case 21: /* report window title */ 3501 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3502 {
3190 char *s; 3503 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s);
3193 } 3507 }
3194 break; 3508 break;
3195 } 3509 }
3196} 3510}
3197#endif 3511#endif
3198 3512
… …
3202 * ends_how is terminator used. returned input must be free()'d 3516 * ends_how is terminator used. returned input must be free()'d
3203 */ 3517 */
3204unsigned char * 3518unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3520{
3207 unicode_t prev = 0, ch; 3521 unicode_t ch;
3522 bool seen_esc = false;
3208 unsigned int n = 0; 3523 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3211 3525
3212 while ((ch = cmd_getc ()) != NOCHAR) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3527 {
3214 if (prev == C0_ESC) 3528 if (seen_esc)
3215 { 3529 {
3216 if (ch == 0x5c) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
3217 break; 3531 break;
3218 else 3532 else
3219 return NULL; 3533 return NULL;
3220 } 3534 }
3535 else if (ch == C0_ESC)
3536 {
3537 seen_esc = true;
3538 continue;
3539 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3541 break;
3223 else if (ch < 0x20) 3542 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3225 3546
3226 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3548 // stop at some sane length
3228 return NULL; 3549 return NULL;
3229 3550
3230 if (ch == C0_SYN) 3551 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3552 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3553 else
3236 string[n++] = prev = ch; 3554 string[n++] = ch;
3237 } 3555 }
3238 3556
3239 string[n++] = '\0'; 3557 string[n++] = '\0';
3240 3558
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3560
3246 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3247} 3562}
3248 3563
3249/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3250/* 3565/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3610void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3612{
3298 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3299 { 3614 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3615 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3618 }
3307 else 3619 else
3308 set_window_color (color, str); 3620 set_window_color (color, str);
3309} 3621}
3310 3622
… …
3338{ 3650{
3339 int changed = 0; 3651 int changed = 0;
3340 int color; 3652 int color;
3341 char *buf, *name; 3653 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3343 3656
3344 assert (str != NULL); 3657 assert (str != NULL);
3345 switch (op) 3658 switch (op)
3346 { 3659 {
3347 case XTerm_name: 3660 case XTerm_name:
… …
3354 set_title (str); 3667 set_title (str);
3355 break; 3668 break;
3356 case XTerm_property: 3669 case XTerm_property:
3357 if (str[0] == '?') 3670 if (str[0] == '?')
3358 { 3671 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3673 Atom actual_type;
3361 int actual_format; 3674 int actual_format;
3362 unsigned long nitems; 3675 unsigned long nitems;
3363 unsigned long bytes_after; 3676 unsigned long bytes_after;
3364 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3696
3384 if (eq) 3697 if (eq)
3385 { 3698 {
3386 *eq = 0; 3699 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3700 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3701 }
3392 else 3702 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str)); 3704 display->atom (str));
3395 } 3705 }
3396 break; 3706 break;
3397 3707
3398 case XTerm_Color: 3708 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3400 { 3710 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3712 break;
3403 3713
3404 *name++ = '\0'; 3714 *name++ = '\0';
3405 color = atoi (buf); 3715 color = atoi (buf);
3406 3716
3407 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3718 break;
3409 3719
3410 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3721 *buf++ = '\0';
3412 3722
3413 if (name[0] == '?' && !name[1]) 3723 if (name[0] == '?' && !name[1])
3414 { 3724 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3725 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3728 }
3422 else 3729 else
3423 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3424 } 3731 }
3425 break; 3732 break;
… …
3442 break; 3749 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break; 3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3447 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3759 break;
3450 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break;
3763#endif
3764#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3767 check_our_parents ();
3768 if (am_transparent)
3769 want_full_refresh = want_refresh = 1;
3452 break; 3770 break;
3453#endif 3771#endif
3454 3772
3455 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3456 if (*str != ';') 3774 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3461#endif 3779#endif
3462 scr_touch (true); 3780 scr_touch (true);
3463 } 3781 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3465 { 3783 {
3466 str++; 3784 str++;
3467#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3469#endif 3787#endif
… …
3488 case XTerm_logfile: 3806 case XTerm_logfile:
3489 // TODO, when secure mode? 3807 // TODO, when secure mode?
3490 break; 3808 break;
3491 3809
3492 case XTerm_font: 3810 case XTerm_font:
3811 op = URxvt_font;
3812 case URxvt_font:
3813#if ENABLE_STYLES
3814 case URxvt_boldFont:
3815 case URxvt_italicFont:
3816 case URxvt_boldItalicFont:
3817#endif
3493 if (query) 3818 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3822 resp);
3823 else
3494 { 3824 {
3495 if (Options & Opt_insecure) 3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3826
3497 TermWin.fontset->fontdesc 3827 res = strdup (str);
3498 ? TermWin.fontset->fontdesc 3828 allocated.push_back ((void *)res);
3499 : "", 3829 set_fonts ();
3500 resp);
3501 } 3830 }
3502 else
3503 change_font (str);
3504 break; 3831 break;
3505 3832
3506#ifndef NO_FRILLS 3833#if ENABLE_FRILLS
3507 case XTerm_locale: 3834 case XTerm_locale:
3508 if (query) 3835 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3512 }
3513 else 3837 else
3514 { 3838 {
3515 set_locale (str); 3839 set_locale (str);
3516# ifdef USE_XIM 3840# ifdef USE_XIM
3517 im_cb (); 3841 im_cb ();
3518# endif 3842# endif
3519 } 3843 }
3520 break; 3844 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif 3845#endif
3531 3846
3532#ifdef MENUBAR 3847#ifdef MENUBAR
3533 case XTerm_Menu: 3848 case XTerm_Menu:
3534 if (Options & Opt_insecure) 3849 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3851 break;
3537#endif 3852#endif
3538#if 0 3853#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
… …
3566{ 3881{
3567 int state; 3882 int state;
3568 3883
3569 if (mode == 's') 3884 if (mode == 's')
3570 { 3885 {
3571 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3572 return -1; 3887 return -1;
3573 } 3888 }
3574 else 3889 else
3575 { 3890 {
3576 if (mode == 'r') 3891 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3893 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3895 PrivMode (state, bit);
3581 } 3896 }
3582 3897
3583 return state; 3898 return state;
3584} 3899}
… …
3602 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3924#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3610#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3931#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3934 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3935 // 45 margin bell NYI
3621 // 46 start logging 3936 // 46 start logging
… …
3662 3977
3663 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3979 switch (arg[i])
3665 { 3980 {
3666 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3667 if (Options & Opt_secondaryScreen) 3983 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 3984 if (mode == 0)
3669 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3670 else if (mode == 1) 3986 else if (mode == 1)
3671 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3672 break; 3988 break;
… …
3683 * within VT52 mode 3999 * within VT52 mode
3684 */ 4000 */
3685 PrivMode (1, PrivMode_vt52); 4001 PrivMode (1, PrivMode_vt52);
3686 break; 4002 break;
3687 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4006 break;
3691 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3692 if (state) 4008 if (state)
3693 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3694 else 4010 else
3695 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3696 break; 4012 break;
3697 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3699 break; 4015 break;
3700 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4020 scr_autowrap (state);
3705 break; 4021 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4022 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4025 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4026 break;
3711#ifdef menuBar_esc 4027#ifdef menuBar_esc
3712 case menuBar_esc: 4028 case menuBar_esc:
3713#ifdef MENUBAR 4029#ifdef MENUBAR
3714 map_menuBar (state); 4030 map_menuBar (state);
… …
3734 break; 4050 break;
3735 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4055 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4056 break;
3741#if 0 4057#if 0
3742 case 1001: 4058 case 1001:
3743 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3744#endif 4060#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4062 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3748 else 4064 else
3749 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3750 break; 4066 break;
3751 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3752 if (state) 4068 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3754 else 4070 else
3755 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3756 break; 4072 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4073 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4074 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4076 scr_erase_screen (2);
3761 scr_change_screen (state); 4077 scr_change_screen (state);
3762 break; 4078 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4079 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4080 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4081 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4082 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4083 scr_erase_screen (2);
3768 break; 4084 break;
3769 default: 4085 default:
3770 break; 4086 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3797 break; 4113 break;
3798 case 1: 4114 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3800 break; 4116 break;
3801 //case 2: // faint or second colour 4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3802 case 4: 4121 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3804 break; 4123 break;
3805 case 5: // slowly blinking 4124 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4125 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4137 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4138 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4139 //...
3821 //case 19: // ninth alt font 4140 //case 19: // ninth alt font
3822 //case 20: // gothic 4141 //case 20: // gothic
3823 case 21: // disable bold, faint 4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
3825 break; 4144 break;
3826 case 22: 4145 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
3828 break; 4147 break;
3829 //case 23: disable italic 4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
4150 break;
3830 case 24: 4151 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3832 break; 4153 break;
3833 case 25: 4154 case 25:
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
4157 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3835 break; 4159 break;
3836 case 27: 4160 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3838 break; 4162 break;
… …
3856 case 35: 4180 case 35:
3857 case 36: 4181 case 36:
3858 case 37: 4182 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4184 break;
3861#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4187 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4189 i += 2;
3867 } 4190 }
3868 break; 4191 break;
3869#endif
3870 case 39: /* default fg */ 4192 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3872 break; 4194 break;
3873 4195
3874 case 40: 4196 case 40:
… …
3879 case 45: 4201 case 45:
3880 case 46: 4202 case 46:
3881 case 47: 4203 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4205 break;
3884#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4208 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4210 i += 2;
3890 } 4211 }
3891 break; 4212 break;
3892#endif
3893 case 49: /* default bg */ 4213 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3895 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3896 4218
3897#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3898 case 90: 4220 case 90:
3899 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3900 case 92: 4222 case 92:
3901 case 93: 4223 case 93:
3902 case 94: 4224 case 94:
3903 case 95: 4225 case 95:
3904 case 96: 4226 case 96:
3905 case 97: 4227 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4229 break;
3909 case 100: 4230 case 100:
3910 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3911 case 102: 4232 case 102:
3912 case 103: 4233 case 103:
3913 case 104: 4234 case 104:
3914 case 105: 4235 case 105:
3915 case 106: 4236 case 106:
3916 case 107: 4237 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4239 break;
3920#endif 4240#endif
3921 4241
3922 } 4242 }
3923 } 4243 }
… …
3930{ 4250{
3931 unicode_t ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3932 4252
3933 if (cmd == 'Q') 4253 if (cmd == 'Q')
3934 { /* query graphics */ 4254 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4256 return;
3937 } 4257 }
3938 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3939 do 4259 do
3940 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4275 unsigned char buf[256];
3956 4276
3957 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4279 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3961} 4281}
3962 4282
3963/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4284/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
3966 */ 4286 */
3967void 4287void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4289{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3971 4291
3972 if (len) 4292 if (len)
3973 { 4293 {
3974 if (v_buflen == 0) 4294 if (v_buflen == 0)
3975 { 4295 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3977 4297
3978 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3979 return; 4299 return;
3980 4300
3981 data += written; 4301 data += written;
… …
3989 v_buflen += len; 4309 v_buflen += len;
3990 } 4310 }
3991 4311
3992 for (;;) 4312 for (;;)
3993 { 4313 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3995 4315
3996 if (written > 0) 4316 if (written > 0)
3997 { 4317 {
3998 v_buflen -= written; 4318 v_buflen -= written;
3999 4319

Diff Legend

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