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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

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

Diff Legend

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