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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC

… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 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
62/*{{{ Convert the keypress event into a string */ 258/*{{{ Convert the keypress event into a string */
63void 259void
64rxvt_term::lookup_key (XKeyEvent &ev) 260rxvt_term::lookup_key (XKeyEvent &ev)
65{ 261{
66 int ctrl, meta, shft, len; 262 int ctrl, meta, shft, len;
… …
151 { 347 {
152 if (TermWin.saveLines) 348 if (TermWin.saveLines)
153 { 349 {
154#ifdef UNSHIFTED_SCROLLKEYS 350#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 351 if (!ctrl && !meta)
156 {
157#else 352#else
158 if (IS_SCROLL_MOD) 353 if (IS_SCROLL_MOD)
354#endif
159 { 355 {
160#endif
161 int lnsppg; 356 int lnsppg;
162 357
163#ifdef PAGING_CONTEXT_LINES 358#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 360#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 409 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 410 {
216 keysym += (XK_F11 - XK_F1); 411 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 412 shft = 0; /* turn off Shift */
218 } 413 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 414 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 415 {
221 switch (keysym) 416 switch (keysym)
222 { 417 {
223 /* normal XTerm key bindings */ 418 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 419 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 420 selection_request (ev.time, 0, 0);
226 return; 421 return;
422#if TODO // TODO
227 /* rxvt extras */ 423 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 424 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 425 change_font (FONT_UP);
230 return; 426 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 428 change_font (FONT_DN);
233 return; 429 return;
430#endif
234 } 431 }
235 } 432 }
236 } 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
237#ifdef PRINTPIPE 481#ifdef PRINTPIPE
238 if (keysym == XK_Print) 482 if (keysym == XK_Print)
239 { 483 {
240 scr_printscreen (ctrl | shft); 484 scr_printscreen (ctrl | shft);
241 return; 485 return;
… …
273 newlen = 1; 517 newlen = 1;
274 switch (keysym) 518 switch (keysym)
275 { 519 {
276#ifndef NO_BACKSPACE_KEY 520#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 521 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 522 if (priv_modes & PrivMode_HaveBackSpace)
279 { 523 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 524 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 525 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 526 kbuf[1] = '\0';
283 } 527 }
284 else 528 else
285 STRCPY (kbuf, key_backspace); 529 strcpy (kbuf, key_backspace);
286 break; 530 break;
287#endif 531#endif
288#ifndef NO_DELETE_KEY 532#ifndef NO_DELETE_KEY
289 case XK_Delete: 533 case XK_Delete:
290 STRCPY (kbuf, key_delete); 534 strcpy (kbuf, key_delete);
291 break; 535 break;
292#endif 536#endif
293 case XK_Tab: 537 case XK_Tab:
294 if (shft) 538 if (shft)
295 STRCPY (kbuf, "\033[Z"); 539 strcpy (kbuf, "\033[Z");
296 else 540 else
297 { 541 {
298#ifdef CTRL_TAB_MAKES_META 542#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 543 if (ctrl)
300 meta = 1; 544 meta = 1;
… …
310#ifdef XK_KP_Left 554#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 555 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 556 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 557 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 558 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 560 {
317 STRCPY (kbuf, "\033OZ"); 561 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 562 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 563 break;
320 } 564 }
321 else 565 else
322 /* translate to std. cursor key */ 566 /* translate to std. cursor key */
… …
325#endif 569#endif
326 case XK_Up: /* "\033[A" */ 570 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 571 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 572 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 573 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 574 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 575 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 576 /* do Shift first */
333 if (shft) 577 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 578 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 579 else if (ctrl)
336 { 580 {
337 kbuf[1] = 'O'; 581 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 583 }
340 else if (PrivateModes & PrivMode_aplCUR) 584 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
342 break; 586 break;
343 587
344#ifndef UNSHIFTED_SCROLLKEYS 588#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 589# ifdef XK_KP_Prior
346 case XK_KP_Prior: 590 case XK_KP_Prior:
347 /* allow shift to override */ 591 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 593 {
350 STRCPY (kbuf, "\033Oy"); 594 strcpy (kbuf, "\033Oy");
351 break; 595 break;
352 } 596 }
353 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
354# endif 598# endif
355 case XK_Prior: 599 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 600 strcpy (kbuf, "\033[5~");
357 break; 601 break;
358# ifdef XK_KP_Next 602# ifdef XK_KP_Next
359 case XK_KP_Next: 603 case XK_KP_Next:
360 /* allow shift to override */ 604 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 606 {
363 STRCPY (kbuf, "\033Os"); 607 strcpy (kbuf, "\033Os");
364 break; 608 break;
365 } 609 }
366 /* FALLTHROUGH */ 610 /* FALLTHROUGH */
367# endif 611# endif
368 case XK_Next: 612 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 613 strcpy (kbuf, "\033[6~");
370 break; 614 break;
371#endif 615#endif
372 case XK_KP_Enter: 616 case XK_KP_Enter:
373 /* allow shift to override */ 617 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 618 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 619 {
376 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';
377 } 632 }
378 else 633 else
379 { 634 {
380 kbuf[0] = '\r'; 635 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 636 kbuf[1] = '\0';
382 } 637 }
383 break; 638 break;
384 639
385#ifdef XK_KP_Begin 640#ifdef XK_KP_Begin
386 case XK_KP_Begin: 641 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 642 strcpy (kbuf, "\033Ou");
388 break; 643 break;
389 644
390 case XK_KP_Insert: 645 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 646 strcpy (kbuf, "\033Op");
392 break; 647 break;
393 648
394 case XK_KP_Delete: 649 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 650 strcpy (kbuf, "\033On");
396 break; 651 break;
397#endif 652#endif
398 case XK_KP_F1: /* "\033OP" */ 653 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 654 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 655 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 656 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 657 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 658 kbuf[2] += (keysym - XK_KP_F1);
404 break; 659 break;
405 660
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 661 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 662 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 673 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 674 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 675 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 676 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 677 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 678 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 679 {
425 STRCPY (kbuf, "\033Oj"); 680 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 681 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 682 }
428 else 683 else
429 { 684 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 685 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 686 kbuf[1] = '\0';
432 } 687 }
433 break; 688 break;
434 689
435 case XK_Find: 690 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 691 strcpy (kbuf, "\033[1~");
437 break; 692 break;
438 case XK_Insert: 693 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 694 strcpy (kbuf, "\033[2~");
440 break; 695 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 696#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 697 case DXK_Remove:
443 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
444#endif 699#endif
445 case XK_Execute: 700 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 701 strcpy (kbuf, "\033[3~");
447 break; 702 break;
448 case XK_Select: 703 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 704 strcpy (kbuf, "\033[4~");
450 break; 705 break;
451#ifdef XK_KP_End 706#ifdef XK_KP_End
452 case XK_KP_End: 707 case XK_KP_End:
453 /* allow shift to override */ 708 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 710 {
456 STRCPY (kbuf, "\033Oq"); 711 strcpy (kbuf, "\033Oq");
457 break; 712 break;
458 } 713 }
459 /* FALLTHROUGH */ 714 /* FALLTHROUGH */
460#endif 715#endif
461 case XK_End: 716 case XK_End:
462 STRCPY (kbuf, KS_END); 717 strcpy (kbuf, KS_END);
463 break; 718 break;
464#ifdef XK_KP_Home 719#ifdef XK_KP_Home
465 case XK_KP_Home: 720 case XK_KP_Home:
466 /* allow shift to override */ 721 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 723 {
469 STRCPY (kbuf, "\033Ow"); 724 strcpy (kbuf, "\033Ow");
470 break; 725 break;
471 } 726 }
472 /* FALLTHROUGH */ 727 /* FALLTHROUGH */
473#endif 728#endif
474 case XK_Home: 729 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 730 strcpy (kbuf, KS_HOME);
476 break; 731 break;
477 732
478#define FKEY(n, fkey) \ 733#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 734 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 735
… …
533 default: 788 default:
534 newlen = 0; 789 newlen = 0;
535 break; 790 break;
536 } 791 }
537 if (newlen) 792 if (newlen)
538 len = STRLEN (kbuf); 793 len = strlen (kbuf);
539 } 794 }
540 795
541 /* 796 /*
542 * Pass meta for all function keys, if 'meta' option set 797 * Pass meta for all function keys, if 'meta' option set
543 */ 798 */
… …
571 } 826 }
572 827
573 if (len <= 0) 828 if (len <= 0)
574 return; /* not mapped */ 829 return; /* not mapped */
575 830
576 if (Options & Opt_scrollTtyKeypress) 831 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 832 if (TermWin.view_start)
578 { 833 {
579 TermWin.view_start = 0; 834 TermWin.view_start = 0;
580 want_refresh = 1; 835 want_refresh = 1;
581 } 836 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 885 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 887
633 if (n > 0 && s < count) 888 if (n > 0 && s < count)
634 { 889 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 890 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 891 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 892 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 893 cmdbuf_endp -= n;
639 s += n; 894 s += n;
640 } 895 }
… …
783 1038
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1039 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1040 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1041 cmdbuf_endp = cmdbuf_ptr + n;
787 1042
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1044
790 if (n > 0) 1045 if (n > 0)
791 { 1046 {
792 cmdbuf_endp += n; 1047 cmdbuf_endp += n;
793 return true; 1048 return true;
… …
820 recolour_cursor (); 1075 recolour_cursor ();
821 1076
822#ifdef POINTER_BLANK 1077#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1078 hidden_pointer = 0;
824 1079
825 if (Options & Opt_pointerBlank) 1080 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1081 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1082#endif
828} 1083}
829 1084
830#ifdef POINTER_BLANK 1085#ifdef POINTER_BLANK
831void 1086void
832rxvt_term::pointer_blank () 1087rxvt_term::pointer_blank ()
833{ 1088{
834 if (! (Options & Opt_pointerBlank)) 1089 if (! (options & Opt_pointerBlank))
835 return; 1090 return;
836 1091
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1092 XDefineCursor (display->display, TermWin.vt, blank_cursor);
838 XFlush (display->display); 1093 XFlush (display->display);
839 1094
… …
859 x = ev.x; 1114 x = ev.x;
860 y = ev.y; 1115 y = ev.y;
861 pixel_position (&x, &y); 1116 pixel_position (&x, &y);
862 1117
863 if (MEvent.button == AnyButton) 1118 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1119 button_number = 3;
866 }
867 else 1120 else
868 { 1121 {
869 button_number = MEvent.button - Button1; 1122 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1123 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1124 if (button_number >= 3)
872 button_number += (64 - 3); 1125 button_number += (64 - 3);
873 } 1126 }
874 1127
875 if (PrivateModes & PrivMode_MouseX10) 1128 if (priv_modes & PrivMode_MouseX10)
876 { 1129 {
877 /* 1130 /*
878 * do not report ButtonRelease 1131 * do not report ButtonRelease
879 * no state info allowed 1132 * no state info allowed
880 */ 1133 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1148 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1149 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1150#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1151 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1152#endif
900
901 } 1153 }
902 1154
903#ifdef DEBUG_MOUSEREPORT 1155#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1156 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1157 if (key_state & 16)
906 fputc ('C', stderr); 1158 fputc ('C', stderr);
907 if (key_state & 4) 1159 if (key_state & 4)
908 fputc ('S', stderr); 1160 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1164 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1165 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1166 button_number,
915 x + 1, 1167 x + 1,
916 y + 1); 1168 y + 1);
917#else 1169#endif
1170
918 tt_printf ("\033[M%c%c%c", 1171 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1172 (32 + button_number + key_state),
920 (32 + x + 1), 1173 (32 + x + 1),
921 (32 + y + 1)); 1174 (32 + y + 1));
922#endif
923} 1175}
924 1176
925#ifdef USING_W11LIB 1177#ifdef USING_W11LIB
926void 1178void
927rxvt_W11_process_x_event (XEvent *ev) 1179rxvt_W11_process_x_event (XEvent *ev)
… …
938{ 1190{
939 SET_R (this); 1191 SET_R (this);
940 SET_LOCALE (locale); 1192 SET_LOCALE (locale);
941 1193
942#if defined(CURSOR_BLINK) 1194#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1196 {
945 if (hidden_cursor) 1197 if (hidden_cursor)
946 { 1198 {
947 hidden_cursor = 0; 1199 hidden_cursor = 0;
948 want_refresh = 1; 1200 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1204 }
953#endif 1205#endif
954 1206
955#if defined(POINTER_BLANK) 1207#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1209 {
958 if (ev.type == MotionNotify 1210 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1211 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1212 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1213 if (hidden_pointer)
… …
973 1225
974 Window unused_root, unused_child; 1226 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1227 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1228 unsigned int unused_mask;
977 1229
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026
1027 switch (ev.type) 1230 switch (ev.type)
1028 { 1231 {
1029 case KeyPress: 1232 case KeyPress:
1233#if ISO_14755
1234 if (!(iso14755buf & ISO_14755_52))
1235#endif
1030 lookup_key (ev.xkey); 1236 lookup_key (ev.xkey);
1237
1238 break;
1239
1240 case KeyRelease:
1241 {
1242#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1243 KeySym ks;
1244
1245 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1246#endif
1247
1248#if ENABLE_FRILLS || ISO_14755
1249 // ISO 14755 support
1250 if (iso14755buf)
1251 if (iso14755buf & ISO_14755_52)
1252 {
1253# if ENABLE_OVERLAY
1254 scr_overlay_off ();
1255# endif
1256# if ISO_14755
1257 // iso14755 part 5.2 handling: release time
1258 // first: controls
1259 if ((ev.xkey.state & ControlMask)
1260 && ((ks >= 0x40 && ks <= 0x5f)
1261 || (ks >= 0x61 && ks <= 0x7f)))
1262 {
1263 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1269 if (i[0] == ks)
1270 {
1271 iso14755buf = ISO_14755_51 | i[1];
1272 commit_iso14755 ();
1273 return; // case-break;
1274 }
1275
1276 scr_bell ();
1277# endif
1278 iso14755buf = 0;
1031 break; 1279 break;
1280 }
1281 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1282 {
1283# if ENABLE_OVERLAY
1284 scr_overlay_off ();
1285# endif
1286 if (iso14755buf & ISO_14755_51)
1287 commit_iso14755 ();
1288#if ISO_14755
1289 else if (iso14755buf & ISO_14755_STARTED)
1290 {
1291 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1292
1293 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1294 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1295 }
1296# endif
1297 else
1298 iso14755buf = 0;
1299 }
1300#endif
1032 1301
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1303 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1304 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1305 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1306 mouse_slip_wheel_speed = 0;
1045 } 1307#endif
1046 break; 1308 break;
1047 } 1309 }
1048#endif
1049 1310
1050 case ButtonPress: 1311 case ButtonPress:
1051 button_press (ev.xbutton); 1312 button_press (ev.xbutton);
1052 break; 1313 break;
1053 1314
… …
1080 &Size, &RemainingBytes, 1341 &Size, &RemainingBytes,
1081 &data); 1342 &data);
1082 XChangeProperty (display->display, display->root, 1343 XChangeProperty (display->display, display->root,
1083 XA_CUT_BUFFER0, XA_STRING, 1344 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace, 1345 8, PropModeReplace,
1085 data, STRLEN (data)); 1346 data, strlen (data));
1086 XFree (data); 1347 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1348 selection_paste (display->root, XA_CUT_BUFFER0, True);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1089 } 1350 }
1090#endif /* OFFIX_DND */ 1351#endif /* OFFIX_DND */
… …
1124 { 1385 {
1125 TermWin.focus = 1; 1386 TermWin.focus = 1;
1126 want_refresh = 1; 1387 want_refresh = 1;
1127#ifdef USE_XIM 1388#ifdef USE_XIM
1128 if (Input_Context != NULL) 1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1129 XSetICFocus (Input_Context); 1392 XSetICFocus (Input_Context);
1393 }
1130#endif 1394#endif
1131#ifdef CURSOR_BLINK 1395#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1396 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif 1398#endif
1135#ifdef OFF_FOCUS_FADING 1399#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade]) 1400 if (rs[Rs_fade])
1137 { 1401 {
1138 PixColors = PixColorsFocused; 1402 pix_colors = pix_colors_focused;
1139 set_colorfgbg ();
1140 scr_clear (); 1403 scr_recolour ();
1141 scr_touch (true);
1142 } 1404 }
1143#endif 1405#endif
1144 1406
1145 } 1407 }
1146 break; 1408 break;
… …
1148 case FocusOut: 1410 case FocusOut:
1149 if (TermWin.focus) 1411 if (TermWin.focus)
1150 { 1412 {
1151 TermWin.focus = 0; 1413 TermWin.focus = 0;
1152 want_refresh = 1; 1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1153#ifdef USE_XIM 1422#ifdef USE_XIM
1154 if (Input_Context != NULL) 1423 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context); 1424 XUnsetICFocus (Input_Context);
1156#endif 1425#endif
1157#ifdef CURSOR_BLINK 1426#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink) 1427 if (options & Opt_cursorBlink)
1159 cursor_blink_ev.stop (); 1428 cursor_blink_ev.stop ();
1160 hidden_cursor = 0; 1429 hidden_cursor = 0;
1161#endif 1430#endif
1162#ifdef OFF_FOCUS_FADING 1431#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade]) 1432 if (rs[Rs_fade])
1164 { 1433 {
1165 PixColors = PixColorsUnFocused; 1434 pix_colors = pix_colors_unfocused;
1166 set_colorfgbg ();
1167 scr_clear (); 1435 scr_recolour ();
1168 scr_touch (true);
1169 } 1436 }
1170#endif 1437#endif
1171
1172 } 1438 }
1173 break; 1439 break;
1174 1440
1175 case ConfigureNotify: 1441 case ConfigureNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1442 if (ev.xconfigure.window == TermWin.parent[0])
… …
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1450 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 } 1451 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187 1453
1188 if (szHint.width != width || szHint.height != height) 1454 if (szHint.width != width || szHint.height != height)
1455 {
1456 seen_resize = 1;
1189 resize_all_windows (width, height, 1); 1457 resize_all_windows (width, height, 1);
1458 }
1190 1459
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent) 1461 if (options & Opt_transparent)
1193 { 1462 {
1194 check_our_parents (); 1463 check_our_parents ();
1195 if (am_transparent) 1464 if (am_transparent)
1196 want_refresh = want_full_refresh = 1; 1465 want_refresh = want_full_refresh = 1;
1197 } 1466 }
1198#endif 1467#endif
1199 } 1468 }
1469 break;
1470
1471 case PropertyNotify:
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1200 break; 1476 break;
1201 1477
1202 case SelectionClear: 1478 case SelectionClear:
1203 selection_clear (); 1479 selection_clear ();
1204 break; 1480 break;
… …
1286 { 1562 {
1287 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1288 break; 1564 break;
1289 } 1565 }
1290#endif 1566#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break; 1568 break;
1293 1569
1294 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == TermWin.vt)
1295 { 1571 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1573 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1299 ; 1575 ;
1300 1576
1301 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (display->display, TermWin.vt,
1302 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1580 & (ev.xbutton.x), & (ev.xbutton.y),
1305 &unused_mask); 1581 &unused_mask);
1306#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1585 {
1310#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1313#ifdef SELECTION_SCROLLING 1597#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1598 if (ev.xbutton.y < TermWin.int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1316 { 1600 {
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1607 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1608
1325 /* save the event params so we can highlight 1609 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1610 * the selection in the pending-scroll loop
1327 */ 1611 */
1328 selection_save_x=ev.xbutton.x; 1612 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1613 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1615
1333 /* calc number of lines to scroll */ 1616 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1617 if (ev.xbutton.y<TermWin.int_bwidth)
1335 { 1618 {
1336 scroll_selection_dir = UP; 1619 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1620 dist = TermWin.int_bwidth - ev.xbutton.y;
1338 } 1621 }
1339 else 1622 else
1340 { 1623 {
1341 scroll_selection_dir = DN; 1624 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y -
1343 (TermWin.int_bwidth + TermWin.height); 1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1344 } 1626 }
1627
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1628 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1629 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1;
1347 MIN_IT (scroll_selection_lines, 1631 MIN_IT (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1632 SELECTION_SCROLL_MAX_LINES);
1349 } 1633 }
1350 else 1634 else
1351 { 1635 {
1352 /* we are within the text window, so we 1636 /* we are within the text window, so we
1353 * shouldn't be scrolling 1637 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1639 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1357 } 1641 }
1358#endif 1642#endif
1359#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1360
1361 } 1644 }
1362#endif 1645#endif
1363
1364 } 1646 }
1365 } 1647 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1649 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1369 MotionNotify, &ev)) ; 1651 MotionNotify, &ev)) ;
1370 XQueryPointer (display->display, scrollBar.win, 1652 XQueryPointer (display->display, scrollBar.win,
1371 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1655 & (ev.xbutton.x), & (ev.xbutton.y),
1374 &unused_mask); 1656 &unused_mask);
… …
1380 } 1662 }
1381 break; 1663 break;
1382 } 1664 }
1383} 1665}
1384 1666
1667#if TRANSPARENT
1385void 1668void
1386rxvt_term::rootwin_cb (XEvent &ev) 1669rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1670{
1388 SET_R (this); 1671 SET_R (this);
1389 SET_LOCALE (locale); 1672 SET_LOCALE (locale);
1390 1673
1391 switch (ev.type) 1674 switch (ev.type)
1392 { 1675 {
1393 case PropertyNotify: 1676 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1677 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1678 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1679 * use the property to determine the pixmap. We use it later on.
1406 */ 1680 */
1407 if (xa[XA_XROOTPMAPID] == 0) 1681 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409 1683
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1411 return; 1685 return;
1412 }
1413 1686
1414 /* FALLTHROUGH */ 1687 /* FALLTHROUGH */
1415 case ReparentNotify: 1688 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1690 want_refresh = want_full_refresh = 1;
1418 break; 1691 break;
1419#endif
1420 } 1692 }
1421} 1693}
1694#endif
1422 1695
1423void 1696void
1424rxvt_term::button_press (XButtonEvent &ev) 1697rxvt_term::button_press (XButtonEvent &ev)
1425{ 1698{
1426 int reportmode = 0, clickintime; 1699 int reportmode = 0, clickintime;
1427 1700
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1702 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1703 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704
1431 /* 1705 /*
1432 * VT window processing of button press 1706 * VT window processing of button press
1433 */ 1707 */
1434 if (ev.window == TermWin.vt) 1708 if (ev.window == TermWin.vt)
1435 { 1709 {
1710#if ISO_14755
1711 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 {
1714 iso14755_54 (ev.x, ev.y);
1715 return;
1716 }
1717#endif
1718
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1437 if (reportmode) 1720 if (reportmode)
1438 { 1721 {
1439 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
… …
1474 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1475 switch (ev.button) 1758 switch (ev.button)
1476 { 1759 {
1477 case Button1: 1760 case Button1:
1478 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1763 {
1481 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1483 else 1766 else
1484 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1782 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1502 else 1785 else
1503 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1504 MEvent.button = Button3; 1788 MEvent.button = Button3;
1505 break; 1789 break;
1506 } 1790 }
1507 } 1791 }
1792
1508 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1509 return; 1794 return;
1510 } 1795 }
1511 1796
1512 /* 1797 /*
… …
1665{ 1950{
1666 int reportmode = 0; 1951 int reportmode = 0;
1667 1952
1668 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 1954 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 1956
1672 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1673 { 1958 {
1674 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1675 scrollbar_show (0); 1960 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 1963#endif
1679
1680 } 1964 }
1965
1681#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 1967 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 1968 sel_scroll_ev.stop();
1684#endif 1969#endif
1970
1685 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1686 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1687 if (reportmode) 1978 if (reportmode)
1688 { 1979 {
1689 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1706 mouse_report (ev); 1997 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 1999 return;
1709 } 2000 }
2001
1710 /* 2002 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2004 * when overriding mouse reporting
1713 */ 2005 */
1714 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2007 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1718 2010
1719 switch (ev.button) 2011 switch (ev.button)
… …
1734 2026
1735 v = ev.button == Button4 ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
1736 2028
1737 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1738 i = 1; 2030 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2031 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1741 else 2033 else
1742 i = 5; 2034 i = 5;
1743 2035
1744# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
… …
2029 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
2031 2323
2032 pchanged = 0; 2324 pchanged = 0;
2033 2325
2034 if (!(Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
2036 2328
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
2039 2331
… …
2042 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
2043 { 2335 {
2044 if (am_transparent) 2336 if (am_transparent)
2045 { 2337 {
2046 pchanged = 1; 2338 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
2049 } 2341 }
2050 2342
2051 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2052 } 2344 }
… …
2147 if (ISSET_PIXCOLOR (Color_tint)) 2439 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2440 {
2149 unsigned short rm, gm, bm; 2441 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2443
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2445
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2446 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2447 }
2156#endif 2448#endif
2157 2449
… …
2176 { 2468 {
2177 unsigned int n; 2469 unsigned int n;
2178 /* 2470 /*
2179 * InheritPixmap transparency 2471 * InheritPixmap transparency
2180 */ 2472 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 { 2474 {
2184 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2478 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2479
2190 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2191 { 2481 {
2192 if (oldp != None) 2482 if (oldp != None)
2193 pchanged = 1; 2483 pchanged = 1;
… …
2204 if (pchanged) 2494 if (pchanged)
2205 { 2495 {
2206 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2207 { 2497 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2500 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break; 2502 break;
2214 } 2503 }
2215 } 2504 }
2216 } 2505 }
2217 2506
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 { 2508 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2511 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2225 } 2513 }
2226 else 2514 else
2227 { 2515 {
2228#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2519 sleep (1);
2232#endif 2520#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2235 { 2522 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2524 XClearWindow (display->display, TermWin.parent[n]);
2238 } 2525 }
… …
2243 2530
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2246 } 2533 }
2247 2534
2248 // this is experimental
2249 if (scrollBar.win) 2535 if (scrollBar.win)
2250 { 2536 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2538 scrollBar.setIdle ();
2254 scrollbar_show (0); 2539 scrollbar_show (0);
2255 } 2540 }
2256 2541
2257 return pchanged; 2542 return pchanged;
… …
2278 if (ch == NOCHAR) // TODO: improve 2563 if (ch == NOCHAR) // TODO: improve
2279 break; 2564 break;
2280 2565
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2567 {
2568 if (!seen_input)
2569 {
2570 seen_input = 1;
2571 // many badly-written programs (e.g. jed) contain a race condition:
2572 // they first read the screensize and then install a SIGWINCH handler.
2573 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized.
2578 if (seen_resize)
2579 kill (-cmd_pid, SIGWINCH);
2580 }
2581
2283 /* Read a text string from the input buffer */ 2582 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2583 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2584 bool refreshnow = false;
2286 int nlines = 0; 2585 int nlines = 0;
2287 unicode_t *str = buf; 2586 unicode_t *str = buf;
… …
2296 if (ch == C0_LF) 2595 if (ch == C0_LF)
2297 { 2596 {
2298 nlines++; 2597 nlines++;
2299 refresh_count++; 2598 refresh_count++;
2300 2599
2301 if (!(Options & Opt_jumpScroll) 2600 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2602 {
2304 refreshnow = true; 2603 refreshnow = true;
2305 ch = NOCHAR; 2604 ch = NOCHAR;
2306 break; 2605 break;
… …
2333 * the number of pages between refreshes is refresh_limit, which 2632 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2633 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2634 */
2336 if (refreshnow) 2635 if (refreshnow)
2337 { 2636 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2638 refresh_limit++;
2340 else 2639 else
2341 { 2640 {
2342 flag = true; 2641 flag = true;
2343 scr_refresh (refresh_type); 2642 scr_refresh (refresh_type);
… …
2533 process_escape_seq (); 2832 process_escape_seq ();
2534 break; 2833 break;
2535 case C0_ENQ: /* terminal Status */ 2834 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2835 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2838 else
2540 tt_write ((unsigned char *)VT100_ANS, 2839 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2840 (unsigned int)strlen (VT100_ANS));
2542 break; 2841 break;
2543 case C0_BEL: /* bell */ 2842 case C0_BEL: /* bell */
2544 scr_bell (); 2843 scr_bell ();
2545 break; 2844 break;
2546 case C0_BS: /* backspace */ 2845 case C0_BS: /* backspace */
… …
2645void 2944void
2646rxvt_term::process_escape_seq () 2945rxvt_term::process_escape_seq ()
2647{ 2946{
2648 unicode_t ch = cmd_getc (); 2947 unicode_t ch = cmd_getc ();
2649 2948
2650 if (PrivateModes & PrivMode_vt52) 2949 if (priv_modes & PrivMode_vt52)
2651 { 2950 {
2652 process_escape_vt52 (ch); 2951 process_escape_vt52 (ch);
2653 return; 2952 return;
2654 } 2953 }
2655 2954
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2969 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2970 break;
2672 case '+': 2971 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2972 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2973 break;
2675#ifndef NO_FRILLS 2974#if ENABLE_FRILLS
2676 case '6': 2975 case '6':
2677 scr_backindex (); 2976 scr_backindex ();
2678 break; 2977 break;
2679#endif 2978#endif
2680 case '7': 2979 case '7':
2681 scr_cursor (SAVE); 2980 scr_cursor (SAVE);
2682 break; 2981 break;
2683 case '8': 2982 case '8':
2684 scr_cursor (RESTORE); 2983 scr_cursor (RESTORE);
2685 break; 2984 break;
2686#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2687 case '9': 2986 case '9':
2688 scr_forwardindex (); 2987 scr_forwardindex ();
2689 break; 2988 break;
2690#endif 2989#endif
2691 case '=': 2990 case '=':
… …
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2991 break; 3290 break;
2992 3291
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3293 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3294 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3295 break;
2997 3296
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3298 process_sgr_mode (nargs, arg);
3000 break; 3299 break;
… …
3007 break; 3306 break;
3008 case 6: /* CPR requested */ 3307 case 6: /* CPR requested */
3009 scr_report_position (); 3308 scr_report_position ();
3010 break; 3309 break;
3011 case 7: /* unofficial extension */ 3310 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3311 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3312 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3313 break;
3015 case 8: /* unofficial extension */ 3314 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3316 break;
3018 } 3317 }
… …
3054 break; 3353 break;
3055 3354
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3355 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3356 if (arg[0] == 4)
3058 scr_insert_mode (0); 3357 scr_insert_mode (0);
3358 else if (arg[0] == 20)
3359 priv_modes &= ~PrivMode_LFNL;
3059 break; 3360 break;
3060 3361
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3362 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3363 if (arg[0] == 4)
3063 scr_insert_mode (1); 3364 scr_insert_mode (1);
3365 else if (arg[0] == 20)
3366 priv_modes |= PrivMode_LFNL;
3064 break; 3367 break;
3065 3368
3066 /* 3369 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3370 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3371 */
… …
3080 break; 3383 break;
3081 case CSI_75: 3384 case CSI_75:
3082 scr_cursor (RESTORE); 3385 scr_cursor (RESTORE);
3083 break; 3386 break;
3084 3387
3085#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3086 case CSI_74: 3389 case CSI_74:
3087 process_window_ops (arg, nargs); 3390 process_window_ops (arg, nargs);
3088 break; 3391 break;
3089#endif 3392#endif
3090 3393
… …
3097 break; 3400 break;
3098 } 3401 }
3099} 3402}
3100/*}}} */ 3403/*}}} */
3101 3404
3102#ifndef NO_FRILLS 3405#if ENABLE_FRILLS
3103/* ARGSUSED */ 3406/* ARGSUSED */
3104void 3407void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3408rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3409{
3107 int x, y; 3410 int x, y;
… …
3174 break; 3477 break;
3175 case 19: /* report window size (chars) */ 3478 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break; 3480 break;
3178 case 20: /* report icon label */ 3481 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3482 {
3181 char *s; 3483 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3484 XGetIconName (display->display, TermWin.parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s);
3184 } 3487 }
3185 break; 3488 break;
3186 case 21: /* report window title */ 3489 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3490 {
3189 char *s; 3491 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3492 XFetchName (display->display, TermWin.parent[0], &s);
3191 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);
3192 } 3495 }
3193 break; 3496 break;
3194 } 3497 }
3195} 3498}
3196#endif 3499#endif
3197 3500
… …
3201 * ends_how is terminator used. returned input must be free()'d 3504 * ends_how is terminator used. returned input must be free()'d
3202 */ 3505 */
3203unsigned char * 3506unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3507rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3508{
3206 unicode_t prev = 0, ch; 3509 unicode_t seen_esc = 0, ch;
3207 unsigned int n = 0; 3510 unsigned int n = 0;
3208 unsigned char *s; 3511 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3512 unsigned char string[STRING_MAX];
3210 3513
3211 while ((ch = cmd_getc ()) != NOCHAR) 3514 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3515 {
3213 if (prev == C0_ESC) 3516 if (seen_esc)
3214 { 3517 {
3215 if (ch == 0x5c) /* 7bit ST */ 3518 if (ch == 0x5c) /* 7bit ST */
3216 break; 3519 break;
3217 else 3520 else
3218 return NULL; 3521 return NULL;
3219 } 3522 }
3523 else if (ch == C0_ESC)
3524 {
3525 seen_esc = 1;
3526 continue;
3527 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3528 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3529 break;
3222 else if (ch < 0x20) 3530 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3531 return NULL; /* other control character - exit */
3532
3533 seen_esc = 0;
3224 3534
3225 if (n >= sizeof (string) - 1) 3535 if (n >= sizeof (string) - 1)
3226 // stop at some sane length 3536 // stop at some sane length
3227 return NULL; 3537 return NULL;
3228 3538
3229 if (ch == C0_SYN) 3539 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3540 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3541 else
3235 string[n++] = prev = ch; 3542 string[n++] = ch;
3236 } 3543 }
3237 3544
3238 string[n++] = '\0'; 3545 string[n++] = '\0';
3239 3546
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL; 3548 return NULL;
3242 3549
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3550 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3551 strncpy (s, string, n);
3245 return s; 3552 return s;
3246} 3553}
3247 3554
3248/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
3249/* 3556/*
… …
3294void 3601void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3603{
3297 if (str[0] == '?' && !str[1]) 3604 if (str[0] == '?' && !str[1])
3298 { 3605 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3606 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3607 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3609 }
3306 else 3610 else
3307 set_window_color (color, str); 3611 set_window_color (color, str);
3308} 3612}
3309 3613
… …
3337{ 3641{
3338 int changed = 0; 3642 int changed = 0;
3339 int color; 3643 int color;
3340 char *buf, *name; 3644 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3645 bool query = str[0] == '?' && !str[1];
3646 int saveop = op;
3342 3647
3343 assert (str != NULL); 3648 assert (str != NULL);
3344 switch (op) 3649 switch (op)
3345 { 3650 {
3346 case XTerm_name: 3651 case XTerm_name:
… …
3395 break; 3700 break;
3396 3701
3397 case XTerm_Color: 3702 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3703 for (buf = (char *)str; buf && *buf;)
3399 { 3704 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3705 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3706 break;
3402 3707
3403 *name++ = '\0'; 3708 *name++ = '\0';
3404 color = atoi (buf); 3709 color = atoi (buf);
3405 3710
3406 if (color < 0 || color >= TOTAL_COLORS) 3711 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3712 break;
3408 3713
3409 if ((buf = STRCHR (name, ';')) != NULL) 3714 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3715 *buf++ = '\0';
3411 3716
3412 if (name[0] == '?' && !name[1]) 3717 if (name[0] == '?' && !name[1])
3413 { 3718 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3719 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3722 }
3421 else 3723 else
3422 set_window_color (color + minCOLOR, name); 3724 set_window_color (color + minCOLOR, name);
3423 } 3725 }
3424 break; 3726 break;
… …
3441 break; 3743 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3744#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD: 3745 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break; 3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3446 case XTerm_Color_UL: 3751 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3753 break;
3449 case XTerm_Color_RV: 3754 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break;
3757#endif
3758#if TRANSPARENT || TINTING
3759 case XTerm_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761 check_our_parents ();
3762 if (am_transparent)
3763 want_full_refresh = want_refresh = 1;
3451 break; 3764 break;
3452#endif 3765#endif
3453 3766
3454 case XTerm_Pixmap: 3767 case XTerm_Pixmap:
3455 if (*str != ';') 3768 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3771 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3772 set_bgPixmap (str); /* change pixmap */
3460#endif 3773#endif
3461 scr_touch (true); 3774 scr_touch (true);
3462 } 3775 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3776 while ((str = strchr (str, ';')) != NULL)
3464 { 3777 {
3465 str++; 3778 str++;
3466#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3780 changed += scale_pixmap (str);
3468#endif 3781#endif
… …
3487 case XTerm_logfile: 3800 case XTerm_logfile:
3488 // TODO, when secure mode? 3801 // TODO, when secure mode?
3489 break; 3802 break;
3490 3803
3491 case XTerm_font: 3804 case XTerm_font:
3805 op = URxvt_font;
3806 case URxvt_font:
3807#if ENABLE_STYLES
3808 case URxvt_boldFont:
3809 case URxvt_italicFont:
3810 case URxvt_boldItalicFont:
3811#endif
3492 if (query) 3812 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3816 resp);
3817 else
3493 { 3818 {
3494 if (Options & Opt_insecure) 3819 const char *&res = rs[Rs_font + (op - URxvt_font)];
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3820
3496 TermWin.fontset->fontdesc 3821 res = strdup (str);
3497 ? TermWin.fontset->fontdesc 3822 allocated.push_back ((void *)res);
3498 : "", 3823 set_fonts ();
3499 resp);
3500 } 3824 }
3501 else
3502 change_font (str);
3503 break; 3825 break;
3504 3826
3505#ifndef NO_FRILLS 3827#if ENABLE_FRILLS
3506 case XTerm_locale: 3828 case XTerm_locale:
3507 if (query) 3829 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3511 }
3512 else 3831 else
3513 { 3832 {
3514 set_locale (str); 3833 set_locale (str);
3515# ifdef USE_XIM 3834# ifdef USE_XIM
3516 im_cb (); 3835 im_cb ();
3517# endif 3836# endif
3518 } 3837 }
3519 break; 3838 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif 3839#endif
3530 3840
3531#ifdef MENUBAR 3841#ifdef MENUBAR
3532 case XTerm_Menu: 3842 case XTerm_Menu:
3533 if (Options & Opt_insecure) 3843 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3845 break;
3536#endif 3846#endif
3537#if 0 3847#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
… …
3565{ 3875{
3566 int state; 3876 int state;
3567 3877
3568 if (mode == 's') 3878 if (mode == 's')
3569 { 3879 {
3570 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3571 return -1; 3881 return -1;
3572 } 3882 }
3573 else 3883 else
3574 { 3884 {
3575 if (mode == 'r') 3885 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3887 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3889 PrivMode (state, bit);
3580 } 3890 }
3581 3891
3582 return state; 3892 return state;
3583} 3893}
… …
3601 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3918#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3609#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3925#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3929 // 45 margin bell NYI
3620 // 46 start logging 3930 // 46 start logging
… …
3661 3971
3662 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3973 switch (arg[i])
3664 { 3974 {
3665 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3666 if (Options & Opt_secondaryScreen) 3977 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 3978 if (mode == 0)
3668 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3669 else if (mode == 1) 3980 else if (mode == 1)
3670 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3671 break; 3982 break;
… …
3682 * within VT52 mode 3993 * within VT52 mode
3683 */ 3994 */
3684 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3685 break; 3996 break;
3686 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3689 break; 4000 break;
3690 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3691 if (state) 4002 if (state)
3692 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3693 else 4004 else
3694 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3695 break; 4006 break;
3696 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3698 break; 4009 break;
3699 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4014 scr_autowrap (state);
3704 break; 4015 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4020 break;
3710#ifdef menuBar_esc 4021#ifdef menuBar_esc
3711 case menuBar_esc: 4022 case menuBar_esc:
3712#ifdef MENUBAR 4023#ifdef MENUBAR
3713 map_menuBar (state); 4024 map_menuBar (state);
… …
3733 break; 4044 break;
3734 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4050 break;
3740#if 0 4051#if 0
3741 case 1001: 4052 case 1001:
3742 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3743#endif 4054#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4056 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3747 else 4058 else
3748 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3749 break; 4060 break;
3750 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3751 if (state) 4062 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3753 else 4064 else
3754 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3755 break; 4066 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4067 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4068 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4070 scr_erase_screen (2);
3760 scr_change_screen (state); 4071 scr_change_screen (state);
3761 break; 4072 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4073 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4074 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4077 scr_erase_screen (2);
3767 break; 4078 break;
3768 default: 4079 default:
3769 break; 4080 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3796 break; 4107 break;
3797 case 1: 4108 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3799 break; 4110 break;
3800 //case 2: // faint or second colour 4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3801 case 4: 4115 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3803 break; 4117 break;
3804 case 5: // slowly blinking 4118 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4119 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4131 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4132 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4133 //...
3820 //case 19: // ninth alt font 4134 //case 19: // ninth alt font
3821 //case 20: // gothic 4135 //case 20: // gothic
3822 case 21: // disable bold, faint 4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
3824 break; 4138 break;
3825 case 22: 4139 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
3827 break; 4141 break;
3828 //case 23: disable italic 4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
4144 break;
3829 case 24: 4145 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3831 break; 4147 break;
3832 case 25: 4148 case 25:
4149 rendset = 0, rendstyle = RS_Blink;
4150 break;
4151 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3834 break; 4153 break;
3835 case 27: 4154 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3837 break; 4156 break;
… …
3855 case 35: 4174 case 35:
3856 case 36: 4175 case 36:
3857 case 37: 4176 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4178 break;
3860#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4181 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4183 i += 2;
3866 } 4184 }
3867 break; 4185 break;
3868#endif
3869 case 39: /* default fg */ 4186 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3871 break; 4188 break;
3872 4189
3873 case 40: 4190 case 40:
… …
3878 case 45: 4195 case 45:
3879 case 46: 4196 case 46:
3880 case 47: 4197 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4199 break;
3883#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4202 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4204 i += 2;
3889 } 4205 }
3890 break; 4206 break;
3891#endif
3892 case 49: /* default bg */ 4207 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3894 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3895 4212
3896#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3897 case 90: 4214 case 90:
3898 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3899 case 92: 4216 case 92:
3900 case 93: 4217 case 93:
3901 case 94: 4218 case 94:
3902 case 95: 4219 case 95:
3903 case 96: 4220 case 96:
3904 case 97: 4221 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4223 break;
3908 case 100: 4224 case 100:
3909 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3910 case 102: 4226 case 102:
3911 case 103: 4227 case 103:
3912 case 104: 4228 case 104:
3913 case 105: 4229 case 105:
3914 case 106: 4230 case 106:
3915 case 107: 4231 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4233 break;
3919#endif 4234#endif
3920 4235
3921 } 4236 }
3922 } 4237 }
… …
3929{ 4244{
3930 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3931 4246
3932 if (cmd == 'Q') 4247 if (cmd == 'Q')
3933 { /* query graphics */ 4248 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4250 return;
3936 } 4251 }
3937 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3938 do 4253 do
3939 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4269 unsigned char buf[256];
3955 4270
3956 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4273 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3960} 4275}
3961 4276
3962/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3965 */ 4280 */
3966void 4281void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4282rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4283{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3970 4285
3971 if (len) 4286 if (len)
3972 { 4287 {
3973 if (v_buflen == 0) 4288 if (v_buflen == 0)
3974 { 4289 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3976 4291
3977 if ((unsigned int)written == len) 4292 if ((unsigned int)written == len)
3978 return; 4293 return;
3979 4294
3980 data += written; 4295 data += written;
… …
3988 v_buflen += len; 4303 v_buflen += len;
3989 } 4304 }
3990 4305
3991 for (;;) 4306 for (;;)
3992 { 4307 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3994 4309
3995 if (written > 0) 4310 if (written > 0)
3996 { 4311 {
3997 v_buflen -= written; 4312 v_buflen -= written;
3998 4313

Diff Legend

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