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.35 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69/* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98 { 99 {
99 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
100 101
101 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
102 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
103 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
104 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
105 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
106 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
107 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
108 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
109 SET_LOCALE (locale); 110 SET_LOCALE (locale);
110 111
111 if (status_return == XLookupChars 112 if (status_return == XLookupChars
112 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
113 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
114 wkbuf[len] = 0; 123 wkbuf[len] = 0;
115 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
116 if (len < 0) 125 if (len < 0)
117 len = 0; 126 len = 0;
118 } 127 }
128 }
119 else 129 else
120 len = 0; 130 len = 0;
121 } 131 }
122 132
123 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
124 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
125 } 135 }
126 else 136 else
127#endif 137#endif
128 { 138 {
129 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
130 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
131 } 141 }
132 142
133 if (valid_keysym) 143 if (valid_keysym)
134 { 144 {
135/* for some backwards compatibility */ 145 /* for some backwards compatibility */
136#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
137# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
138 if (ctrl) 148 if (ctrl)
139# else 149# else
140 if (meta) 150 if (meta)
141# endif 151# endif
142 { 152 {
143 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
144 { 154 {
145 change_font (0, FONT_UP); 155 change_font (FONT_UP);
146 return; 156 return;
147 } 157 }
148 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
149 { 159 {
150 change_font (0, FONT_DN); 160 change_font (FONT_DN);
151 return; 161 return;
162 }
152 } 163 }
153 }
154#endif 164#endif
155 165
156 if (TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
157#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
158 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
159#else 171#else
160 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
161#endif 174#endif
162 int lnsppg; 175 int lnsppg;
163 176
164#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
165 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
166#else 179#else
167 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
168#endif 181#endif
169 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
183 {
170 scr_page (UP, lnsppg); 184 scr_page (UP, lnsppg);
171 return; 185 return;
186 }
172 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
188 {
173 scr_page (DN, lnsppg); 189 scr_page (DN, lnsppg);
174 return; 190 return;
175 } 191 }
176 } 192 }
177#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
178 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
179 if (keysym == XK_Up) { 195 {
180 scr_page (UP, 1); 196 if (keysym == XK_Up)
181 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
182 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
183 scr_page (DN, 1); 202 {
184 return; 203 scr_page (DN, 1);
185 } 204 return;
186 } 205 }
206 }
187#endif 207#endif
188#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
189 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
190 if (keysym == XK_Home) { 210 {
191 scr_move_to (0, 1); 211 if (keysym == XK_Home)
192 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
193 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
194 scr_move_to (1, 0); 217 {
195 return; 218 scr_move_to (1, 0);
196 } 219 return;
197 } 220 }
221 }
198#endif 222#endif
199 } 223 }
200 224
201 if (shft) { 225 if (shft)
226 {
202 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
203 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
204 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
205 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
206 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
207 switch (keysym) { 234 {
208 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
209 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
210 selection_request (ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
211 return; 240 return;
212 /* rxvt extras */ 241 /* rxvt extras */
213 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
214 change_font (0, FONT_UP); 243 change_font (FONT_UP);
215 return; 244 return;
216 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
217 change_font (0, FONT_DN); 246 change_font (FONT_DN);
218 return; 247 return;
219 } 248 }
220 } 249 }
221 } 250 }
222#ifdef PRINTPIPE 251#ifdef PRINTPIPE
223 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
253 {
224 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
225 return; 255 return;
226 } 256 }
227#endif 257#endif
228#ifdef GREEK_SUPPORT
229 if (keysym == ks_greekmodeswith) {
230 greek_mode = !greek_mode;
231 if (greek_mode) {
232 xterm_seq (XTerm_title,
233 (greek_getmode() == GREEK_ELOT928
234 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
235 greek_reset();
236 } else
237 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
238 return;
239 }
240#endif
241 258
242 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
243#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
244 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
245 unsigned int l; 263 {
264 unsigned int l;
246 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
247 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
248 267
249 kbuf0 = (Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
250 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
251 270
252 /* escape prefix */ 271 /* escape prefix */
253 if (meta) 272 if (meta)
254# ifdef META8_OPTION 273# ifdef META8_OPTION
255 if (meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
256# endif 275# endif
257 tt_write (&ch, 1); 276 tt_write (&ch, 1);
258 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
259 return; 278 return;
260 } else 279 }
280 else
261#endif 281#endif
262 { 282 {
263 newlen = 1; 283 newlen = 1;
264 switch (keysym) { 284 switch (keysym)
285 {
265#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
266 case XK_BackSpace: 287 case XK_BackSpace:
267 if (PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
268 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
269 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
270 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
271 } else 293 }
272 STRCPY(kbuf, key_backspace); 294 else
273# ifdef MULTICHAR_SET 295 STRCPY (kbuf, key_backspace);
274 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 296 break;
275 int col, row;
276
277 newlen = STRLEN(kbuf);
278 col = screen.cur.col - 1;
279 row = screen.cur.row + TermWin.saveLines;
280 if (IS_MULTI2(screen.rend[row][col]))
281 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
282 }
283# endif
284 break;
285#endif 297#endif
286#ifndef NO_DELETE_KEY 298#ifndef NO_DELETE_KEY
287 case XK_Delete: 299 case XK_Delete:
288 STRCPY(kbuf, key_delete); 300 STRCPY (kbuf, key_delete);
289# ifdef MULTICHAR_SET 301 break;
290 if (Options & Opt_mc_hack) {
291 int col, row;
292
293 newlen = STRLEN(kbuf);
294 col = screen.cur.col;
295 row = screen.cur.row + TermWin.saveLines;
296 if (IS_MULTI1(screen.rend[row][col]))
297 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
298 }
299# endif 302#endif
300 break; 303 case XK_Tab:
301#endif 304 if (shft)
302 case XK_Tab: 305 STRCPY (kbuf, "\033[Z");
303 if (shft) 306 else
304 STRCPY(kbuf, "\033[Z"); 307 {
305 else {
306#ifdef CTRL_TAB_MAKES_META 308#ifdef CTRL_TAB_MAKES_META
307 if (ctrl) 309 if (ctrl)
308 meta = 1; 310 meta = 1;
309#endif 311#endif
310#ifdef MOD4_TAB_MAKES_META 312#ifdef MOD4_TAB_MAKES_META
311 if (ev->state & Mod4Mask) 313 if (ev.state & Mod4Mask)
312 meta = 1; 314 meta = 1;
313#endif 315#endif
314 newlen = 0; 316 newlen = 0;
315 } 317 }
316 break; 318 break;
317
318 319
319#ifdef XK_KP_Left 320#ifdef XK_KP_Left
320 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
321 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
322 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
323 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
324 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
325 STRCPY(kbuf, "\033OZ"); 326 {
326 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 327 STRCPY (kbuf, "\033OZ");
327 break; 328 kbuf[2] = "txvr"[keysym - XK_KP_Left];
328 } else 329 break;
330 }
331 else
329 /* translate to std. cursor key */ 332 /* translate to std. cursor key */
330 keysym = XK_Left + (keysym - XK_KP_Left); 333 keysym = XK_Left + (keysym - XK_KP_Left);
331 /* FALLTHROUGH */ 334 /* FALLTHROUGH */
332#endif 335#endif
333 case XK_Up: /* "\033[A" */ 336 case XK_Up: /* "\033[A" */
334 case XK_Down: /* "\033[B" */ 337 case XK_Down: /* "\033[B" */
335 case XK_Right: /* "\033[C" */ 338 case XK_Right: /* "\033[C" */
336 case XK_Left: /* "\033[D" */ 339 case XK_Left: /* "\033[D" */
337 STRCPY(kbuf, "\033[Z"); 340 STRCPY (kbuf, "\033[Z");
338 kbuf[2] = ("DACB"[keysym - XK_Left]); 341 kbuf[2] = "DACB"[keysym - XK_Left];
339 /* do Shift first */ 342 /* do Shift first */
340 if (shft) 343 if (shft)
341 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = "dacb"[keysym - XK_Left];
342 else if (ctrl) { 345 else if (ctrl)
343 kbuf[1] = 'O'; 346 {
344 kbuf[2] = ("dacb"[keysym - XK_Left]); 347 kbuf[1] = 'O';
348 kbuf[2] = "dacb"[keysym - XK_Left];
349 }
345 } else if (PrivateModes & PrivMode_aplCUR) 350 else if (PrivateModes & PrivMode_aplCUR)
346 kbuf[1] = 'O'; 351 kbuf[1] = 'O';
347#ifdef MULTICHAR_SET 352 break;
348 //TODO: ??
349 if (Options & Opt_mc_hack) {
350 int col, row, m;
351
352 col = screen.cur.col;
353 row = screen.cur.row + TermWin.saveLines;
354 m = 0;
355 if (keysym == XK_Right
356 && IS_MULTI1(screen.rend[row][col]))
357 m = 1;
358 else if (keysym == XK_Left) {
359 if (col > 0) {
360 if (IS_MULTI2(screen.rend[row][col - 1]))
361 m = 1;
362 } else if (screen.cur.row > 0) {
363 col = screen.tlen[--row];
364 if (col == -1)
365 col = TermWin.ncol - 1;
366 else
367 col--;
368 if (col > 0
369 && IS_MULTI2(screen.rend[row][col]))
370 m = 1;
371 }
372 }
373 if (m)
374 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
375 }
376#endif
377 break;
378 353
379#ifndef UNSHIFTED_SCROLLKEYS 354#ifndef UNSHIFTED_SCROLLKEYS
380# ifdef XK_KP_Prior 355# ifdef XK_KP_Prior
381 case XK_KP_Prior: 356 case XK_KP_Prior:
382 /* allow shift to override */ 357 /* allow shift to override */
383 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Oy"); 359 {
385 break; 360 STRCPY (kbuf, "\033Oy");
386 } 361 break;
387 /* FALLTHROUGH */ 362 }
363 /* FALLTHROUGH */
388# endif 364# endif
389 case XK_Prior: 365 case XK_Prior:
390 STRCPY(kbuf, "\033[5~"); 366 STRCPY (kbuf, "\033[5~");
391 break; 367 break;
392# ifdef XK_KP_Next 368# ifdef XK_KP_Next
393 case XK_KP_Next: 369 case XK_KP_Next:
394 /* allow shift to override */ 370 /* allow shift to override */
395 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033Os"); 372 {
397 break; 373 STRCPY (kbuf, "\033Os");
398 } 374 break;
399 /* FALLTHROUGH */ 375 }
376 /* FALLTHROUGH */
400# endif 377# endif
401 case XK_Next: 378 case XK_Next:
402 STRCPY(kbuf, "\033[6~"); 379 STRCPY (kbuf, "\033[6~");
403 break; 380 break;
404#endif 381#endif
405 case XK_KP_Enter: 382 case XK_KP_Enter:
406 /* allow shift to override */ 383 /* allow shift to override */
407 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
408 STRCPY(kbuf, "\033OM"); 385 {
409 } else { 386 STRCPY (kbuf, "\033OM");
410 kbuf[0] = '\r'; 387 }
411 kbuf[1] = '\0'; 388 else
412 } 389 {
413 break; 390 kbuf[0] = '\r';
391 kbuf[1] = '\0';
392 }
393 break;
414 394
415#ifdef XK_KP_Begin 395#ifdef XK_KP_Begin
416 case XK_KP_Begin: 396 case XK_KP_Begin:
417 STRCPY(kbuf, "\033Ou"); 397 STRCPY (kbuf, "\033Ou");
418 break; 398 break;
419 399
420 case XK_KP_Insert: 400 case XK_KP_Insert:
421 STRCPY(kbuf, "\033Op"); 401 STRCPY (kbuf, "\033Op");
422 break; 402 break;
423 403
424 case XK_KP_Delete: 404 case XK_KP_Delete:
425 STRCPY(kbuf, "\033On"); 405 STRCPY (kbuf, "\033On");
426 break; 406 break;
427#endif 407#endif
428 case XK_KP_F1: /* "\033OP" */ 408 case XK_KP_F1: /* "\033OP" */
429 case XK_KP_F2: /* "\033OQ" */ 409 case XK_KP_F2: /* "\033OQ" */
430 case XK_KP_F3: /* "\033OR" */ 410 case XK_KP_F3: /* "\033OR" */
431 case XK_KP_F4: /* "\033OS" */ 411 case XK_KP_F4: /* "\033OS" */
432 STRCPY(kbuf, "\033OP"); 412 STRCPY (kbuf, "\033OP");
433 kbuf[2] += (keysym - XK_KP_F1); 413 kbuf[2] += (keysym - XK_KP_F1);
434 break; 414 break;
435 415
436 case XK_KP_Multiply: /* "\033Oj" : "*" */ 416 case XK_KP_Multiply: /* "\033Oj" : "*" */
437 case XK_KP_Add: /* "\033Ok" : "+" */ 417 case XK_KP_Add: /* "\033Ok" : "+" */
438 case XK_KP_Separator: /* "\033Ol" : "," */ 418 case XK_KP_Separator: /* "\033Ol" : "," */
439 case XK_KP_Subtract: /* "\033Om" : "-" */ 419 case XK_KP_Subtract: /* "\033Om" : "-" */
440 case XK_KP_Decimal: /* "\033On" : "." */ 420 case XK_KP_Decimal: /* "\033On" : "." */
441 case XK_KP_Divide: /* "\033Oo" : "/" */ 421 case XK_KP_Divide: /* "\033Oo" : "/" */
442 case XK_KP_0: /* "\033Op" : "0" */ 422 case XK_KP_0: /* "\033Op" : "0" */
443 case XK_KP_1: /* "\033Oq" : "1" */ 423 case XK_KP_1: /* "\033Oq" : "1" */
444 case XK_KP_2: /* "\033Or" : "2" */ 424 case XK_KP_2: /* "\033Or" : "2" */
445 case XK_KP_3: /* "\033Os" : "3" */ 425 case XK_KP_3: /* "\033Os" : "3" */
446 case XK_KP_4: /* "\033Ot" : "4" */ 426 case XK_KP_4: /* "\033Ot" : "4" */
447 case XK_KP_5: /* "\033Ou" : "5" */ 427 case XK_KP_5: /* "\033Ou" : "5" */
448 case XK_KP_6: /* "\033Ov" : "6" */ 428 case XK_KP_6: /* "\033Ov" : "6" */
449 case XK_KP_7: /* "\033Ow" : "7" */ 429 case XK_KP_7: /* "\033Ow" : "7" */
450 case XK_KP_8: /* "\033Ox" : "8" */ 430 case XK_KP_8: /* "\033Ox" : "8" */
451 case XK_KP_9: /* "\033Oy" : "9" */ 431 case XK_KP_9: /* "\033Oy" : "9" */
452 /* allow shift to override */ 432 /* allow shift to override */
453 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
454 STRCPY(kbuf, "\033Oj"); 434 {
455 kbuf[2] += (keysym - XK_KP_Multiply); 435 STRCPY (kbuf, "\033Oj");
456 } else { 436 kbuf[2] += (keysym - XK_KP_Multiply);
437 }
438 else
439 {
457 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
458 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
459 } 442 }
460 break; 443 break;
461 444
462 case XK_Find: 445 case XK_Find:
463 STRCPY(kbuf, "\033[1~"); 446 STRCPY (kbuf, "\033[1~");
464 break; 447 break;
465 case XK_Insert: 448 case XK_Insert:
466 STRCPY(kbuf, "\033[2~"); 449 STRCPY (kbuf, "\033[2~");
467 break; 450 break;
468#ifdef DXK_Remove /* support for DEC remove like key */ 451#ifdef DXK_Remove /* support for DEC remove like key */
469 case DXK_Remove: 452 case DXK_Remove:
470 /* FALLTHROUGH */ 453 /* FALLTHROUGH */
471#endif 454#endif
472 case XK_Execute: 455 case XK_Execute:
473 STRCPY(kbuf, "\033[3~"); 456 STRCPY (kbuf, "\033[3~");
474 break; 457 break;
475 case XK_Select: 458 case XK_Select:
476 STRCPY(kbuf, "\033[4~"); 459 STRCPY (kbuf, "\033[4~");
477 break; 460 break;
478#ifdef XK_KP_End 461#ifdef XK_KP_End
479 case XK_KP_End: 462 case XK_KP_End:
480 /* allow shift to override */ 463 /* allow shift to override */
481 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Oq"); 465 {
483 break; 466 STRCPY (kbuf, "\033Oq");
484 } 467 break;
485 /* FALLTHROUGH */ 468 }
469 /* FALLTHROUGH */
486#endif 470#endif
487 case XK_End: 471 case XK_End:
488 STRCPY(kbuf, KS_END); 472 STRCPY (kbuf, KS_END);
489 break; 473 break;
490#ifdef XK_KP_Home 474#ifdef XK_KP_Home
491 case XK_KP_Home: 475 case XK_KP_Home:
492 /* allow shift to override */ 476 /* allow shift to override */
493 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
494 STRCPY(kbuf, "\033Ow"); 478 {
495 break; 479 STRCPY (kbuf, "\033Ow");
496 } 480 break;
497 /* FALLTHROUGH */ 481 }
482 /* FALLTHROUGH */
498#endif 483#endif
499 case XK_Home: 484 case XK_Home:
500 STRCPY(kbuf, KS_HOME); 485 STRCPY (kbuf, KS_HOME);
501 break; 486 break;
502 487
503#define FKEY(n, fkey) \ 488#define FKEY(n, fkey) \
504 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
505 490
506 case XK_F1: /* "\033[11~" */ 491 case XK_F1: /* "\033[11~" */
507 case XK_F2: /* "\033[12~" */ 492 case XK_F2: /* "\033[12~" */
508 case XK_F3: /* "\033[13~" */ 493 case XK_F3: /* "\033[13~" */
509 case XK_F4: /* "\033[14~" */ 494 case XK_F4: /* "\033[14~" */
510 case XK_F5: /* "\033[15~" */ 495 case XK_F5: /* "\033[15~" */
511 FKEY(11, XK_F1); 496 FKEY (11, XK_F1);
512 break; 497 break;
513 case XK_F6: /* "\033[17~" */ 498 case XK_F6: /* "\033[17~" */
514 case XK_F7: /* "\033[18~" */ 499 case XK_F7: /* "\033[18~" */
515 case XK_F8: /* "\033[19~" */ 500 case XK_F8: /* "\033[19~" */
516 case XK_F9: /* "\033[20~" */ 501 case XK_F9: /* "\033[20~" */
517 case XK_F10: /* "\033[21~" */ 502 case XK_F10: /* "\033[21~" */
518 FKEY(17, XK_F6); 503 FKEY (17, XK_F6);
519 break; 504 break;
520 case XK_F11: /* "\033[23~" */ 505 case XK_F11: /* "\033[23~" */
521 case XK_F12: /* "\033[24~" */ 506 case XK_F12: /* "\033[24~" */
522 case XK_F13: /* "\033[25~" */ 507 case XK_F13: /* "\033[25~" */
523 case XK_F14: /* "\033[26~" */ 508 case XK_F14: /* "\033[26~" */
524 FKEY(23, XK_F11); 509 FKEY (23, XK_F11);
525 break; 510 break;
526 case XK_F15: /* "\033[28~" */ 511 case XK_F15: /* "\033[28~" */
527 case XK_F16: /* "\033[29~" */ 512 case XK_F16: /* "\033[29~" */
528 FKEY(28, XK_F15); 513 FKEY (28, XK_F15);
529 break; 514 break;
530 case XK_Help: /* "\033[28~" */ 515 case XK_Help: /* "\033[28~" */
531 FKEY(28, XK_Help); 516 FKEY (28, XK_Help);
532 break; 517 break;
533 case XK_Menu: /* "\033[29~" */ 518 case XK_Menu: /* "\033[29~" */
534 FKEY(29, XK_Menu); 519 FKEY (29, XK_Menu);
535 break; 520 break;
536 case XK_F17: /* "\033[31~" */ 521 case XK_F17: /* "\033[31~" */
537 case XK_F18: /* "\033[32~" */ 522 case XK_F18: /* "\033[32~" */
538 case XK_F19: /* "\033[33~" */ 523 case XK_F19: /* "\033[33~" */
539 case XK_F20: /* "\033[34~" */ 524 case XK_F20: /* "\033[34~" */
540 case XK_F21: /* "\033[35~" */ 525 case XK_F21: /* "\033[35~" */
541 case XK_F22: /* "\033[36~" */ 526 case XK_F22: /* "\033[36~" */
542 case XK_F23: /* "\033[37~" */ 527 case XK_F23: /* "\033[37~" */
543 case XK_F24: /* "\033[38~" */ 528 case XK_F24: /* "\033[38~" */
544 case XK_F25: /* "\033[39~" */ 529 case XK_F25: /* "\033[39~" */
545 case XK_F26: /* "\033[40~" */ 530 case XK_F26: /* "\033[40~" */
546 case XK_F27: /* "\033[41~" */ 531 case XK_F27: /* "\033[41~" */
547 case XK_F28: /* "\033[42~" */ 532 case XK_F28: /* "\033[42~" */
548 case XK_F29: /* "\033[43~" */ 533 case XK_F29: /* "\033[43~" */
549 case XK_F30: /* "\033[44~" */ 534 case XK_F30: /* "\033[44~" */
550 case XK_F31: /* "\033[45~" */ 535 case XK_F31: /* "\033[45~" */
551 case XK_F32: /* "\033[46~" */ 536 case XK_F32: /* "\033[46~" */
552 case XK_F33: /* "\033[47~" */ 537 case XK_F33: /* "\033[47~" */
553 case XK_F34: /* "\033[48~" */ 538 case XK_F34: /* "\033[48~" */
554 case XK_F35: /* "\033[49~" */ 539 case XK_F35: /* "\033[49~" */
555 FKEY(31, XK_F17); 540 FKEY (31, XK_F17);
556 break; 541 break;
557#undef FKEY 542#undef FKEY
558 default: 543 default:
559 newlen = 0; 544 newlen = 0;
560 break; 545 break;
561 } 546 }
562 if (newlen) 547 if (newlen)
563 len = STRLEN(kbuf); 548 len = STRLEN (kbuf);
564 } 549 }
565 /* 550 /*
566 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
567 */ 552 */
568#ifdef META8_OPTION 553#ifdef META8_OPTION
569 if (meta && (meta_char == 0x80) && len > 0) 554 if (meta && (meta_char == 0x80) && len > 0)
570 kbuf[len - 1] |= 0x80; 555 kbuf[len - 1] |= 0x80;
571#endif 556#endif
557
558 }
572 } else if (ctrl && keysym == XK_minus) { 559 else if (ctrl && keysym == XK_minus)
560 {
573 len = 1; 561 len = 1;
574 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 562 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
575 } else { 563 }
564 else
565 {
576#ifdef META8_OPTION 566#ifdef META8_OPTION
577 /* set 8-bit on */ 567 /* set 8-bit on */
578 if (meta && (meta_char == 0x80)) { 568 if (meta && (meta_char == 0x80))
579 unsigned char *ch; 569 {
570 unsigned char *ch;
580 571
581 for (ch = kbuf; ch < kbuf + len; ch++) 572 for (ch = kbuf; ch < kbuf + len; ch++)
582 *ch |= 0x80; 573 *ch |= 0x80;
583 meta = 0; 574 meta = 0;
575 }
576#endif
577 /* nil */ ;
578 }
584 } 579 }
585#endif 580
586#ifdef GREEK_SUPPORT 581 if (len <= 0)
587 if (greek_mode) 582 return; /* not mapped */
588 len = greek_xlat(kbuf, len); 583
589#endif 584 if (Options & Opt_scrollTtyKeypress)
590 /* nil */ ; 585 if (TermWin.view_start)
591 } 586 {
587 TermWin.view_start = 0;
588 want_refresh = 1;
592 } 589 }
593 590
594 if (len <= 0) 591 /*
595 return; /* not mapped */
596
597 if (Options & Opt_scrollTtyKeypress)
598 if (TermWin.view_start) {
599 TermWin.view_start = 0;
600 want_refresh = 1;
601 }
602
603/*
604 * these modifications only affect the static keybuffer 592 * these modifications only affect the static keybuffer
605 * pass Shift/Control indicators for function keys ending with `~' 593 * pass Shift/Control indicators for function keys ending with `~'
606 * 594 *
607 * eg, 595 * eg,
608 * Prior = "ESC[5~" 596 * Prior = "ESC[5~"
609 * Shift+Prior = "ESC[5$" 597 * Shift+Prior = "ESC[5$"
610 * Ctrl+Prior = "ESC[5^" 598 * Ctrl+Prior = "ESC[5^"
611 * Ctrl+Shift+Prior = "ESC[5@" 599 * Ctrl+Shift+Prior = "ESC[5@"
612 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 600 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
613 */ 601 */
614 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 602 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
615 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
616 604
617/* escape prefix */ 605 /* escape prefix */
618 if (meta 606 if (meta
619#ifdef META8_OPTION 607#ifdef META8_OPTION
620 && (meta_char == C0_ESC) 608 && meta_char == C0_ESC
621#endif 609#endif
622 ) { 610 )
611 {
623 const unsigned char ch = C0_ESC; 612 const unsigned char ch = C0_ESC;
624
625 tt_write(&ch, 1); 613 tt_write (&ch, 1);
626 } 614 }
615
627#ifdef DEBUG_CMD 616#if defined(DEBUG_CMD)
628 if (debug_key) { /* Display keyboard buffer contents */ 617 /* Display keyboard buffer contents */
629 char *p; 618 unsigned char *p;
630 int i; 619 int i;
631 620
632 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
633 for (i = 0, p = kbuf; i < len; i++, p++) 622 for (i = 0, p = kbuf; i < len; i++, p++)
634 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
635 fprintf(stderr, "'\n"); 624 fprintf (stderr, "'\n");
636 }
637#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
638 tt_write (kbuf, (unsigned int)len); 626 tt_write (kbuf, (unsigned int)len);
639} 627}
640/*}}} */ 628/*}}} */
641 629
642#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
643/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
644/* attempt to `write' count to the input buffer */ 632/* attempt to `write' count to the input buffer */
645unsigned int 633unsigned int
646rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 634rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
647{ 635{
648 unsigned int n, s; 636 unsigned int n, s;
649 637
650 n = cmdbuf_ptr - cmdbuf_base; 638 n = cmdbuf_ptr - cmdbuf_base;
651 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
640
652 if (n > 0 && s < count) { 641 if (n > 0 && s < count)
642 {
653 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 643 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
654 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
655 cmdbuf_ptr = cmdbuf_base; 645 cmdbuf_ptr = cmdbuf_base;
656 cmdbuf_endp -= n; 646 cmdbuf_endp -= n;
657 s += n; 647 s += n;
658 } 648 }
649
659 if (count > s) { 650 if (count > s)
651 {
660 rxvt_print_error("data loss: cmd_write too large"); 652 rxvt_print_error ("data loss: cmd_write too large");
661 count = s; 653 count = s;
662 } 654 }
655
663 for (; count--;) 656 for (; count--;)
664 *cmdbuf_endp++ = *str++; 657 *cmdbuf_endp++ = *str++;
658
659 cmd_parse ();
660
665 return 0; 661 return 0;
666} 662}
667#endif /* MENUBAR_MAX */ 663#endif /* MENUBAR_MAX */
668 664
669void 665void
670rxvt_term::flush () 666rxvt_term::flush ()
… …
684 scr_refresh (refresh_type); 680 scr_refresh (refresh_type);
685 scrollbar_show (1); 681 scrollbar_show (1);
686#ifdef USE_XIM 682#ifdef USE_XIM
687 IMSendSpot (); 683 IMSendSpot ();
688#endif 684#endif
689 }
690 685
691 XFlush (Xdisplay); 686 }
687
688 display->flush ();
692} 689}
693 690
694void 691void
695rxvt_term::check_cb (check_watcher &w) 692rxvt_term::check_cb (check_watcher &w)
696{ 693{
697 SET_R (this); 694 SET_R (this);
698 SET_LOCALE (locale); 695 SET_LOCALE (locale);
699 696
700 flush (); 697 flush ();
701}
702
703void
704rxvt_term::process_x_events ()
705{
706 do
707 {
708 XEvent xev;
709
710 XNextEvent (Xdisplay, &xev);
711
712#if defined(CURSOR_BLINK)
713 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
714 {
715 if (hidden_cursor)
716 {
717 hidden_cursor = 0;
718 want_refresh = 1;
719 }
720
721 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
722 }
723#endif
724
725#if defined(POINTER_BLANK)
726 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 process_x_event (&xev);
743 }
744 while (XPending (Xdisplay));
745} 698}
746 699
747#ifdef CURSOR_BLINK 700#ifdef CURSOR_BLINK
748void 701void
749rxvt_term::cursor_blink_cb (time_watcher &w) 702rxvt_term::cursor_blink_cb (time_watcher &w)
… …
766 w.start (w.at + TEXT_BLINK_INTERVAL); 719 w.start (w.at + TEXT_BLINK_INTERVAL);
767 } 720 }
768} 721}
769#endif 722#endif
770 723
771void
772rxvt_term::x_cb (io_watcher &w, short revents)
773{
774 SET_R (this);
775 SET_LOCALE (locale);
776
777 process_x_events ();
778}
779
780bool 724bool
781rxvt_term::pty_fill () 725rxvt_term::pty_fill ()
782{ 726{
783 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 727 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
784 728
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 729 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 730 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 731 cmdbuf_endp = cmdbuf_ptr + n;
788 732
789 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
790 734
791 if (n > 0) 735 if (n > 0)
792 { 736 {
793 cmdbuf_endp += n; 737 cmdbuf_endp += n;
794 return true; 738 return true;
795 } 739 }
796 else if (n < 0 && errno != EAGAIN) 740 else if (n < 0 && errno != EAGAIN)
797 destroy (); 741 destroy ();
798 742
799 return false; 743 return false;
800} 744}
801 745
802void 746void
803rxvt_term::pty_cb (io_watcher &w, short revents) 747rxvt_term::pty_cb (io_watcher &w, short revents)
… …
820 seen_input = 1; 764 seen_input = 1;
821 /* once we know the shell is running, send the screen size. Again! */ 765 /* once we know the shell is running, send the screen size. Again! */
822 tt_winch (); 766 tt_winch ();
823 } 767 }
824 768
769 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
825 uint32_t ch = NOCHAR; 779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
826 798
827 for (;;) 799 for (;;)
828 { 800 {
829 if (ch == NOCHAR)
830 ch = next_char (); 801 ch = next_char ();
831 802
832 if (ch == NOCHAR) // TODO: improve 803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
833 break; 804 break;
834 805 else
835 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
836 { 806 {
837 /* Read a text string from the input buffer */
838 uint32_t buf[BUFSIZ];
839 bool refreshnow = false;
840 int nlines = 0;
841 uint32_t *str = buf;
842
843 *str++ = ch; 807 *str++ = ch;
844 808
845 for (;;) 809 if (ch == '\n')
846 { 810 {
847 ch = next_char ();
848
849 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
850 break;
851 else 811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 { 816 {
853 *str++ = ch;
854
855 if (ch == '\n')
856 {
857 nlines++;
858 refresh_count++;
859
860 if (!(Options & Opt_jumpScroll)
861 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
862 {
863 refreshnow = true; 817 refreshnow = true;
864 flag = false; 818 flag = false;
865 ch = NOCHAR;
866 break;
867 }
868 }
869
870 if (str >= buf + BUFSIZ)
871 {
872 ch = NOCHAR; 819 ch = NOCHAR;
873 break; 820 break;
874 } 821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
875 } 829 }
876 } 830 }
877 831
878 scr_add_lines (buf, nlines, str - buf); 832 if (str >= buf + BUFSIZ)
879
880 /*
881 * If there have been a lot of new lines, then update the screen
882 * What the heck I'll cheat and only refresh less than every page-full.
883 * the number of pages between refreshes is refresh_limit, which
884 * is incremented here because we must be doing flat-out scrolling.
885 *
886 * refreshing should be correct for small scrolls, because of the
887 * time-out
888 */
889 if (refreshnow)
890 { 833 {
891 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 834 ch = NOCHAR;
892 refresh_limit++; 835 break;
893
894 scr_refresh (refresh_type);
895 } 836 }
896
897 }
898 else
899 {
900 switch (ch)
901 {
902 default:
903 process_nonprinting (ch);
904 break;
905 case C0_ESC: /* escape char */
906 process_escape_seq ();
907 break;
908 /*case 0x9b: */ /* CSI */
909 /* process_csi_seq (); */
910 }
911
912 ch = NOCHAR;
913 } 837 }
914 } 838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
915 } 861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
916 } 876 }
877
878 return flag;
917} 879}
918 880
919// read the next character, currently handles UTF-8 881// read the next character, currently handles UTF-8
920// will probably handle all sorts of other stuff in the future 882// will probably handle all sorts of other stuff in the future
921uint32_t 883uint32_t
922rxvt_term::next_char () 884rxvt_term::next_char ()
923{ 885{
924 while (cmdbuf_ptr < cmdbuf_endp) 886 while (cmdbuf_ptr < cmdbuf_endp)
925 { 887 {
926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
890 || !*cmdbuf_ptr)
927 return *cmdbuf_ptr++; 891 return *cmdbuf_ptr++;
928 892
929 wchar_t wc; 893 wchar_t wc;
930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
931 895
932 if (len == (size_t)-2) 896 if (len == (size_t)-2)
933 return NOCHAR; 897 {
898 // the mbstate stores incomplete sequences. didn't know this :/
899 cmdbuf_ptr = cmdbuf_endp;
900 break;
901 }
934 902
935 if (len == (size_t)-1) 903 if (len == (size_t)-1)
936 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
937 905
938 // assume wchar == unicode 906 // assume wchar == unicode
… …
941 } 909 }
942 910
943 return NOCHAR; 911 return NOCHAR;
944} 912}
945 913
946/* rxvt_cmd_getc() - Return next input character */ 914/* rxvt_cmd_getc () - Return next input character */
947/* 915/*
948 * Return the next input character after first passing any keyboard input 916 * Return the next input character after first passing any keyboard input
949 * to the command. 917 * to the command.
950 */ 918 */
951uint32_t 919uint32_t
… …
961 // would be preferred. either setjmp/longjmp or better design. 929 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (cmd_fd, F_SETFL, 0); 930 fcntl (cmd_fd, F_SETFL, 0);
963 pty_fill (); 931 pty_fill ();
964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
965 } 933 }
966
967#if 0
968#define TIMEOUT_USEC 5000
969 fd_set readfds;
970 int quick_timeout, select_res;
971 int want_motion_time, want_keypress_time;
972 struct timeval value;
973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
974 struct timeval tp;
975#endif
976
977 for (;;) {
978 /* loop until we can return something */
979
980 if (v_bufstr < v_bufptr) /* output any pending chars */
981 tt_write(NULL, 0);
982
983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
984 if (mouse_slip_wheel_speed) {
985 quick_timeout = 1;
986 if (!mouse_slip_wheel_delay--
987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
988 abs(mouse_slip_wheel_speed))) {
989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
990 refresh_type |= SMOOTH_REFRESH;
991 want_refresh = 1;
992 }
993 }
994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
995#ifdef SELECTION_SCROLLING
996 if (pending_scroll_selection) {
997 quick_timeout = 1;
998 if (!scroll_selection_delay--
999 && scr_page (scroll_selection_dir,
1000 scroll_selection_lines)) {
1001 selection_extend (selection_save_x,
1002 selection_save_y, selection_save_state);
1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 }
1007 }
1008#endif
1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1011 quick_timeout = 1;
1012 if (!scroll_arrow_delay--
1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 }
1018 }
1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1020
1021#ifdef TRANSPARENT
1022 quick_timeout |= want_full_refresh;
1023#endif
1024#endif
1025} 934}
1026 935
1027#ifdef POINTER_BLANK 936#ifdef POINTER_BLANK
1028void 937void
1029rxvt_term::pointer_unblank () 938rxvt_term::pointer_unblank ()
1030{ 939{
1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1032 recolour_cursor (); 941 recolour_cursor ();
1033 942
1034 hidden_pointer = 0; 943 hidden_pointer = 0;
1035 944
1036 if (Options & Opt_pointerBlank) 945 if (Options & Opt_pointerBlank)
… …
1038} 947}
1039 948
1040void 949void
1041rxvt_term::pointer_blank () 950rxvt_term::pointer_blank ()
1042{ 951{
1043 if (!(Options & Opt_pointerBlank)) 952 if (! (Options & Opt_pointerBlank))
1044 return; 953 return;
1045 954
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 955 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 956 XFlush (display->display);
1048 957
1049 hidden_pointer = 1; 958 hidden_pointer = 1;
1050} 959}
1051 960
1052void 961void
… …
1058 pointer_blank (); 967 pointer_blank ();
1059} 968}
1060#endif 969#endif
1061 970
1062void 971void
1063rxvt_term::mouse_report (const XButtonEvent *ev) 972rxvt_term::mouse_report (XButtonEvent &ev)
1064{ 973{
1065 int button_number, key_state = 0; 974 int button_number, key_state = 0;
1066 int x, y; 975 int x, y;
1067 976
1068 x = ev->x; 977 x = ev.x;
1069 y = ev->y; 978 y = ev.y;
1070 pixel_position (&x, &y); 979 pixel_position (&x, &y);
1071 980
1072 if (MEvent.button == AnyButton) { 981 if (MEvent.button == AnyButton)
982 {
1073 button_number = 3; 983 button_number = 3;
1074 } else { 984 }
985 else
986 {
1075 button_number = MEvent.button - Button1; 987 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 988 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 989 if (button_number >= 3)
1078 button_number += (64 - 3); 990 button_number += (64 - 3);
1079 } 991 }
1080 992
1081 if (PrivateModes & PrivMode_MouseX10) { 993 if (PrivateModes & PrivMode_MouseX10)
994 {
1082 /* 995 /*
1083 * do not report ButtonRelease 996 * do not report ButtonRelease
1084 * no state info allowed 997 * no state info allowed
1085 */ 998 */
1086 key_state = 0; 999 key_state = 0;
1087 if (button_number == 3) 1000 if (button_number == 3)
1088 return; 1001 return;
1089 } else { 1002 }
1003 else
1004 {
1090 /* XTerm mouse reporting needs these values: 1005 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 1006 * 4 = Shift
1092 * 8 = Meta 1007 * 8 = Meta
1093 * 16 = Control 1008 * 16 = Control
1094 * plus will add in our own Double-Click reporting 1009 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 1010 * 32 = Double Click
1096 */ 1011 */
1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1012 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1013 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((MEvent.state & ControlMask) ? 16 : 0); 1014 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 1015#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1016 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 1017#endif
1018
1103 } 1019 }
1104 1020
1105#ifdef DEBUG_MOUSEREPORT 1021#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 1022 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 1023 if (key_state & 16)
1108 fputc('C', stderr); 1024 fputc ('C', stderr);
1109 if (key_state & 4) 1025 if (key_state & 4)
1110 fputc('S', stderr); 1026 fputc ('S', stderr);
1111 if (key_state & 8) 1027 if (key_state & 8)
1112 fputc('A', stderr); 1028 fputc ('A', stderr);
1113 if (key_state & 32) 1029 if (key_state & 32)
1114 fputc('2', stderr); 1030 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 1031 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 1032 button_number,
1117 x + 1, 1033 x + 1,
1118 y + 1); 1034 y + 1);
1119#else 1035#else
1120 tt_printf("\033[M%c%c%c", 1036 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 1037 (32 + button_number + key_state),
1122 (32 + x + 1), 1038 (32 + x + 1),
1123 (32 + y + 1)); 1039 (32 + y + 1));
1124#endif 1040#endif
1125} 1041}
1126 1042
1127#ifdef USING_W11LIB 1043#ifdef USING_W11LIB
1128void 1044void
1129rxvt_W11_process_x_event(XEvent *ev) 1045rxvt_W11_process_x_event (XEvent *ev)
1130{ 1046{
1131 rxvt_t *r = rxvt_get_r(); 1047 rxvt_t *r = rxvt_get_r ();
1132 1048
1133 process_x_event (ev); 1049 x_cb (*ev);
1134} 1050}
1135#endif 1051#endif
1136 1052
1137/*{{{ process an X event */ 1053/*{{{ process an X event */
1138void 1054void
1139rxvt_term::process_x_event (XEvent *ev) 1055rxvt_term::x_cb (XEvent &ev)
1140{ 1056{
1057 SET_R (this);
1058 SET_LOCALE (locale);
1059
1060#if defined(CURSOR_BLINK)
1061 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1062 {
1063 if (hidden_cursor)
1064 {
1065 hidden_cursor = 0;
1066 want_refresh = 1;
1067 }
1068
1069 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1070 }
1071#endif
1072
1073#if defined(POINTER_BLANK)
1074 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1075 {
1076 if (ev.type == MotionNotify
1077 || ev.type == ButtonPress
1078 || ev.type == ButtonRelease)
1079 if (hidden_pointer)
1080 pointer_unblank ();
1081
1082 if (ev.type == KeyPress && hidden_pointer == 0)
1083 pointer_blank ();
1084 }
1085#endif
1086
1087#ifdef USE_XIM
1088 if (XFilterEvent (&ev, None))
1089 return;
1090#endif
1091
1141 Window unused_root, unused_child; 1092 Window unused_root, unused_child;
1142 int unused_root_x, unused_root_y; 1093 int unused_root_x, unused_root_y;
1143 unsigned int unused_mask; 1094 unsigned int unused_mask;
1144 1095
1145#ifdef DEBUG_X 1096#ifdef DEBUG_X
1146 const char *const eventnames[] = 1097 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1098 { /* mason - this matches my system */
1148 "", 1099 "",
1149 "", 1100 "",
1150 "KeyPress", 1101 "KeyPress",
1151 "KeyRelease", 1102 "KeyRelease",
1152 "ButtonPress", 1103 "ButtonPress",
1153 "ButtonRelease", 1104 "ButtonRelease",
1154 "MotionNotify", 1105 "MotionNotify",
1155 "EnterNotify", 1106 "EnterNotify",
1156 "LeaveNotify", 1107 "LeaveNotify",
1157 "FocusIn", 1108 "FocusIn",
1158 "FocusOut", 1109 "FocusOut",
1159 "KeymapNotify", 1110 "KeymapNotify",
1160 "Expose", 1111 "Expose",
1161 "GraphicsExpose", 1112 "GraphicsExpose",
1162 "NoExpose", 1113 "NoExpose",
1163 "VisibilityNotify", 1114 "VisibilityNotify",
1164 "CreateNotify", 1115 "CreateNotify",
1165 "DestroyNotify", 1116 "DestroyNotify",
1166 "UnmapNotify", 1117 "UnmapNotify",
1167 "MapNotify", 1118 "MapNotify",
1168 "MapRequest", 1119 "MapRequest",
1169 "ReparentNotify", 1120 "ReparentNotify",
1170 "ConfigureNotify", 1121 "ConfigureNotify",
1171 "ConfigureRequest", 1122 "ConfigureRequest",
1172 "GravityNotify", 1123 "GravityNotify",
1173 "ResizeRequest", 1124 "ResizeRequest",
1174 "CirculateNotify", 1125 "CirculateNotify",
1175 "CirculateRequest", 1126 "CirculateRequest",
1176 "PropertyNotify", 1127 "PropertyNotify",
1177 "SelectionClear", 1128 "SelectionClear",
1178 "SelectionRequest", 1129 "SelectionRequest",
1179 "SelectionNotify", 1130 "SelectionNotify",
1180 "ColormapNotify", 1131 "ColormapNotify",
1181 "ClientMessage", 1132 "ClientMessage",
1182 "MappingNotify" 1133 "MappingNotify"
1183 }; 1134 };
1184#endif 1135#endif
1185 1136
1186#ifdef DEBUG_X 1137#ifdef DEBUG_X
1187 struct timeval tp; 1138 struct timeval tp;
1188 struct tm *ltt; 1139 struct tm *ltt;
1189 (void)gettimeofday(&tp, NULL); 1140 (void)gettimeofday (&tp, NULL);
1190 ltt = localtime(&(tp.tv_sec)); 1141 ltt = localtime (& (tp.tv_sec));
1191 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)); 1142 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));
1192#endif 1143#endif
1193 1144
1194 switch (ev->type) { 1145 switch (ev.type)
1146 {
1195 case KeyPress: 1147 case KeyPress:
1196 lookup_key ((XKeyEvent *)ev); 1148 lookup_key (ev.xkey);
1197 break; 1149 break;
1198 1150
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 case KeyRelease: 1152 case KeyRelease:
1201 { 1153 {
1202 if (!(ev->xkey.state & ControlMask)) 1154 if (! (ev.xkey.state & ControlMask))
1203 mouse_slip_wheel_speed = 0;
1204 else {
1205 KeySym ks;
1206
1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1208 if (ks == XK_Control_L || ks == XK_Control_R)
1209 mouse_slip_wheel_speed = 0; 1155 mouse_slip_wheel_speed = 0;
1210 } 1156 else
1211 break; 1157 {
1212 } 1158 KeySym ks;
1213#endif
1214 1159
1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1161 if (ks == XK_Control_L || ks == XK_Control_R)
1162 mouse_slip_wheel_speed = 0;
1163 }
1164 break;
1165 }
1166#endif
1167
1215 case ButtonPress: 1168 case ButtonPress:
1216 button_press ((XButtonEvent *)ev); 1169 button_press (ev.xbutton);
1217 break; 1170 break;
1218 1171
1219 case ButtonRelease: 1172 case ButtonRelease:
1220 button_release ((XButtonEvent *)ev); 1173 button_release (ev.xbutton);
1221 break; 1174 break;
1222 1175
1223 case ClientMessage: 1176 case ClientMessage:
1224 if (ev->xclient.format == 32 1177 if (ev.xclient.format == 32
1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1178 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1226 destroy (); 1179 destroy ();
1227#ifdef OFFIX_DND 1180#ifdef OFFIX_DND
1228 /* OffiX Dnd (drag 'n' drop) protocol */ 1181 /* OffiX Dnd (drag 'n' drop) protocol */
1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1182 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1230 && (ev->xclient.data.l[0] == DndFile 1183 && (ev.xclient.data.l[0] == DndFile
1231 || ev->xclient.data.l[0] == DndDir 1184 || ev.xclient.data.l[0] == DndDir
1232 || ev->xclient.data.l[0] == DndLink)) { 1185 || ev.xclient.data.l[0] == DndLink))
1233 /* Get Dnd data */ 1186 {
1187 /* Get Dnd data */
1234 Atom ActualType; 1188 Atom ActualType;
1235 int ActualFormat; 1189 int ActualFormat;
1236 unsigned char *data; 1190 unsigned char *data;
1237 unsigned long Size, RemainingBytes; 1191 unsigned long Size, RemainingBytes;
1238 1192
1239 XGetWindowProperty(Xdisplay, Xroot, 1193 XGetWindowProperty (display->display, display->root,
1240 xa[XA_DNDSELECTION], 1194 xa[XA_DNDSELECTION],
1241 0L, 1000000L, 1195 0L, 1000000L,
1242 False, AnyPropertyType, 1196 False, AnyPropertyType,
1243 &ActualType, &ActualFormat, 1197 &ActualType, &ActualFormat,
1244 &Size, &RemainingBytes, 1198 &Size, &RemainingBytes,
1245 &data); 1199 &data);
1246 XChangeProperty(Xdisplay, Xroot, 1200 XChangeProperty (display->display, display->root,
1247 XA_CUT_BUFFER0, XA_STRING, 1201 XA_CUT_BUFFER0, XA_STRING,
1248 8, PropModeReplace, 1202 8, PropModeReplace,
1249 data, STRLEN(data)); 1203 data, STRLEN (data));
1250 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1204 selection_paste (display->root, XA_CUT_BUFFER0, True);
1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1252 } 1206 }
1253#endif /* OFFIX_DND */ 1207#endif /* OFFIX_DND */
1254 break; 1208 break;
1255 1209
1256 case MappingNotify: 1210 case MappingNotify:
1257 XRefreshKeyboardMapping(&(ev->xmapping)); 1211 XRefreshKeyboardMapping (& (ev.xmapping));
1258 break; 1212 break;
1259 1213
1260 /* 1214 /*
1261 * XXX: this is not the _current_ arrangement 1215 * XXX: this is not the _current_ arrangement
1262 * Here's my conclusion: 1216 * Here's my conclusion:
1263 * If the window is completely unobscured, use bitblt's 1217 * If the window is completely unobscured, use bitblt's
1264 * to scroll. Even then, they're only used when doing partial 1218 * to scroll. Even then, they're only used when doing partial
1265 * screen scrolling. When partially obscured, we have to fill 1219 * screen scrolling. When partially obscured, we have to fill
1266 * in the GraphicsExpose parts, which means that after each refresh, 1220 * in the GraphicsExpose parts, which means that after each refresh,
1267 * we need to wait for the graphics expose or Noexpose events, 1221 * we need to wait for the graphics expose or Noexpose events,
1268 * which ought to make things real slow! 1222 * which ought to make things real slow!
1269 */ 1223 */
1270 case VisibilityNotify: 1224 case VisibilityNotify:
1271 switch (ev->xvisibility.state) 1225 switch (ev.xvisibility.state)
1272 { 1226 {
1273 case VisibilityUnobscured: 1227 case VisibilityUnobscured:
1274 refresh_type = FAST_REFRESH; 1228 refresh_type = FAST_REFRESH;
1275 break; 1229 break;
1276 case VisibilityPartiallyObscured: 1230 case VisibilityPartiallyObscured:
… …
1278 break; 1232 break;
1279 default: 1233 default:
1280 refresh_type = NO_REFRESH; 1234 refresh_type = NO_REFRESH;
1281 break; 1235 break;
1282 } 1236 }
1283 break; 1237 break;
1284 1238
1285 case FocusIn: 1239 case FocusIn:
1286 if (!TermWin.focus) { 1240 if (!TermWin.focus)
1241 {
1287 TermWin.focus = 1; 1242 TermWin.focus = 1;
1288 want_refresh = 1; 1243 want_refresh = 1;
1289#ifdef USE_XIM 1244#ifdef USE_XIM
1290 if (Input_Context != NULL) 1245 if (Input_Context != NULL)
1291 XSetICFocus(Input_Context); 1246 XSetICFocus (Input_Context);
1292#endif 1247#endif
1293#ifdef CURSOR_BLINK 1248#ifdef CURSOR_BLINK
1294 if (Options & Opt_cursorBlink) 1249 if (Options & Opt_cursorBlink)
1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1296#endif 1251#endif
1297 }
1298 break;
1299 1252
1253 }
1254 break;
1255
1300 case FocusOut: 1256 case FocusOut:
1301 if (TermWin.focus) { 1257 if (TermWin.focus)
1258 {
1302 TermWin.focus = 0; 1259 TermWin.focus = 0;
1303 want_refresh = 1; 1260 want_refresh = 1;
1304#ifdef USE_XIM 1261#ifdef USE_XIM
1305 if (Input_Context != NULL) 1262 if (Input_Context != NULL)
1306 XUnsetICFocus(Input_Context); 1263 XUnsetICFocus (Input_Context);
1307#endif 1264#endif
1308#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1309 if (Options & Opt_cursorBlink) 1266 if (Options & Opt_cursorBlink)
1310 cursor_blink_ev.stop (); 1267 cursor_blink_ev.stop ();
1311 hidden_cursor = 0; 1268 hidden_cursor = 0;
1312#endif 1269#endif
1313 }
1314 break;
1315 1270
1271 }
1272 break;
1273
1316 case ConfigureNotify: 1274 case ConfigureNotify:
1317 if (ev->xconfigure.window == TermWin.parent[0]) { 1275 if (ev.xconfigure.window == TermWin.parent[0])
1318 int height, width; 1276 {
1277 int height, width;
1319 1278
1279 do
1320 do { /* Wrap lots of configures into one */ 1280 { /* Wrap lots of configures into one */
1321 width = ev->xconfigure.width; 1281 width = ev.xconfigure.width;
1322 height = ev->xconfigure.height; 1282 height = ev.xconfigure.height;
1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1284 }
1325 ConfigureNotify, ev)); 1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286
1326 if (szHint.width != width || szHint.height != height) { 1287 if (szHint.width != width || szHint.height != height)
1288 {
1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1328 resize_all_windows (width, height, 1); 1290 resize_all_windows (width, height, 1);
1329 } 1291 }
1330#ifdef DEBUG_SIZE 1292#ifdef DEBUG_SIZE
1331 else { 1293 else
1294 {
1332 D_SIZE((stderr, "Size: Not resizing")); 1295 D_SIZE ((stderr, "Size: Not resizing"));
1333 } 1296 }
1334#endif 1297#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) { 1299 if (Options & Opt_transparent)
1337 check_our_parents (); 1300 {
1338 if (am_transparent) 1301 check_our_parents ();
1302 if (am_transparent)
1339 want_full_refresh = 1; 1303 want_full_refresh = 1;
1340 } 1304 }
1341#endif 1305#endif
1342 }
1343 break;
1344 1306
1307 }
1308 break;
1309
1345 case SelectionClear: 1310 case SelectionClear:
1346 selection_clear (); 1311 display->set_selection_owner (0);
1347 break; 1312 break;
1348 1313
1349 case SelectionNotify: 1314 case SelectionNotify:
1350 if (selection_wait == Sel_normal) 1315 if (selection_wait == Sel_normal)
1351 selection_paste (ev->xselection.requestor, 1316 selection_paste (ev.xselection.requestor,
1352 ev->xselection.property, True); 1317 ev.xselection.property, True);
1353 break; 1318 break;
1354 1319
1355 case SelectionRequest: 1320 case SelectionRequest:
1356 selection_send (&(ev->xselectionrequest)); 1321 selection_send (ev.xselectionrequest);
1357 break; 1322 break;
1358 1323
1359 case UnmapNotify: 1324 case UnmapNotify:
1360 TermWin.mapped = 0; 1325 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK 1326#ifdef TEXT_BLINK
1362 text_blink_ev.stop (); 1327 text_blink_ev.stop ();
1363#endif 1328#endif
1364 break; 1329 break;
1365 1330
1366 case MapNotify: 1331 case MapNotify:
1367 TermWin.mapped = 1; 1332 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK 1333#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif 1335#endif
1371 break;
1372
1373 case PropertyNotify:
1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1375 if (ev->xproperty.state == PropertyNewValue)
1376 selection_property (ev->xproperty.window,
1377 ev->xproperty.atom);
1378 break; 1336 break;
1379 } 1337
1380#ifdef TRANSPARENT 1338#ifdef TRANSPARENT
1381 /*
1382 * if user used some Esetroot compatible prog to set the root bg,
1383 * use the property to determine the pixmap. We use it later on.
1384 */
1385 if (xa[XA_XROOTPMAPID] == 0)
1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1387 "_XROOTPMAP_ID", False);
1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1389 break;
1390 /* FALLTHROUGH */
1391 case ReparentNotify: 1339 case ReparentNotify:
1392 if ((Options & Opt_transparent) && check_our_parents ()) { 1340 rootwin_cb (ev);
1393 if (am_transparent) 1341 break;
1394 want_full_refresh = 1;
1395 }
1396#endif /* TRANSPARENT */ 1342#endif /* TRANSPARENT */
1397 break;
1398 1343
1399 case GraphicsExpose: 1344 case GraphicsExpose:
1400 case Expose: 1345 case Expose:
1401 if (ev->xany.window == TermWin.vt) { 1346 if (ev.xany.window == TermWin.vt)
1347 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1348#ifdef NO_SLOW_LINK_SUPPORT
1403 scr_expose (ev->xexpose.x, ev->xexpose.y, 1349 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev->xexpose.width, ev->xexpose.height, False); 1350 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1351#else
1406 // don't understand this, so commented it out 1352 // don't understand this, so commented it out
1407 scr_expose (ev->xexpose.x, ev->xexpose.y, 1353 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev->xexpose.width, ev->xexpose.height, False); 1354 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev->xexpose.x, 0, 1355 //scr_expose (ev.xexpose.x, 0,
1410 // ev->xexpose.width, TermWin.height, False); 1356 // ev.xexpose.width, TermWin.height, False);
1411#endif 1357#endif
1412 want_refresh = 1; 1358 want_refresh = 1;
1413 } else { 1359 }
1414 XEvent unused_xevent; 1360 else
1361 {
1362 XEvent unused_event;
1415 1363
1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1417 Expose, 1365 Expose,
1418 &unused_xevent)) ; 1366 &unused_event)) ;
1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1420 GraphicsExpose, 1368 GraphicsExpose,
1421 &unused_xevent)) ; 1369 &unused_event)) ;
1422 if (isScrollbarWindow(ev->xany.window)) { 1370 if (isScrollbarWindow (ev.xany.window))
1423 scrollBar.setIdle(); 1371 {
1424 scrollbar_show (0); 1372 scrollBar.setIdle ();
1425 } 1373 scrollbar_show (0);
1374 }
1426#ifdef MENUBAR 1375#ifdef MENUBAR
1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1428 menubar_expose (); 1377 menubar_expose ();
1429#endif 1378#endif
1430#ifdef RXVT_GRAPHICS 1379 }
1431 Gr_expose (ev->xany.window); 1380 break;
1432#endif
1433 }
1434 break;
1435 1381
1436 case MotionNotify: 1382 case MotionNotify:
1437#ifdef POINTER_BLANK 1383#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1384 if (hidden_pointer)
1439 pointer_unblank (); 1385 pointer_unblank ();
1440#endif 1386#endif
1441#if MENUBAR 1387#if MENUBAR
1442 if (isMenuBarWindow(ev->xany.window)) { 1388 if (isMenuBarWindow (ev.xany.window))
1389 {
1443 menubar_control (&(ev->xbutton)); 1390 menubar_control (ev.xbutton);
1444 break; 1391 break;
1445 } 1392 }
1446#endif 1393#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break; 1395 break;
1449 1396
1450 if (ev->xany.window == TermWin.vt) { 1397 if (ev.xany.window == TermWin.vt)
1398 {
1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1400 {
1453 MotionNotify, ev)) ; 1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1454 XQueryPointer(Xdisplay, TermWin.vt, 1402 ;
1455 &unused_root, &unused_child, 1403
1456 &unused_root_x, &unused_root_y, 1404 XQueryPointer (display->display, TermWin.vt,
1457 &(ev->xbutton.x), &(ev->xbutton.y), 1405 &unused_root, &unused_child,
1458 &unused_mask); 1406 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y),
1408 &unused_mask);
1459#ifdef MOUSE_THRESHOLD 1409#ifdef MOUSE_THRESHOLD
1460 /* deal with a `jumpy' mouse */ 1410 /* deal with a `jumpy' mouse */
1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 {
1462#endif 1413#endif
1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1464 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1415 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1465#ifdef SELECTION_SCROLLING 1416#ifdef SELECTION_SCROLLING
1466 if (ev->xbutton.y < TermWin.int_bwidth 1417 if (ev.xbutton.y < TermWin.int_bwidth
1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1468 int dist;
1469
1470 pending_scroll_selection=1;
1471
1472 /* don't clobber the current delay if we are
1473 * already in the middle of scrolling.
1474 */
1475 if (scroll_selection_delay<=0)
1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1477
1478 /* save the event params so we can highlight
1479 * the selection in the pending-scroll loop
1480 */
1481 selection_save_x=ev->xbutton.x;
1482 selection_save_y=ev->xbutton.y;
1483 selection_save_state=
1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1485
1486 /* calc number of lines to scroll */
1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1488 scroll_selection_dir = UP;
1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1490 }
1491 else {
1492 scroll_selection_dir = DN;
1493 dist = ev->xbutton.y -
1494 (TermWin.int_bwidth + TermWin.height);
1495 }
1496 scroll_selection_lines=(Pixel2Height(dist)/
1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1498 MIN_IT(scroll_selection_lines,
1499 SELECTION_SCROLL_MAX_LINES);
1500 }
1501 else {
1502 /* we are within the text window, so we
1503 * shouldn't be scrolling
1504 */
1505 pending_scroll_selection = 0;
1506 }
1507#endif
1508#ifdef MOUSE_THRESHOLD
1509 }
1510#endif
1511 }
1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1514 MotionNotify, ev)) ;
1515 XQueryPointer(Xdisplay, scrollBar.win,
1516 &unused_root, &unused_child,
1517 &unused_root_x, &unused_root_y,
1518 &(ev->xbutton.x), &(ev->xbutton.y),
1519 &unused_mask);
1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1521 scrollbar_size());
1522 scr_refresh (refresh_type);
1523 refresh_limit = 0;
1524 scrollbar_show (1);
1525 }
1526 break;
1527 }
1528}
1529
1530void
1531rxvt_term::button_press (XButtonEvent *ev)
1532{
1533 int reportmode = 0, clickintime;
1534
1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1536 if (!bypass_keystate)
1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1538/*
1539 * VT window processing of button press
1540 */
1541 if (ev->window == TermWin.vt)
1542 {
1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else
1547#endif
1548 {
1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1550 if (reportmode)
1551 {
1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */
1554 MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == MEvent.button && clickintime)
1557 {
1558 /* same button, within alloted time */
1559 MEvent.clicks++;
1560 if (MEvent.clicks > 1)
1561 { 1419 {
1562 /* only report double clicks */ 1420 int dist;
1563 MEvent.clicks = 2;
1564 mouse_report (ev);
1565 1421
1566 /* don't report the release */ 1422 pending_scroll_selection=1;
1567 MEvent.clicks = 0; 1423
1568 MEvent.button = AnyButton; 1424 /* don't clobber the current delay if we are
1569 } 1425 * already in the middle of scrolling.
1570 }
1571 else
1572 { 1426 */
1573 /* different button, or time expired */ 1427 if (scroll_selection_delay<=0)
1574 MEvent.clicks = 1; 1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1575 MEvent.button = ev->button; 1429
1576 mouse_report (ev); 1430 /* save the event params so we can highlight
1577 } 1431 * the selection in the pending-scroll loop
1578#else
1579 MEvent.button = ev->button;
1580 mouse_report (ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 }
1583 else
1584 {
1585 if (ev->button != MEvent.button)
1586 MEvent.clicks = 0;
1587 switch (ev->button)
1588 { 1432 */
1589 case Button1: 1433 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1434 selection_save_y=ev.xbutton.y;
1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1435 selection_save_state=
1436 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1437
1438 /* calc number of lines to scroll */
1439 if (ev.xbutton.y<TermWin.int_bwidth)
1592 { 1440 {
1593 if (MEvent.button == Button1 && clickintime) 1441 scroll_selection_dir = UP;
1594 selection_rotate (ev->x, ev->y); 1442 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 selection_extend (ev->x, ev->y, 1);
1597 } 1443 }
1598 else 1444 else
1599 { 1445 {
1600 if (MEvent.button == Button1 && clickintime) 1446 scroll_selection_dir = DN;
1601 MEvent.clicks++; 1447 dist = ev.xbutton.y -
1602 else 1448 (TermWin.int_bwidth + TermWin.height);
1603 MEvent.clicks = 1;
1604
1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1449 }
1450 scroll_selection_lines= (Pixel2Height (dist)/
1451 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1452 MIN_IT (scroll_selection_lines,
1453 SELECTION_SCROLL_MAX_LINES);
1454 }
1455 else
1456 {
1457 /* we are within the text window, so we
1458 * shouldn't be scrolling
1459 */
1460 pending_scroll_selection = 0;
1461 }
1462#endif
1463#ifdef MOUSE_THRESHOLD
1607 1464
1465 }
1466#endif
1467
1468 }
1469 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1473 MotionNotify, &ev)) ;
1474 XQueryPointer (display->display, scrollBar.win,
1475 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y),
1478 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ());
1481 scr_refresh (refresh_type);
1482 refresh_limit = 0;
1483 scrollbar_show (1);
1484 }
1485 break;
1486 }
1487}
1488
1489void
1490rxvt_term::rootwin_cb (XEvent &ev)
1491{
1492 SET_R (this);
1493 SET_LOCALE (locale);
1494
1495 switch (ev.type)
1496 {
1497 case PropertyNotify:
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /*
1508 * if user used some Esetroot compatible prog to set the root bg,
1509 * use the property to determine the pixmap. We use it later on.
1510 */
1511 if (xa[XA_XROOTPMAPID] == 0)
1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1513
1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1515 return;
1516 }
1517
1518 /* FALLTHROUGH */
1519 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ())
1521 if (am_transparent)
1522 want_full_refresh = 1;
1523 break;
1524#endif
1525 }
1526}
1527
1528void
1529rxvt_term::button_press (XButtonEvent &ev)
1530{
1531 int reportmode = 0, clickintime;
1532
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1536 /*
1537 * VT window processing of button press
1538 */
1539 if (ev.window == TermWin.vt)
1540 {
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1542 if (reportmode)
1543 {
1544 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state;
1547#ifdef MOUSE_REPORT_DOUBLECLICK
1548 if (ev.button == MEvent.button && clickintime)
1549 {
1550 /* same button, within alloted time */
1551 MEvent.clicks++;
1552 if (MEvent.clicks > 1)
1553 {
1554 /* only report double clicks */
1555 MEvent.clicks = 2;
1556 mouse_report (ev);
1557
1558 /* don't report the release */
1559 MEvent.clicks = 0;
1560 MEvent.button = AnyButton;
1561 }
1562 }
1563 else
1564 {
1565 /* different button, or time expired */
1566 MEvent.clicks = 1;
1567 MEvent.button = ev.button;
1568 mouse_report (ev);
1569 }
1570#else
1571 MEvent.button = ev.button;
1572 mouse_report (ev);
1573#endif /* MOUSE_REPORT_DOUBLECLICK */
1574
1575 }
1576 else
1577 {
1578 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0;
1580 switch (ev.button)
1581 {
1582 case Button1:
1583 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1585 {
1586 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y);
1588 else
1589 selection_extend (ev.x, ev.y, 1);
1590 }
1591 else
1592 {
1593 if (MEvent.button == Button1 && clickintime)
1594 MEvent.clicks++;
1595 else
1596 MEvent.clicks = 1;
1597
1598 selection_click (MEvent.clicks, ev.x, ev.y);
1599 }
1600
1608 MEvent.button = Button1; 1601 MEvent.button = Button1;
1602 break;
1603
1604 case Button3:
1605 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y);
1607 else
1608 selection_extend (ev.x, ev.y, 1);
1609 MEvent.button = Button3;
1610 break;
1611 }
1612 }
1613 MEvent.time = ev.time;
1614 return;
1615 }
1616
1617 /*
1618 * Scrollbar window processing of button press
1619 */
1620 if (isScrollbarWindow (ev.window))
1621 {
1622 scrollBar.setIdle ();
1623 /*
1624 * Rxvt-style scrollbar:
1625 * move up if mouse is above slider
1626 * move dn if mouse is below slider
1627 *
1628 * XTerm-style scrollbar:
1629 * Move display proportional to pointer location
1630 * pointer near top -> scroll one line
1631 * pointer near bot -> scroll full page
1632 */
1633#ifndef NO_SCROLLBAR_REPORT
1634 if (reportmode)
1635 {
1636 /*
1637 * Mouse report disabled scrollbar:
1638 * arrow buttons - send up/down
1639 * click on scrollbar - send pageup/down
1640 */
1641 if ((scrollBar.style == R_SB_NEXT
1642 && scrollbarnext_upButton (ev.y))
1643 || (scrollBar.style == R_SB_RXVT
1644 && scrollbarrxvt_upButton (ev.y)))
1645 tt_printf ("\033[A");
1646 else if ((scrollBar.style == R_SB_NEXT
1647 && scrollbarnext_dnButton (ev.y))
1648 || (scrollBar.style == R_SB_RXVT
1649 && scrollbarrxvt_dnButton (ev.y)))
1650 tt_printf ("\033[B");
1651 else
1652 switch (ev.button)
1653 {
1654 case Button2:
1655 tt_printf ("\014");
1656 break;
1657 case Button1:
1658 tt_printf ("\033[6~");
1659 break;
1660 case Button3:
1661 tt_printf ("\033[5~");
1662 break;
1663 }
1664 }
1665 else
1666#endif /* NO_SCROLLBAR_REPORT */
1667
1668 {
1669 char upordown = 0;
1670
1671 if (scrollBar.style == R_SB_NEXT)
1672 {
1673 if (scrollbarnext_upButton (ev.y))
1674 upordown = -1; /* up */
1675 else if (scrollbarnext_dnButton (ev.y))
1676 upordown = 1; /* down */
1677 }
1678 else if (scrollBar.style == R_SB_RXVT)
1679 {
1680 if (scrollbarrxvt_upButton (ev.y))
1681 upordown = -1; /* up */
1682 else if (scrollbarrxvt_dnButton (ev.y))
1683 upordown = 1; /* down */
1684 }
1685 if (upordown)
1686 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1689#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 }
1698 else
1699 switch (ev.button)
1700 {
1701 case Button2:
1702 switch (scrollbar_align)
1703 {
1704 case R_SB_ALIGN_TOP:
1705 csrO = 0;
1609 break; 1706 break;
1610 1707 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1708 csrO = (scrollBar.bot - scrollBar.top) / 2;
1612 if (MEvent.button == Button3 && clickintime)
1613 selection_rotate (ev->x, ev->y);
1614 else
1615 selection_extend (ev->x, ev->y, 1);
1616 MEvent.button = Button3;
1617 break; 1709 break;
1710 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top;
1712 break;
1713 }
1714 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO,
1718 scrollbar_size ());
1719 scrollBar.setMotion ();
1720 break;
1721
1722 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1724 csrO = ev.y - scrollBar.top;
1725 /* FALLTHROUGH */
1726
1727 case Button3:
1728 if (scrollBar.style != R_SB_XTERM)
1729 {
1730 if (scrollbar_above_slider (ev.y))
1731# ifdef RXVT_SCROLL_FULL
1732 scr_page (UP, TermWin.nrow - 1);
1733# else
1734 scr_page (UP, TermWin.nrow / 4);
1735# endif
1736 else if (scrollbar_below_slider (ev.y))
1737# ifdef RXVT_SCROLL_FULL
1738 scr_page (DN, TermWin.nrow - 1);
1739# else
1740 scr_page (DN, TermWin.nrow / 4);
1741# endif
1742 else
1743 scrollBar.setMotion ();
1744 }
1745 else
1746 {
1747 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow
1749 * scrollbar_position (ev.y)
1750 / scrollbar_size ()));
1751 }
1752 break;
1753 }
1618 } 1754 }
1619 }
1620 MEvent.time = ev->time;
1621 return; 1755 return;
1622 }
1623 }
1624
1625/*
1626 * Scrollbar window processing of button press
1627 */
1628 if (isScrollbarWindow(ev->window))
1629 {
1630 scrollBar.setIdle ();
1631 /*
1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider
1635 *
1636 * XTerm-style scrollbar:
1637 * Move display proportional to pointer location
1638 * pointer near top -> scroll one line
1639 * pointer near bot -> scroll full page
1640 */
1641#ifndef NO_SCROLLBAR_REPORT
1642 if (reportmode) {
1643 /*
1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down
1647 */
1648 if ((scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y))
1650 || (scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y)))
1652 tt_printf("\033[A");
1653 else if ((scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y))
1655 || (scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y)))
1657 tt_printf("\033[B");
1658 else
1659 switch (ev->button) {
1660 case Button2:
1661 tt_printf("\014");
1662 break;
1663 case Button1:
1664 tt_printf("\033[6~");
1665 break;
1666 case Button3:
1667 tt_printf("\033[5~");
1668 break;
1669 }
1670 }
1671 else
1672#endif /* NO_SCROLLBAR_REPORT */
1673 {
1674 char upordown = 0;
1675
1676 if (scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */
1681 } else if (scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */
1686 } 1756 }
1687 if (upordown) { 1757#if MENUBAR
1758 /*
1759 * Menubar window processing of button press
1760 */
1761 if (isMenuBarWindow (ev.window))
1762 menubar_control (ev);
1763#endif
1764}
1765
1766void
1767rxvt_term::button_release (XButtonEvent &ev)
1768{
1769 int reportmode = 0;
1770
1771 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1774
1775 if (scrollbar_isUpDn ())
1776 {
1777 scrollBar.setIdle ();
1778 scrollbar_show (0);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1780 refresh_type &= ~SMOOTH_REFRESH;
1690#endif
1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 } else
1698 switch (ev->button) {
1699 case Button2:
1700 switch (scrollbar_align) {
1701 case R_SB_ALIGN_TOP:
1702 csrO = 0;
1703 break;
1704 case R_SB_ALIGN_CENTRE:
1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1706 break;
1707 case R_SB_ALIGN_BOTTOM:
1708 csrO = scrollBar.bot - scrollBar.top;
1709 break;
1710 }
1711 if (scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y))
1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1715 scrollbar_size());
1716 scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1721 csrO = ev->y - scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 scr_page (UP, TermWin.nrow - 1);
1729# else
1730 scr_page (UP, TermWin.nrow / 4);
1731# endif 1781#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 scr_page (DN, TermWin.nrow - 1);
1735# else
1736 scr_page (DN, TermWin.nrow / 4);
1737# endif
1738 else
1739 scrollBar.setMotion ();
1740 } else {
1741 scr_page ((ev->button == Button1 ? DN : UP),
1742 (TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 menubar_control (ev);
1757#endif
1758}
1759 1782
1760void
1761rxvt_term::button_release (XButtonEvent *ev)
1762{
1763 int reportmode = 0;
1764
1765 csrO = 0; /* reset csr Offset */
1766 if (!bypass_keystate)
1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1768
1769 if (scrollbar_isUpDn()) {
1770 scrollBar.setIdle ();
1771 scrollbar_show (0);
1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1773 refresh_type &= ~SMOOTH_REFRESH;
1774#endif
1775 } 1783 }
1776#ifdef SELECTION_SCROLLING 1784#ifdef SELECTION_SCROLLING
1777 pending_scroll_selection=0; 1785 pending_scroll_selection=0;
1778#endif 1786#endif
1779 if (ev->window == TermWin.vt) 1787 if (ev.window == TermWin.vt)
1780 { 1788 {
1781#ifdef RXVT_GRAPHICS
1782 if (ev->subwindow != None)
1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1784 else
1785#endif
1786 {
1787 if (reportmode) 1789 if (reportmode)
1788 { 1790 {
1789 /* mouse report from vt window */ 1791 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1792 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1793 if (ev.button >= 4)
1792 return; 1794 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1795#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1796 /* only report the release of 'slow' single clicks */
1795 if (MEvent.button != AnyButton 1797 if (MEvent.button != AnyButton
1796 && (ev->button != MEvent.button 1798 && (ev.button != MEvent.button
1797 || (ev->time - MEvent.time 1799 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1800 > MULTICLICK_TIME / 2)))
1799 { 1801 {
1800 MEvent.clicks = 0; 1802 MEvent.clicks = 0;
1801 MEvent.button = AnyButton; 1803 MEvent.button = AnyButton;
1802 mouse_report (ev); 1804 mouse_report (ev);
1803 } 1805 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1806#else /* MOUSE_REPORT_DOUBLECLICK */
1805 MEvent.button = AnyButton; 1807 MEvent.button = AnyButton;
1806 mouse_report (ev); 1808 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1809#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1810 return;
1809 } 1811 }
1810 /* 1812 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1813 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1814 * when overriding mouse reporting
1813 */ 1815 */
1814 if (PrivateModes & PrivMode_mouse_report 1816 if (PrivateModes & PrivMode_mouse_report
1815 && bypass_keystate 1817 && bypass_keystate
1816 && ev->button == Button1 && MEvent.clicks <= 1) 1818 && ev.button == Button1 && MEvent.clicks <= 1)
1817 selection_extend (ev->x, ev->y, 0); 1819 selection_extend (ev.x, ev.y, 0);
1818 1820
1819 switch (ev->button) { 1821 switch (ev.button)
1822 {
1820 case Button1: 1823 case Button1:
1821 case Button3: 1824 case Button3:
1822 selection_make (ev->time); 1825 selection_make (ev.time);
1823 break; 1826 break;
1824 case Button2: 1827 case Button2:
1825 selection_request (ev->time, ev->x, ev->y); 1828 selection_request (ev.time, ev.x, ev.y);
1826 break; 1829 break;
1827#ifdef MOUSE_WHEEL 1830#ifdef MOUSE_WHEEL
1828 case Button4: 1831 case Button4:
1829 case Button5: 1832 case Button5:
1830 { 1833 {
1831 int i; 1834 int i;
1832 page_dirn v; 1835 page_dirn v;
1833 1836
1834 v = (ev->button == Button4) ? UP : DN; 1837 v = (ev.button == Button4) ? UP : DN;
1835 if (ev->state & ShiftMask) 1838 if (ev.state & ShiftMask)
1836 i = 1; 1839 i = 1;
1837 else if ((Options & Opt_mouseWheelScrollPage)) 1840 else if ((Options & Opt_mouseWheelScrollPage))
1838 i = TermWin.nrow - 1; 1841 i = TermWin.nrow - 1;
1839 else 1842 else
1840 i = 5; 1843 i = 5;
1841# ifdef MOUSE_SLIP_WHEELING 1844# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1845 if (ev.state & ControlMask)
1843 { 1846 {
1844 mouse_slip_wheel_speed += (v ? -1 : 1); 1847 mouse_slip_wheel_speed += (v ? -1 : 1);
1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1846 } 1849 }
1847# endif 1850# endif
1848# ifdef JUMP_MOUSE_WHEEL 1851# ifdef JUMP_MOUSE_WHEEL
1849 scr_page (v, i); 1852 scr_page (v, i);
1850 scr_refresh (SMOOTH_REFRESH); 1853 scr_refresh (SMOOTH_REFRESH);
1851 scrollbar_show (1); 1854 scrollbar_show (1);
1852# else 1855# else
1853 while (i--) 1856 while (i--)
1854 { 1857 {
1855 scr_page (v, 1); 1858 scr_page (v, 1);
1856 scr_refresh (SMOOTH_REFRESH); 1859 scr_refresh (SMOOTH_REFRESH);
1857 scrollbar_show (1); 1860 scrollbar_show (1);
1858 } 1861 }
1859# endif 1862# endif
1860 } 1863
1861 break; 1864 }
1865 break;
1862#endif 1866#endif
1863 } 1867
1864 }
1865 } 1868 }
1869 }
1866#ifdef MENUBAR 1870#ifdef MENUBAR
1867 else if (isMenuBarWindow(ev->window)) 1871 else if (isMenuBarWindow (ev.window))
1868 menubar_control (ev); 1872 menubar_control (ev);
1869#endif 1873#endif
1870} 1874}
1871 1875
1872 1876
1873#ifdef TRANSPARENT 1877#ifdef TRANSPARENT
… …
1876 * Do transparency updates if required 1880 * Do transparency updates if required
1877 */ 1881 */
1878int 1882int
1879rxvt_term::check_our_parents () 1883rxvt_term::check_our_parents ()
1880{ 1884{
1881 int i, pchanged, aformat, have_pixmap, rootdepth; 1885 int i, pchanged, aformat, have_pixmap, rootdepth;
1882 unsigned long nitems, bytes_after; 1886 unsigned long nitems, bytes_after;
1883 Atom atype; 1887 Atom atype;
1884 unsigned char *prop = NULL; 1888 unsigned char *prop = NULL;
1885 Window root, oldp, *list; 1889 Window root, oldp, *list;
1886 Pixmap rootpixmap = None; 1890 Pixmap rootpixmap = None;
1887 XWindowAttributes wattr, wrootattr; 1891 XWindowAttributes wattr, wrootattr;
1888 1892
1889 pchanged = 0; 1893 pchanged = 0;
1890 1894
1891 if (!(Options & Opt_transparent)) 1895 if (! (Options & Opt_transparent))
1892 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1893 1897
1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1898 XGetWindowAttributes (display->display, display->root, &wrootattr);
1895 rootdepth = wrootattr.depth; 1899 rootdepth = wrootattr.depth;
1896 1900
1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1898 if (rootdepth != wattr.depth) { 1902 if (rootdepth != wattr.depth)
1903 {
1899 if (am_transparent) { 1904 if (am_transparent)
1905 {
1900 pchanged = 1; 1906 pchanged = 1;
1901 XSetWindowBackground(Xdisplay, TermWin.vt, 1907 XSetWindowBackground (display->display, TermWin.vt,
1902 PixColors[Color_bg]); 1908 PixColors[Color_bg]);
1903 am_transparent = am_pixmap_trans = 0; 1909 am_transparent = am_pixmap_trans = 0;
1904 } 1910 }
1905 return pchanged; /* Don't try any more */ 1911 return pchanged; /* Don't try any more */
1906 } 1912 }
1907 1913
1908/* Get all X ops out of the queue so that our information is up-to-date. */ 1914 /* Get all X ops out of the queue so that our information is up-to-date. */
1909 XSync(Xdisplay, False); 1915 XSync (display->display, False);
1910 1916
1911/* 1917 /*
1912 * Make the frame window set by the window manager have 1918 * Make the frame window set by the window manager have
1913 * the root background. Some window managers put multiple nested frame 1919 * the root background. Some window managers put multiple nested frame
1914 * windows for each client, so we have to take care about that. 1920 * windows for each client, so we have to take care about that.
1915 */ 1921 */
1916 i = (xa[XA_XROOTPMAPID] != 0 1922 i = (xa[XA_XROOTPMAPID] != 0
1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1919 &nitems, &bytes_after, &prop) == Success)); 1925 &nitems, &bytes_after, &prop) == Success));
1920 if (!i || prop == NULL) 1926 if (!i || prop == NULL)
1921 have_pixmap = 0; 1927 have_pixmap = 0;
1922 else { 1928 else
1929 {
1923 have_pixmap = 1; 1930 have_pixmap = 1;
1924 rootpixmap = *((Pixmap *)prop); 1931 rootpixmap = * ((Pixmap *)prop);
1925 XFree(prop); 1932 XFree (prop);
1926 } 1933 }
1927 if (have_pixmap) { 1934 if (have_pixmap)
1928/* 1935 {
1936 /*
1929 * Copy Xroot pixmap transparency 1937 * Copy display->root pixmap transparency
1930 */ 1938 */
1931 int sx, sy, nx, ny; 1939 int sx, sy, nx, ny;
1932 unsigned int nw, nh; 1940 unsigned int nw, nh;
1933 Window cr; 1941 Window cr;
1934 XImage *image; 1942 XImage *image;
1935 GC gc; 1943 GC gc;
1936 XGCValues gcvalue; 1944 XGCValues gcvalue;
1937 1945
1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1939 0, 0, &sx, &sy, &cr); 1947 0, 0, &sx, &sy, &cr);
1940 nw = (unsigned int)szHint.width; 1948 nw = (unsigned int)szHint.width;
1941 nh = (unsigned int)szHint.height; 1949 nh = (unsigned int)szHint.height;
1942 nx = ny = 0; 1950 nx = ny = 0;
1943 if (sx < 0) { 1951
1952 if (sx < 0)
1953 {
1944 nw += sx; 1954 nw += sx;
1945 nx = -sx; 1955 nx = -sx;
1946 sx = 0; 1956 sx = 0;
1947 } 1957 }
1948 if (sy < 0) { 1958
1959 if (sy < 0)
1960 {
1949 nh += sy; 1961 nh += sy;
1950 ny = -sy; 1962 ny = -sy;
1951 sy = 0; 1963 sy = 0;
1952 } 1964 }
1965
1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1966 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1967 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1955 allowedxerror = -1; 1968 allowedxerror = -1;
1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1969 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1957 ZPixmap); 1970 ZPixmap);
1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1959 /* XXX: may need a delay here? */ 1972 /* XXX: may need a delay here? */
1960 allowedxerror = 0; 1973 allowedxerror = 0;
1961 if (image == NULL) { 1974 if (image == NULL)
1975 {
1962 if (am_transparent && am_pixmap_trans) { 1976 if (am_transparent && am_pixmap_trans)
1963 pchanged = 1; 1977 {
1978 pchanged = 1;
1964 if (TermWin.pixmap != None) { 1979 if (TermWin.pixmap != None)
1980 {
1965 XFreePixmap(Xdisplay, TermWin.pixmap); 1981 XFreePixmap (display->display, TermWin.pixmap);
1966 TermWin.pixmap = None; 1982 TermWin.pixmap = None;
1967 } 1983 }
1968 } 1984 }
1969 am_pixmap_trans = 0; 1985 am_pixmap_trans = 0;
1970 } else { 1986 }
1987 else
1988 {
1971 if (TermWin.pixmap != None) 1989 if (TermWin.pixmap != None)
1972 XFreePixmap(Xdisplay, TermWin.pixmap); 1990 XFreePixmap (display->display, TermWin.pixmap);
1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 1991 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1974 (unsigned int)szHint.width, 1992 (unsigned int)szHint.width,
1975 (unsigned int)szHint.height, 1993 (unsigned int)szHint.height,
1976 (unsigned int)image->depth); 1994 (unsigned int)image->depth);
1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 1995 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 1996 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1979 nx, ny, (unsigned int)image->width, 1997 nx, ny, (unsigned int)image->width,
1980 (unsigned int)image->height); 1998 (unsigned int)image->height);
1981 XFreeGC(Xdisplay, gc); 1999 XFreeGC (display->display, gc);
1982 XDestroyImage(image); 2000 XDestroyImage (image);
1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2001 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1984 TermWin.pixmap); 2002 TermWin.pixmap);
1985 if (!am_transparent || !am_pixmap_trans) 2003 if (!am_transparent || !am_pixmap_trans)
1986 pchanged = 1; 2004 pchanged = 1;
1987 am_transparent = am_pixmap_trans = 1; 2005 am_transparent = am_pixmap_trans = 1;
1988 } 2006 }
1989 } 2007 }
2008
1990 if (!am_pixmap_trans) { 2009 if (!am_pixmap_trans)
2010 {
1991 unsigned int n; 2011 unsigned int n;
1992/* 2012 /*
1993 * InheritPixmap transparency 2013 * InheritPixmap transparency
1994 */ 2014 */
1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2015 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2016 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1997 i++) { 2017 i++)
2018 {
1998 oldp = TermWin.parent[i]; 2019 oldp = TermWin.parent[i];
1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2020 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2000 &TermWin.parent[i], &list, &n); 2021 &TermWin.parent[i], &list, &n);
2001 XFree(list); 2022 XFree (list);
2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2023 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2003 if (TermWin.parent[i] == Xroot) { 2024 if (TermWin.parent[i] == display->root)
2004 if (oldp != None) 2025 {
2005 pchanged = 1; 2026 if (oldp != None)
2006 break; 2027 pchanged = 1;
2007 } 2028 break;
2029 }
2008 if (oldp != TermWin.parent[i]) 2030 if (oldp != TermWin.parent[i])
2009 pchanged = 1; 2031 pchanged = 1;
2010 } 2032 }
2011 n = 0; 2033
2012 if (pchanged) { 2034 n = 0;
2035
2036 if (pchanged)
2037 {
2013 for (; n < (unsigned int)i; n++) { 2038 for (; n < (unsigned int)i; n++)
2039 {
2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2041 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2042 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2043 {
2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2044 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2018 break; 2045 break;
2019 } 2046 }
2020 } 2047 }
2021 } 2048 }
2049
2022 if (n > (int)(sizeof(TermWin.parent) 2050 if (n > (int) (sizeof (TermWin.parent)
2023 / sizeof(TermWin.parent[0]))) { 2051 / sizeof (TermWin.parent[0])))
2052 {
2024 D_X((stderr, "InheritPixmap Turning off")); 2053 D_X ((stderr, "InheritPixmap Turning off"));
2025 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2054 XSetWindowBackground (display->display, TermWin.parent[0],
2026 PixColors[Color_fg]); 2055 PixColors[Color_fg]);
2027 XSetWindowBackground(Xdisplay, TermWin.vt, 2056 XSetWindowBackground (display->display, TermWin.vt,
2028 PixColors[Color_bg]); 2057 PixColors[Color_bg]);
2029 am_transparent = 0; 2058 am_transparent = 0;
2030 /* XXX: also turn off Opt_transparent? */ 2059 /* XXX: also turn off Opt_transparent? */
2031 } else { 2060 }
2061 else
2062 {
2032 /* wait (an arbitrary period) for the WM to do its thing 2063 /* wait (an arbitrary period) for the WM to do its thing
2033 * needed for fvwm2.2.2 (and before?) */ 2064 * needed for fvwm2.2.2 (and before?) */
2034# ifdef HAVE_NANOSLEEP 2065# ifdef HAVE_NANOSLEEP
2035 struct timespec rqt; 2066 struct timespec rqt;
2036 2067
2037 rqt.tv_sec = 1; 2068 rqt.tv_sec = 1;
2038 rqt.tv_nsec = 0; 2069 rqt.tv_nsec = 0;
2039 nanosleep(&rqt, NULL); 2070 nanosleep (&rqt, NULL);
2040# else 2071# else
2041 sleep(1); 2072 sleep (1);
2042# endif 2073# endif
2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2074 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2044 for (n = 0; n < (unsigned int)i; n++) 2075 for (n = 0; n < (unsigned int)i; n++)
2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2076 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2046 ParentRelative); 2077 ParentRelative);
2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2078 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2048 ParentRelative); 2079 ParentRelative);
2049 am_transparent = 1; 2080 am_transparent = 1;
2050 } 2081 }
2082
2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2083 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2052 TermWin.parent[i] = None; 2084 TermWin.parent[i] = None;
2053 } 2085 }
2054 return pchanged; 2086 return pchanged;
2055} 2087}
2056#endif 2088#endif
2057 2089
2058/*}}} */ 2090/*}}} */
2059 2091
… …
2061/*----------------------------------------------------------------------*/ 2093/*----------------------------------------------------------------------*/
2062#ifdef PRINTPIPE 2094#ifdef PRINTPIPE
2063FILE * 2095FILE *
2064rxvt_term::popen_printer () 2096rxvt_term::popen_printer ()
2065{ 2097{
2066 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2098 FILE *stream = popen (rs[Rs_print_pipe], "w");
2067 2099
2068 if (stream == NULL) 2100 if (stream == NULL)
2069 rxvt_print_error("can't open printer pipe"); 2101 rxvt_print_error ("can't open printer pipe");
2070 return stream; 2102 return stream;
2071} 2103}
2072 2104
2073int 2105int
2074rxvt_term::pclose_printer (FILE *stream) 2106rxvt_term::pclose_printer (FILE *stream)
2075{ 2107{
2076 fflush (stream); 2108 fflush (stream);
2077/* pclose() reported not to work on SunOS 4.1.3 */ 2109 /* pclose () reported not to work on SunOS 4.1.3 */
2078# if defined (__sun__) /* TODO: RESOLVE THIS */ 2110# if defined (__sun__) /* TODO: RESOLVE THIS */
2079/* pclose works provided SIGCHLD handler uses waitpid */ 2111 /* pclose works provided SIGCHLD handler uses waitpid */
2080 return pclose (stream); /* return fclose (stream); */ 2112 return pclose (stream); /* return fclose (stream); */
2081# else 2113# else
2082 return pclose (stream); 2114 return pclose (stream);
2083# endif 2115# endif
2084} 2116}
… …
2087 * simulate attached vt100 printer 2119 * simulate attached vt100 printer
2088 */ 2120 */
2089void 2121void
2090rxvt_term::process_print_pipe () 2122rxvt_term::process_print_pipe ()
2091{ 2123{
2092 int done; 2124 int done;
2093 FILE *fd; 2125 FILE *fd;
2094 2126
2095 if ((fd = popen_printer ()) == NULL) 2127 if ((fd = popen_printer ()) == NULL)
2096 return; 2128 return;
2097 2129
2098/* 2130 /*
2099 * Send all input to the printer until either ESC[4i or ESC[?4i 2131 * Send all input to the printer until either ESC[4i or ESC[?4i
2100 * is received. 2132 * is received.
2101 */ 2133 */
2102 for (done = 0; !done;) { 2134 for (done = 0; !done;)
2135 {
2103 unsigned char buf[8]; 2136 unsigned char buf[8];
2104 unsigned char ch; 2137 unsigned char ch;
2105 unsigned int i, len; 2138 unsigned int i, len;
2106 2139
2107 if ((ch = cmd_getc ()) != C0_ESC) { 2140 if ((ch = cmd_getc ()) != C0_ESC)
2141 {
2108 if (putc(ch, fd) == EOF) 2142 if (putc (ch, fd) == EOF)
2109 break; /* done = 1 */ 2143 break; /* done = 1 */
2110 } else { 2144 }
2145 else
2146 {
2111 len = 0; 2147 len = 0;
2112 buf[len++] = ch; 2148 buf[len++] = ch;
2113 2149
2114 if ((buf[len++] = cmd_getc ()) == '[') { 2150 if ((buf[len++] = cmd_getc ()) == '[')
2151 {
2115 if ((ch = cmd_getc ()) == '?') { 2152 if ((ch = cmd_getc ()) == '?')
2116 buf[len++] = '?'; 2153 {
2117 ch = cmd_getc (); 2154 buf[len++] = '?';
2118 } 2155 ch = cmd_getc ();
2156 }
2119 if ((buf[len++] = ch) == '4') { 2157 if ((buf[len++] = ch) == '4')
2158 {
2120 if ((buf[len++] = cmd_getc ()) == 'i') 2159 if ((buf[len++] = cmd_getc ()) == 'i')
2121 break; /* done = 1 */ 2160 break; /* done = 1 */
2122 } 2161 }
2162 }
2163 for (i = 0; i < len; i++)
2164 if (putc (buf[i], fd) == EOF)
2165 {
2166 done = 1;
2167 break;
2168 }
2169 }
2123 } 2170 }
2124 for (i = 0; i < len; i++)
2125 if (putc(buf[i], fd) == EOF) {
2126 done = 1;
2127 break;
2128 }
2129 }
2130 }
2131 pclose_printer (fd); 2171 pclose_printer (fd);
2132} 2172}
2133#endif /* PRINTPIPE */ 2173#endif /* PRINTPIPE */
2134/*}}} */ 2174/*}}} */
2135 2175
2136/* *INDENT-OFF* */ 2176/* *INDENT-OFF* */
2137enum { 2177enum {
2138 C1_40 = 0x40, 2178 C1_40 = 0x40,
2139 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2179 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2140 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2180 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2141 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2181 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2142 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2182 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2143}; 2183};
2144/* *INDENT-ON* */ 2184/* *INDENT-ON* */
2145 2185
2146/*{{{ process non-printing single characters */ 2186/*{{{ process non-printing single characters */
2147void 2187void
2148rxvt_term::process_nonprinting (unsigned char ch) 2188rxvt_term::process_nonprinting (unsigned char ch)
2149{ 2189{
2150 switch (ch) { 2190 switch (ch)
2191 {
2151 case C0_ENQ: /* terminal Status */ 2192 case C0_ENQ: /* terminal Status */
2152 if (rs[Rs_answerbackstring]) 2193 if (rs[Rs_answerbackstring])
2153 tt_write( 2194 tt_write (
2154 (const unsigned char *)rs[Rs_answerbackstring], 2195 (const unsigned char *)rs[Rs_answerbackstring],
2155 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2196 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2156 else 2197 else
2157 tt_write((unsigned char *)VT100_ANS, 2198 tt_write ((unsigned char *)VT100_ANS,
2158 (unsigned int)STRLEN(VT100_ANS)); 2199 (unsigned int)STRLEN (VT100_ANS));
2159 break; 2200 break;
2160 case C0_BEL: /* bell */ 2201 case C0_BEL: /* bell */
2161 scr_bell (); 2202 scr_bell ();
2162 break; 2203 break;
2163 case C0_BS: /* backspace */ 2204 case C0_BS: /* backspace */
2164 scr_backspace (); 2205 scr_backspace ();
2165 break; 2206 break;
2166 case C0_HT: /* tab */ 2207 case C0_HT: /* tab */
2167 scr_tab (1); 2208 scr_tab (1);
2168 break; 2209 break;
2169 case C0_CR: /* carriage return */ 2210 case C0_CR: /* carriage return */
2170 scr_gotorc (0, 0, R_RELATIVE); 2211 scr_gotorc (0, 0, R_RELATIVE);
2171 break; 2212 break;
2172 case C0_VT: /* vertical tab, form feed */ 2213 case C0_VT: /* vertical tab, form feed */
2173 case C0_FF: 2214 case C0_FF:
2174 case C0_LF: /* line feed */ 2215 case C0_LF: /* line feed */
2175 scr_index (UP); 2216 scr_index (UP);
2176 break; 2217 break;
2177 case C0_SO: /* shift out - acs */ 2218 case C0_SO: /* shift out - acs */
2178 scr_charset_choose (1); 2219 scr_charset_choose (1);
2179 break; 2220 break;
2180 case C0_SI: /* shift in - acs */ 2221 case C0_SI: /* shift in - acs */
2181 scr_charset_choose (0); 2222 scr_charset_choose (0);
2182 break; 2223 break;
2183 } 2224 }
2184} 2225}
2185/*}}} */ 2226/*}}} */
2186 2227
2187 2228
2188/*{{{ process VT52 escape sequences */ 2229/*{{{ process VT52 escape sequences */
2189void 2230void
2190rxvt_term::process_escape_vt52 (unsigned char ch) 2231rxvt_term::process_escape_vt52 (unsigned char ch)
2191{ 2232{
2192 int row, col; 2233 int row, col;
2234
2235 switch (ch)
2193 2236 {
2194 switch (ch) {
2195 case 'A': /* cursor up */ 2237 case 'A': /* cursor up */
2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2238 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2197 break; 2239 break;
2198 case 'B': /* cursor down */ 2240 case 'B': /* cursor down */
2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2241 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2200 break; 2242 break;
2201 case 'C': /* cursor right */ 2243 case 'C': /* cursor right */
2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2244 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2203 break; 2245 break;
2204 case 'D': /* cursor left */ 2246 case 'D': /* cursor left */
2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2247 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2206 break; 2248 break;
2207 case 'H': /* cursor home */ 2249 case 'H': /* cursor home */
2208 scr_gotorc (0, 0, 0); 2250 scr_gotorc (0, 0, 0);
2209 break; 2251 break;
2210 case 'I': /* cursor up and scroll down if needed */ 2252 case 'I': /* cursor up and scroll down if needed */
2211 scr_index (DN); 2253 scr_index (DN);
2212 break; 2254 break;
2213 case 'J': /* erase to end of screen */ 2255 case 'J': /* erase to end of screen */
2214 scr_erase_screen (0); 2256 scr_erase_screen (0);
2215 break; 2257 break;
2216 case 'K': /* erase to end of line */ 2258 case 'K': /* erase to end of line */
2217 scr_erase_line (0); 2259 scr_erase_line (0);
2218 break; 2260 break;
2219 case 'Y': /* move to specified row and col */ 2261 case 'Y': /* move to specified row and col */
2220 /* full command is 'ESC Y row col' where row and col 2262 /* full command is 'ESC Y row col' where row and col
2221 * are encoded by adding 32 and sending the ascii 2263 * are encoded by adding 32 and sending the ascii
2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2264 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2223 * etc. */ 2265 * etc. */
2224 row = cmd_getc () - ' '; 2266 row = cmd_getc () - ' ';
2225 col = cmd_getc () - ' '; 2267 col = cmd_getc () - ' ';
2226 scr_gotorc (row, col, 0); 2268 scr_gotorc (row, col, 0);
2227 break; 2269 break;
2228 case 'Z': /* identify the terminal type */ 2270 case 'Z': /* identify the terminal type */
2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2271 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2230 break; 2272 break;
2231 case '<': /* turn off VT52 mode */ 2273 case '<': /* turn off VT52 mode */
2232 PrivMode(0, PrivMode_vt52); 2274 PrivMode (0, PrivMode_vt52);
2233 break; 2275 break;
2234 case 'F': /* use special graphics character set */ 2276 case 'F': /* use special graphics character set */
2235 case 'G': /* use regular character set */ 2277 case 'G': /* use regular character set */
2236 /* unimplemented */ 2278 /* unimplemented */
2237 break; 2279 break;
2238 case '=': /* use alternate keypad mode */ 2280 case '=': /* use alternate keypad mode */
2239 case '>': /* use regular keypad mode */ 2281 case '>': /* use regular keypad mode */
2240 /* unimplemented */ 2282 /* unimplemented */
2241 break; 2283 break;
2242 } 2284 }
2243} 2285}
2244/*}}} */ 2286/*}}} */
2245 2287
2246 2288
2247/*{{{ process escape sequences */ 2289/*{{{ process escape sequences */
2248void 2290void
2249rxvt_term::process_escape_seq () 2291rxvt_term::process_escape_seq ()
2250{ 2292{
2251 unsigned char ch = cmd_getc (); 2293 unsigned char ch = cmd_getc ();
2252 2294
2253 if (PrivateModes & PrivMode_vt52) { 2295 if (PrivateModes & PrivMode_vt52)
2254 process_escape_vt52 (ch);
2255 return;
2256 }
2257 2296 {
2297 process_escape_vt52 (ch);
2298 return;
2299 }
2300
2258 switch (ch) { 2301 switch (ch)
2302 {
2259 /* case 1: do_tek_mode (); break; */ 2303 /* case 1: do_tek_mode (); break; */
2260 case '#': 2304 case '#':
2261 if (cmd_getc () == '8') 2305 if (cmd_getc () == '8')
2262 scr_E (); 2306 scr_E ();
2263 break; 2307 break;
2264 case '(': 2308 case '(':
2265 scr_charset_set (0, (unsigned int)cmd_getc ()); 2309 scr_charset_set (0, (unsigned int)cmd_getc ());
2266 break; 2310 break;
2267 case ')': 2311 case ')':
2268 scr_charset_set (1, (unsigned int)cmd_getc ()); 2312 scr_charset_set (1, (unsigned int)cmd_getc ());
2269 break; 2313 break;
2270 case '*': 2314 case '*':
2271 scr_charset_set (2, (unsigned int)cmd_getc ()); 2315 scr_charset_set (2, (unsigned int)cmd_getc ());
2272 break; 2316 break;
2273 case '+': 2317 case '+':
2274 scr_charset_set (3, (unsigned int)cmd_getc ()); 2318 scr_charset_set (3, (unsigned int)cmd_getc ());
2275 break; 2319 break;
2276#ifdef MULTICHAR_SET
2277 case '$':
2278 scr_charset_set (-2, (unsigned int)cmd_getc ());
2279 break;
2280#endif
2281#ifndef NO_FRILLS 2320#ifndef NO_FRILLS
2282 case '6': 2321 case '6':
2283 scr_backindex (); 2322 scr_backindex ();
2284 break; 2323 break;
2285#endif 2324#endif
2286 case '7': 2325 case '7':
2287 scr_cursor (SAVE); 2326 scr_cursor (SAVE);
2288 break; 2327 break;
2289 case '8': 2328 case '8':
2290 scr_cursor (RESTORE); 2329 scr_cursor (RESTORE);
2291 break; 2330 break;
2292#ifndef NO_FRILLS 2331#ifndef NO_FRILLS
2293 case '9': 2332 case '9':
2294 scr_forwardindex (); 2333 scr_forwardindex ();
2295 break; 2334 break;
2296#endif 2335#endif
2297 case '=': 2336 case '=':
2298 case '>': 2337 case '>':
2299 PrivMode((ch == '='), PrivMode_aplKP); 2338 PrivMode ((ch == '='), PrivMode_aplKP);
2300 break; 2339 break;
2301 2340
2302 case C1_40: 2341 case C1_40:
2303 cmd_getc (); 2342 cmd_getc ();
2304 break; 2343 break;
2305 case C1_44: 2344 case C1_44:
2306 scr_index (UP); 2345 scr_index (UP);
2307 break; 2346 break;
2308 2347
2309 /* 8.3.87: NEXT LINE */ 2348 /* 8.3.87: NEXT LINE */
2310 case C1_NEL: /* ESC E */ 2349 case C1_NEL: /* ESC E */
2311 { 2350 {
2312 uint32_t nlcr[] = { '\n', '\r' }; 2351 uint32_t nlcr[] = { '\n', '\r' };
2313 scr_add_lines (nlcr, 1, 2); 2352 scr_add_lines (nlcr, 1, 2);
2314 } 2353 }
2315 break; 2354 break;
2316 2355
2317 /* kidnapped escape sequence: Should be 8.3.48 */ 2356 /* kidnapped escape sequence: Should be 8.3.48 */
2318 case C1_ESA: /* ESC G */ 2357 case C1_ESA: /* ESC G */
2319 process_graphics (); 2358 process_graphics ();
2320 break; 2359 break;
2321 2360
2322 /* 8.3.63: CHARACTER TABULATION SET */ 2361 /* 8.3.63: CHARACTER TABULATION SET */
2323 case C1_HTS: /* ESC H */ 2362 case C1_HTS: /* ESC H */
2324 scr_set_tab (1); 2363 scr_set_tab (1);
2325 break; 2364 break;
2326 2365
2327 /* 8.3.105: REVERSE LINE FEED */ 2366 /* 8.3.105: REVERSE LINE FEED */
2328 case C1_RI: /* ESC M */ 2367 case C1_RI: /* ESC M */
2329 scr_index (DN); 2368 scr_index (DN);
2330 break; 2369 break;
2331 2370
2332 /* 8.3.142: SINGLE-SHIFT TWO */ 2371 /* 8.3.142: SINGLE-SHIFT TWO */
2333 /*case C1_SS2: scr_single_shift (2); break; */ 2372 /*case C1_SS2: scr_single_shift (2); break; */
2334 2373
2335 /* 8.3.143: SINGLE-SHIFT THREE */ 2374 /* 8.3.143: SINGLE-SHIFT THREE */
2336 /*case C1_SS3: scr_single_shift (3); break; */ 2375 /*case C1_SS3: scr_single_shift (3); break; */
2337 2376
2338 /* 8.3.27: DEVICE CONTROL STRING */ 2377 /* 8.3.27: DEVICE CONTROL STRING */
2339 case C1_DCS: /* ESC P */ 2378 case C1_DCS: /* ESC P */
2340 process_dcs_seq (); 2379 process_dcs_seq ();
2341 break; 2380 break;
2342 2381
2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2382 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2344 case C1_SCI: /* ESC Z */ 2383 case C1_SCI: /* ESC Z */
2345 tt_write((const unsigned char *)ESCZ_ANSWER, 2384 tt_write ((const unsigned char *)ESCZ_ANSWER,
2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2385 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2347 break; /* steal obsolete ESC [ c */ 2386 break; /* steal obsolete ESC [ c */
2348 2387
2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2388 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2350 case C1_CSI: /* ESC [ */ 2389 case C1_CSI: /* ESC [ */
2351 process_csi_seq (); 2390 process_csi_seq ();
2352 break; 2391 break;
2353 2392
2354 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2393 /* 8.3.90: OPERATING SYSTEM COMMAND */
2355 case C1_OSC: /* ESC ] */ 2394 case C1_OSC: /* ESC ] */
2356 process_osc_seq (); 2395 process_osc_seq ();
2357 break; 2396 break;
2358 2397
2359 /* 8.3.106: RESET TO INITIAL STATE */ 2398 /* 8.3.106: RESET TO INITIAL STATE */
2360 case 'c': 2399 case 'c':
2361 scr_poweron (); 2400 scr_poweron ();
2362 scrollbar_show (1); 2401 scrollbar_show (1);
2363 break; 2402 break;
2364 2403
2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2404 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2366 case 'n': 2405 case 'n':
2367 scr_charset_choose (2); 2406 scr_charset_choose (2);
2368 break; 2407 break;
2369 2408
2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2409 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2371 case 'o': 2410 case 'o':
2372 scr_charset_choose (3); 2411 scr_charset_choose (3);
2373 break; 2412 break;
2374 } 2413 }
2375} 2414}
2376/*}}} */ 2415/*}}} */
2377 2416
2378/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2417/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2379/* *INDENT-OFF* */ 2418/* *INDENT-OFF* */
2380enum { 2419enum {
2381 CSI_ICH = 0x40, 2420 CSI_ICH = 0x40,
2382 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2421 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2383 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2422 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2384 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2423 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2385 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2424 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2386 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2425 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2387 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2426 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2388 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2427 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2389 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2428 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2390}; 2429};
2391 2430
2392#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2431#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2393 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2432 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2394 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2433 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2395#define get_byte_array_bit(array, bit) \ 2434#define get_byte_array_bit(array, bit) \
2396 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2435 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2397 2436
2398const unsigned char csi_defaults[] = { 2437const unsigned char csi_defaults[] =
2438 {
2399 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2439 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2400 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2440 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2401 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2441 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2402 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2442 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2403 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2443 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2404 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2444 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2405 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2445 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2406 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2446 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2407}; 2447 };
2408/* *INDENT-ON* */ 2448/* *INDENT-ON* */
2409 2449
2410void 2450void
2411rxvt_term::process_csi_seq () 2451rxvt_term::process_csi_seq ()
2412{ 2452{
2413 unsigned char ch, priv, i; 2453 unsigned char ch, priv, i;
2414 unsigned int nargs, p; 2454 unsigned int nargs, p;
2415 int n, ndef; 2455 int n, ndef;
2416 int arg[ESC_ARGS]; 2456 int arg[ESC_ARGS];
2417 2457
2418 for (nargs = ESC_ARGS; nargs > 0;) 2458 for (nargs = ESC_ARGS; nargs > 0;)
2419 arg[--nargs] = 0; 2459 arg[--nargs] = 0;
2420 2460
2421 priv = 0; 2461 priv = 0;
2462 ch = cmd_getc ();
2463 if (ch >= '<' && ch <= '?')
2464 { /* '<' '=' '>' '?' */
2465 priv = ch;
2422 ch = cmd_getc (); 2466 ch = cmd_getc ();
2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2424 priv = ch;
2425 ch = cmd_getc ();
2426 } 2467 }
2427/* read any numerical arguments */ 2468 /* read any numerical arguments */
2428 for (n = -1; ch < CSI_ICH; ) { 2469 for (n = -1; ch < CSI_ICH; )
2470 {
2429 if (isdigit(ch)) { 2471 if (isdigit (ch))
2472 {
2430 if (n < 0) 2473 if (n < 0)
2431 n = ch - '0'; 2474 n = ch - '0';
2432 else 2475 else
2433 n = n * 10 + ch - '0'; 2476 n = n * 10 + ch - '0';
2477 }
2434 } else if (ch == ';') { 2478 else if (ch == ';')
2479 {
2435 if (nargs < ESC_ARGS) 2480 if (nargs < ESC_ARGS)
2436 arg[nargs++] = n; 2481 arg[nargs++] = n;
2437 n = -1; 2482 n = -1;
2483 }
2438 } else if (ch == '\b') { 2484 else if (ch == '\b')
2485 {
2439 scr_backspace (); 2486 scr_backspace ();
2487 }
2440 } else if (ch == C0_ESC) { 2488 else if (ch == C0_ESC)
2489 {
2441 process_escape_seq (); 2490 process_escape_seq ();
2491 return;
2492 }
2493 else if (ch < ' ')
2494 {
2495 process_nonprinting (ch);
2496 }
2497 ch = cmd_getc ();
2498 }
2499
2500 if (ch > CSI_7F)
2442 return; 2501 return;
2443 } else if (ch < ' ') {
2444 process_nonprinting (ch);
2445 }
2446 ch = cmd_getc ();
2447 }
2448 2502
2449 if (ch > CSI_7F)
2450 return;
2451
2452 if (nargs < ESC_ARGS) 2503 if (nargs < ESC_ARGS)
2453 arg[nargs++] = n; 2504 arg[nargs++] = n;
2454 2505
2455 i = ch - CSI_ICH; 2506 i = ch - CSI_ICH;
2456 ndef = get_byte_array_bit(csi_defaults, i); 2507 ndef = get_byte_array_bit (csi_defaults, i);
2457 for (p = 0; p < nargs; p++) 2508 for (p = 0; p < nargs; p++)
2458 if (arg[p] == -1) 2509 if (arg[p] == -1)
2459 arg[p] = ndef; 2510 arg[p] = ndef;
2460 2511
2461#ifdef DEBUG_CMD 2512#ifdef DEBUG_CMD
2462 fprintf(stderr, "CSI "); 2513 fprintf (stderr, "CSI ");
2463 for (p = 0; p < nargs; p++) 2514 for (p = 0; p < nargs; p++)
2464 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2515 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2465 fprintf(stderr, "%c\n", ch); 2516 fprintf (stderr, "%c\n", ch);
2466#endif 2517#endif
2467 2518
2468/* 2519 /*
2469 * private mode handling 2520 * private mode handling
2470 */ 2521 */
2471 if (priv) { 2522 if (priv)
2472 switch (priv) { 2523 {
2473 case '>': 2524 switch (priv)
2525 {
2526 case '>':
2474 if (ch == CSI_DA) /* secondary device attributes */ 2527 if (ch == CSI_DA) /* secondary device attributes */
2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2528 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2476 break; 2529 break;
2477 case '?': 2530 case '?':
2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2531 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2479 process_terminal_mode (ch, priv, nargs, arg); 2532 process_terminal_mode (ch, priv, nargs, arg);
2480 break; 2533 break;
2481 } 2534 }
2482 return; 2535 return;
2483 } 2536 }
2484 2537
2485 switch (ch) { 2538 switch (ch)
2486/* 2539 {
2540 /*
2487 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2541 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2488 */ 2542 */
2489#ifdef PRINTPIPE 2543#ifdef PRINTPIPE
2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2544 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2491 switch (arg[0]) { 2545 switch (arg[0])
2546 {
2492 case 0: /* initiate transfer to primary aux device */ 2547 case 0: /* initiate transfer to primary aux device */
2493 scr_printscreen (0); 2548 scr_printscreen (0);
2494 break; 2549 break;
2495 case 5: /* start relay to primary aux device */ 2550 case 5: /* start relay to primary aux device */
2496 process_print_pipe (); 2551 process_print_pipe ();
2552 break;
2553 }
2497 break; 2554 break;
2498 }
2499 break;
2500#endif 2555#endif
2501 2556
2502 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2557 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2558 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2504 arg[0] = -arg[0]; 2559 arg[0] = -arg[0];
2505 /* FALLTHROUGH */ 2560 /* FALLTHROUGH */
2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2561 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2562 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2508 scr_gotorc (arg[0], 0, RELATIVE); 2563 scr_gotorc (arg[0], 0, RELATIVE);
2509 break; 2564 break;
2510 2565
2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2566 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2567 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2513#ifdef ISO6429 2568#ifdef ISO6429
2514 arg[0] = -arg[0]; 2569 arg[0] = -arg[0];
2515#else /* emulate common DEC VTs */ 2570#else /* emulate common DEC VTs */
2516 arg[0] = arg[0] ? -arg[0] : -1; 2571 arg[0] = arg[0] ? -arg[0] : -1;
2517#endif 2572#endif
2518 /* FALLTHROUGH */ 2573 /* FALLTHROUGH */
2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2574 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2575 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2521#ifdef ISO6429 2576#ifdef ISO6429
2522 scr_gotorc (0, arg[0], RELATIVE); 2577 scr_gotorc (0, arg[0], RELATIVE);
2523#else /* emulate common DEC VTs */ 2578#else /* emulate common DEC VTs */
2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2579 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2525#endif 2580#endif
2526 break; 2581 break;
2527 2582
2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2583 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2529 arg[0] = -arg[0]; 2584 arg[0] = -arg[0];
2530 /* FALLTHROUGH */ 2585 /* FALLTHROUGH */
2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2586 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2532 scr_gotorc (arg[0], 0, R_RELATIVE); 2587 scr_gotorc (arg[0], 0, R_RELATIVE);
2533 break; 2588 break;
2534 2589
2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2590 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2591 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2592 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2538 break; 2593 break;
2539 2594
2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2595 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2596 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2542 break; 2597 break;
2543 2598
2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2599 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2600 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2546 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2601 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2547 break; 2602 break;
2548 2603
2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2604 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2550 arg[0] = -arg[0]; 2605 arg[0] = -arg[0];
2551 /* FALLTHROUGH */ 2606 /* FALLTHROUGH */
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2607 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 scr_tab (arg[0]); 2608 scr_tab (arg[0]);
2554 break; 2609 break;
2555 2610
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2611 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 scr_erase_screen (arg[0]); 2612 scr_erase_screen (arg[0]);
2558 break; 2613 break;
2559 2614
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2615 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 scr_erase_line (arg[0]); 2616 scr_erase_line (arg[0]);
2562 break; 2617 break;
2563 2618
2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2619 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2565 scr_insdel_chars (arg[0], INSERT); 2620 scr_insdel_chars (arg[0], INSERT);
2566 break; 2621 break;
2567 2622
2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2623 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2569 scr_insdel_lines (arg[0], INSERT); 2624 scr_insdel_lines (arg[0], INSERT);
2570 break; 2625 break;
2571 2626
2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2627 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2573 scr_insdel_lines (arg[0], DELETE); 2628 scr_insdel_lines (arg[0], DELETE);
2574 break; 2629 break;
2575 2630
2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2631 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2577 scr_insdel_chars (arg[0], ERASE); 2632 scr_insdel_chars (arg[0], ERASE);
2578 break; 2633 break;
2579 2634
2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2635 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2581 scr_insdel_chars (arg[0], DELETE); 2636 scr_insdel_chars (arg[0], DELETE);
2582 break; 2637 break;
2583 2638
2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2639 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2585 arg[0] = -arg[0]; 2640 arg[0] = -arg[0];
2586 /* FALLTHROUGH */ 2641 /* FALLTHROUGH */
2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2642 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2643 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2589 break; 2644 break;
2590 2645
2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2646 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2592 tt_write((const unsigned char *)VT100_ANS, 2647 tt_write ((const unsigned char *)VT100_ANS,
2593 (unsigned int)(sizeof(VT100_ANS) - 1)); 2648 (unsigned int) (sizeof (VT100_ANS) - 1));
2594 break; 2649 break;
2595 2650
2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2651 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2597 process_sgr_mode (nargs, arg); 2652 process_sgr_mode (nargs, arg);
2598 break; 2653 break;
2599 2654
2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2655 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2601 switch (arg[0]) { 2656 switch (arg[0])
2657 {
2602 case 5: /* DSR requested */ 2658 case 5: /* DSR requested */
2603 tt_printf("\033[0n"); 2659 tt_printf ("\033[0n");
2604 break; 2660 break;
2605 case 6: /* CPR requested */ 2661 case 6: /* CPR requested */
2606 scr_report_position (); 2662 scr_report_position ();
2607 break; 2663 break;
2608#if defined (ENABLE_DISPLAY_ANSWER) 2664#if defined (ENABLE_DISPLAY_ANSWER)
2609 case 7: /* unofficial extension */ 2665 case 7: /* unofficial extension */
2610 tt_printf("%-.250s\n", rs[Rs_display_name]); 2666 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2611 break; 2667 break;
2612#endif 2668#endif
2613 case 8: /* unofficial extension */ 2669 case 8: /* unofficial extension */
2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2670 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2671 break;
2672 }
2615 break; 2673 break;
2616 }
2617 break;
2618 2674
2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2675 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2620 switch (arg[0]) { 2676 switch (arg[0])
2677 {
2621 case 0: /* char tab stop cleared at active position */ 2678 case 0: /* char tab stop cleared at active position */
2622 scr_set_tab (0); 2679 scr_set_tab (0);
2623 break; 2680 break;
2624 /* case 1: */ /* line tab stop cleared in active line */ 2681 /* case 1: */ /* line tab stop cleared in active line */
2625 /* case 2: */ /* char tab stops cleared in active line */ 2682 /* case 2: */ /* char tab stops cleared in active line */
2626 case 3: /* all char tab stops are cleared */ 2683 case 3: /* all char tab stops are cleared */
2627 /* case 4: */ /* all line tab stops are cleared */ 2684 /* case 4: */ /* all line tab stops are cleared */
2628 case 5: /* all tab stops are cleared */ 2685 case 5: /* all tab stops are cleared */
2629 scr_set_tab (-1); 2686 scr_set_tab (-1);
2687 break;
2688 }
2630 break; 2689 break;
2631 }
2632 break;
2633 2690
2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2691 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2635 switch (arg[0]) { 2692 switch (arg[0])
2693 {
2636 case 0: /* char tab stop set at active position */ 2694 case 0: /* char tab stop set at active position */
2637 scr_set_tab (1); 2695 scr_set_tab (1);
2638 break; /* = ESC H */ 2696 break; /* = ESC H */
2639 /* case 1: */ /* line tab stop set at active line */ 2697 /* case 1: */ /* line tab stop set at active line */
2640 case 2: /* char tab stop cleared at active position */ 2698 case 2: /* char tab stop cleared at active position */
2641 scr_set_tab (0); 2699 scr_set_tab (0);
2642 break; /* = ESC [ 0 g */ 2700 break; /* = ESC [ 0 g */
2643 /* case 3: */ /* line tab stop cleared at active line */ 2701 /* case 3: */ /* line tab stop cleared at active line */
2644 /* case 4: */ /* char tab stops cleared at active line */ 2702 /* case 4: */ /* char tab stops cleared at active line */
2645 case 5: /* all char tab stops are cleared */ 2703 case 5: /* all char tab stops are cleared */
2646 scr_set_tab (-1); 2704 scr_set_tab (-1);
2647 break; /* = ESC [ 3 g */ 2705 break; /* = ESC [ 3 g */
2648 /* case 6: */ /* all line tab stops are cleared */ 2706 /* case 6: */ /* all line tab stops are cleared */
2649 } 2707 }
2650 break; 2708 break;
2651 2709
2652 case CSI_RM: /* 8.3.107: RESET MODE */ 2710 case CSI_RM: /* 8.3.107: RESET MODE */
2653 if (arg[0] == 4) 2711 if (arg[0] == 4)
2654 scr_insert_mode (0); 2712 scr_insert_mode (0);
2655 break; 2713 break;
2656 2714
2657 case CSI_SM: /* 8.3.126: SET MODE */ 2715 case CSI_SM: /* 8.3.126: SET MODE */
2658 if (arg[0] == 4) 2716 if (arg[0] == 4)
2659 scr_insert_mode (1); 2717 scr_insert_mode (1);
2660 break; 2718 break;
2661 2719
2662/* 2720 /*
2663 * PRIVATE USE beyond this point. All CSI_7? sequences here 2721 * PRIVATE USE beyond this point. All CSI_7? sequences here
2664 */ 2722 */
2665 case CSI_72: /* DECSTBM: set top and bottom margins */ 2723 case CSI_72: /* DECSTBM: set top and bottom margins */
2666 if (nargs == 1) 2724 if (nargs == 1)
2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2725 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2668 else if (nargs == 0 || arg[0] >= arg[1]) 2726 else if (nargs == 0 || arg[0] >= arg[1])
2669 scr_scroll_region (0, MAX_ROWS - 1); 2727 scr_scroll_region (0, MAX_ROWS - 1);
2670 else 2728 else
2671 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2729 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2672 break; 2730 break;
2673 2731
2674 case CSI_73: 2732 case CSI_73:
2675 scr_cursor (SAVE); 2733 scr_cursor (SAVE);
2676 break; 2734 break;
2677 case CSI_75: 2735 case CSI_75:
2678 scr_cursor (RESTORE); 2736 scr_cursor (RESTORE);
2679 break; 2737 break;
2680 2738
2681#ifndef NO_FRILLS 2739#ifndef NO_FRILLS
2682 case CSI_74: 2740 case CSI_74:
2683 process_window_ops (arg, nargs); 2741 process_window_ops (arg, nargs);
2684 break; 2742 break;
2685#endif 2743#endif
2686 2744
2687 case CSI_78: /* DECREQTPARM */ 2745 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 2746 if (arg[0] == 0 || arg[0] == 1)
2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2747 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2690 /* FALLTHROUGH */ 2748 /* FALLTHROUGH */
2691 2749
2692 default: 2750 default:
2693 break; 2751 break;
2694 } 2752 }
2695} 2753}
2696/*}}} */ 2754/*}}} */
2697 2755
2698#ifndef NO_FRILLS 2756#ifndef NO_FRILLS
2699/* ARGSUSED */ 2757/* ARGSUSED */
2700void 2758void
2701rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2759rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2702{ 2760{
2703 int x, y; 2761 int x, y;
2704#if 0 2762#if 0
2705 char *s; 2763 char *s;
2706#endif 2764#endif
2707 XWindowAttributes wattr; 2765 XWindowAttributes wattr;
2708 Window wdummy; 2766 Window wdummy;
2709 2767
2710 if (nargs == 0) 2768 if (nargs == 0)
2711 return; 2769 return;
2712 switch (args[0]) { 2770 switch (args[0])
2771 {
2713 /* 2772 /*
2714 * commands 2773 * commands
2715 */ 2774 */
2716 case 1: /* deiconify window */ 2775 case 1: /* deiconify window */
2717 XMapWindow(Xdisplay, TermWin.parent[0]); 2776 XMapWindow (display->display, TermWin.parent[0]);
2718 break; 2777 break;
2719 case 2: /* iconify window */ 2778 case 2: /* iconify window */
2720 XIconifyWindow(Xdisplay, TermWin.parent[0], 2779 XIconifyWindow (display->display, TermWin.parent[0],
2721 DefaultScreen(Xdisplay)); 2780 DefaultScreen (display->display));
2722 break; 2781 break;
2723 case 3: /* set position (pixels) */ 2782 case 3: /* set position (pixels) */
2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2783 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2725 break; 2784 break;
2726 case 4: /* set size (pixels) */ 2785 case 4: /* set size (pixels) */
2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2786 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2728 break; 2787 break;
2729 case 5: /* raise window */ 2788 case 5: /* raise window */
2730 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2789 XRaiseWindow (display->display, TermWin.parent[0]);
2731 break; 2790 break;
2732 case 6: /* lower window */ 2791 case 6: /* lower window */
2733 XLowerWindow(Xdisplay, TermWin.parent[0]); 2792 XLowerWindow (display->display, TermWin.parent[0]);
2734 break; 2793 break;
2735 case 7: /* refresh window */ 2794 case 7: /* refresh window */
2736 scr_touch (true); 2795 scr_touch (true);
2737 break; 2796 break;
2738 case 8: /* set size (chars) */ 2797 case 8: /* set size (chars) */
2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2798 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2740 (unsigned int)(args[1] * TermWin.fheight)); 2799 (unsigned int) (args[1] * TermWin.fheight));
2741 break; 2800 break;
2742 default: 2801 default:
2743 if (args[0] >= 24) /* set height (chars) */ 2802 if (args[0] >= 24) /* set height (chars) */
2744 set_widthheight ((unsigned int)TermWin.width, 2803 set_widthheight ((unsigned int)TermWin.width,
2745 (unsigned int)(args[1] * TermWin.fheight)); 2804 (unsigned int) (args[1] * TermWin.fheight));
2746 break; 2805 break;
2747 /* 2806 /*
2748 * reports - some output format copied from XTerm 2807 * reports - some output format copied from XTerm
2749 */ 2808 */
2750 case 11: /* report window state */ 2809 case 11: /* report window state */
2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2811 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2753 break; 2812 break;
2754 case 13: /* report window position */ 2813 case 13: /* report window position */
2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2814 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2815 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2757 -wattr.border_width, -wattr.border_width, 2816 -wattr.border_width, -wattr.border_width,
2758 &x, &y, &wdummy); 2817 &x, &y, &wdummy);
2759 tt_printf("\033[3;%d;%dt", x, y); 2818 tt_printf ("\033[3;%d;%dt", x, y);
2760 break; 2819 break;
2761 case 14: /* report window size (pixels) */ 2820 case 14: /* report window size (pixels) */
2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2821 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2822 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2764 break; 2823 break;
2765 case 18: /* report window size (chars) */ 2824 case 18: /* report window size (chars) */
2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2825 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2767 break; 2826 break;
2768#if 0 /* XXX: currently disabled due to security concerns */ 2827#if 0 /* XXX: currently disabled due to security concerns */
2769 case 20: /* report icon label */ 2828 case 20: /* report icon label */
2770 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2829 XGetIconName (display->display, TermWin.parent[0], &s);
2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2830 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2772 break; 2831 break;
2773 case 21: /* report window title */ 2832 case 21: /* report window title */
2774 XFetchName(Xdisplay, TermWin.parent[0], &s); 2833 XFetchName (display->display, TermWin.parent[0], &s);
2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2834 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2776 break; 2835 break;
2777#endif 2836#endif
2837
2778 } 2838 }
2779} 2839}
2780#endif 2840#endif
2781 2841
2782/*----------------------------------------------------------------------*/ 2842/*----------------------------------------------------------------------*/
2783/* 2843/*
2784 * get input up until STRING TERMINATOR (or BEL) 2844 * get input up until STRING TERMINATOR (or BEL)
2785 * ends_how is terminator used. returned input must be free()d 2845 * ends_how is terminator used. returned input must be free ()d
2786 */ 2846 */
2787unsigned char * 2847unsigned char *
2788rxvt_term::get_to_st (unsigned char *ends_how) 2848rxvt_term::get_to_st (unsigned char *ends_how)
2789{ 2849{
2790 int seen_esc = 0; /* seen escape? */ 2850 int seen_esc = 0; /* seen escape? */
2791 unsigned int n = 0; 2851 unsigned int n = 0;
2792 unsigned char *s; 2852 unsigned char *s;
2793 unsigned char ch, string[STRING_MAX]; 2853 unsigned char ch, string[STRING_MAX];
2794 2854
2795 for (; (ch = cmd_getc ());) { 2855 for (; (ch = cmd_getc ());)
2856 {
2796 if (ch == C0_BEL 2857 if (ch == C0_BEL
2797 || ch == CHAR_ST 2858 || ch == CHAR_ST
2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2859 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2799 break; 2860 break;
2800 if (ch == C0_ESC) { 2861 if (ch == C0_ESC)
2862 {
2801 seen_esc = 1; 2863 seen_esc = 1;
2802 continue; 2864 continue;
2865 }
2803 } else if (ch == '\t') 2866 else if (ch == '\t')
2804 ch = ' '; /* translate '\t' to space */ 2867 ch = ' '; /* translate '\t' to space */
2805 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2868 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2806 return NULL; /* other control character - exit */ 2869 return NULL; /* other control character - exit */
2807 if (n < sizeof(string) - 1) 2870 if (n < sizeof (string) - 1)
2808 string[n++] = ch; 2871 string[n++] = ch;
2809 seen_esc = 0; 2872 seen_esc = 0;
2810 } 2873 }
2811 string[n++] = '\0'; 2874 string[n++] = '\0';
2812 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2875 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2813 return NULL; 2876 return NULL;
2814 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2877 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2815 STRNCPY(s, string, n); 2878 STRNCPY (s, string, n);
2816 return s; 2879 return s;
2817} 2880}
2818 2881
2819/*----------------------------------------------------------------------*/ 2882/*----------------------------------------------------------------------*/
2820/* 2883/*
2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2884 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2822 */ 2885 */
2823void 2886void
2824rxvt_term::process_dcs_seq () 2887rxvt_term::process_dcs_seq ()
2825{ 2888{
2826 unsigned char eh, *s; 2889 unsigned char eh, *s;
2827/* 2890 /*
2828 * Not handled yet 2891 * Not handled yet
2829 */ 2892 */
2830 s = get_to_st (&eh); 2893 s = get_to_st (&eh);
2831 if (s) 2894 if (s)
2832 free(s); 2895 free (s);
2833 return; 2896 return;
2834} 2897}
2835 2898
2836/*----------------------------------------------------------------------*/ 2899/*----------------------------------------------------------------------*/
2837/* 2900/*
2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2901 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2839 */ 2902 */
2840void 2903void
2841rxvt_term::process_osc_seq () 2904rxvt_term::process_osc_seq ()
2842{ 2905{
2843 unsigned char ch, eh, *s; 2906 unsigned char ch, eh, *s;
2844 int arg; 2907 int arg;
2845 2908
2846 ch = cmd_getc (); 2909 ch = cmd_getc ();
2847 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2910 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2848 arg = arg * 10 + (ch - '0'); 2911 arg = arg * 10 + (ch - '0');
2849 2912
2850 if (ch == ';') { 2913 if (ch == ';')
2914 {
2851 s = get_to_st (&eh); 2915 s = get_to_st (&eh);
2852 if (s) { 2916 if (s)
2853 /* 2917 {
2918 /*
2854 * rxvt_menubar_dispatch() violates the constness of the string, 2919 * rxvt_menubar_dispatch () violates the constness of the string,
2855 * so do it here 2920 * so do it here
2856 */ 2921 */
2857 if (arg == XTerm_Menu) 2922 if (arg == XTerm_Menu)
2858#if 0 /* XXX: currently disabled due to security concerns */ 2923#if 0 /* XXX: currently disabled due to security concerns */
2859 menubar_dispatch ((char *)s); 2924 menubar_dispatch ((char *)s);
2860#else 2925#else
2861 (void)0; 2926 (void)0;
2862#endif 2927#endif
2863 else 2928 else
2864 xterm_seq (arg, (char *)s, eh); 2929 xterm_seq (arg, (char *)s, eh);
2865 free(s); 2930 free (s);
2866 } 2931 }
2867 } 2932 }
2868} 2933}
2869/* 2934/*
2870 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2935 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2871 * 0 = change iconName/title 2936 * 0 = change iconName/title
… …
2884 * 10 = menu (may change in future) 2949 * 10 = menu (may change in future)
2885 * 20 = bg pixmap 2950 * 20 = bg pixmap
2886 * 39 = change default fg color 2951 * 39 = change default fg color
2887 * 49 = change default bg color 2952 * 49 = change default bg color
2888 * 55 = dump scrollback buffer and all of screen 2953 * 55 = dump scrollback buffer and all of screen
2954 * 701 = change locale
2955 * 702 = find font
2889 */ 2956 */
2890void 2957void
2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2958rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2892{ 2959{
2893 int changed = 0; 2960 int changed = 0;
2894 int color; 2961 int color;
2895 char *buf, *name; 2962 char *buf, *name;
2896 2963
2897 assert(str != NULL); 2964 assert (str != NULL);
2898 switch (op) { 2965 switch (op)
2966 {
2899 case XTerm_name: 2967 case XTerm_name:
2900 set_title (str); 2968 set_title (str);
2901 /* FALLTHROUGH */ 2969 /* FALLTHROUGH */
2902 case XTerm_iconName: 2970 case XTerm_iconName:
2903 set_iconName (str); 2971 set_iconName (str);
2904 break; 2972 break;
2905 case XTerm_title: 2973 case XTerm_title:
2906 set_title (str); 2974 set_title (str);
2907 break; 2975 break;
2908 case XTerm_Color: 2976 case XTerm_Color:
2909 for (buf = (char *)str; buf && *buf;) { 2977 for (buf = (char *)str; buf && *buf;)
2978 {
2910 if ((name = STRCHR(buf, ';')) == NULL) 2979 if ((name = STRCHR (buf, ';')) == NULL)
2911 break; 2980 break;
2912 *name++ = '\0'; 2981 *name++ = '\0';
2913 color = atoi(buf); 2982 color = atoi (buf);
2914 if (color < 0 || color >= TOTAL_COLORS) 2983 if (color < 0 || color >= TOTAL_COLORS)
2915 break; 2984 break;
2916 if ((buf = STRCHR(name, ';')) != NULL) 2985 if ((buf = STRCHR (name, ';')) != NULL)
2917 *buf++ = '\0'; 2986 *buf++ = '\0';
2918 set_window_color (color + minCOLOR, name); 2987 set_window_color (color + minCOLOR, name);
2919 } 2988 }
2920 break; 2989 break;
2921#ifndef NO_CURSORCOLOR 2990#ifndef NO_CURSORCOLOR
2922 case XTerm_Color_cursor: 2991 case XTerm_Color_cursor:
2923 set_window_color (Color_cursor, str); 2992 set_window_color (Color_cursor, str);
2924 break; 2993 break;
2925#endif 2994#endif
2926 case XTerm_Color_pointer: 2995 case XTerm_Color_pointer:
2927 set_window_color (Color_pointer, str); 2996 set_window_color (Color_pointer, str);
2928 break; 2997 break;
2929#ifndef NO_BOLD_UNDERLINE_REVERSE 2998#ifndef NO_BOLD_UNDERLINE_REVERSE
2930 case XTerm_Color_BD: 2999 case XTerm_Color_BD:
2931 set_window_color (Color_BD, str); 3000 set_window_color (Color_BD, str);
2932 break; 3001 break;
2933 case XTerm_Color_UL: 3002 case XTerm_Color_UL:
2934 set_window_color (Color_UL, str); 3003 set_window_color (Color_UL, str);
2935 break; 3004 break;
2936 case XTerm_Color_RV: 3005 case XTerm_Color_RV:
2937 set_window_color (Color_RV, str); 3006 set_window_color (Color_RV, str);
2938 break; 3007 break;
2939#endif 3008#endif
2940 3009
2941 case XTerm_Menu: 3010 case XTerm_Menu:
2942 /* 3011 /*
2943 * rxvt_menubar_dispatch() violates the constness of the string, 3012 * rxvt_menubar_dispatch () violates the constness of the string,
2944 * so DON'T do it here 3013 * so DON'T do it here
2945 */ 3014 */
2946 break; 3015 break;
2947 case XTerm_Pixmap: 3016 case XTerm_Pixmap:
2948 if (*str != ';') { 3017 if (*str != ';')
3018 {
2949#if XPM_BACKGROUND 3019#if XPM_BACKGROUND
2950 scale_pixmap (""); /* reset to default scaling */ 3020 scale_pixmap (""); /* reset to default scaling */
2951 set_bgPixmap (str); /* change pixmap */ 3021 set_bgPixmap (str); /* change pixmap */
2952#endif 3022#endif
2953 scr_touch (true); 3023 scr_touch (true);
2954 } 3024 }
2955 while ((str = STRCHR(str, ';')) != NULL) { 3025 while ((str = STRCHR (str, ';')) != NULL)
2956 str++; 3026 {
3027 str++;
2957#if XPM_BACKGROUND 3028#if XPM_BACKGROUND
2958 changed += scale_pixmap (str); 3029 changed += scale_pixmap (str);
2959#endif 3030#endif
2960 } 3031
2961 if (changed) { 3032 }
3033 if (changed)
3034 {
2962#ifdef XPM_BACKGROUND 3035#ifdef XPM_BACKGROUND
2963 resize_pixmap (); 3036 resize_pixmap ();
2964#endif 3037#endif
2965 scr_touch (true); 3038 scr_touch (true);
2966 } 3039 }
2967 break; 3040 break;
2968 3041
2969 case XTerm_restoreFG: 3042 case XTerm_restoreFG:
2970 set_window_color (Color_fg, str); 3043 set_window_color (Color_fg, str);
2971 break; 3044 break;
2972 case XTerm_restoreBG: 3045 case XTerm_restoreBG:
2973 set_window_color (Color_bg, str); 3046 set_window_color (Color_bg, str);
2974 break; 3047 break;
2975 case XTerm_logfile: 3048 case XTerm_logfile:
2976 break; 3049 break;
2977 case XTerm_font: 3050 case XTerm_font:
2978 change_font (0, str); 3051 change_font (str);
2979 break; 3052 break;
3053#ifndef NO_FRILLS
3054 case XTerm_locale:
3055 if (str[0] == '?' && !str[1])
3056 tt_printf ("%-.250s\n", locale);
3057 else
3058 {
3059 set_locale (str);
3060# ifdef USE_XIM
3061 im_cb ();
3062# endif
3063 }
3064 break;
3065 case XTerm_findfont:
3066 {
3067 int fid = TermWin.fontset->find_font (atoi (str));
3068 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3069 }
3070 break;
3071#endif
2980#if 0 3072#if 0
2981 case XTerm_dumpscreen: /* no error notices */ 3073 case XTerm_dumpscreen: /* no error notices */
2982 { 3074 {
2983 int fd; 3075 int fd;
2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3076 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2985 scr_dump (fd); 3077 {
2986 close(fd); 3078 scr_dump (fd);
2987 } 3079 close (fd);
2988 } 3080 }
2989 break; 3081 }
3082 break;
2990#endif 3083#endif
3084
2991 } 3085 }
2992} 3086}
2993/*----------------------------------------------------------------------*/ 3087/*----------------------------------------------------------------------*/
2994 3088
2995/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3089/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3003 * so no need for fancy checking 3097 * so no need for fancy checking
3004 */ 3098 */
3005int 3099int
3006rxvt_term::privcases (int mode, unsigned long bit) 3100rxvt_term::privcases (int mode, unsigned long bit)
3007{ 3101{
3008 int state; 3102 int state;
3009 3103
3010 if (mode == 's') { 3104 if (mode == 's')
3105 {
3011 SavedModes |= (PrivateModes & bit); 3106 SavedModes |= (PrivateModes & bit);
3012 return -1; 3107 return -1;
3013 } else { 3108 }
3109 else
3110 {
3014 if (mode == 'r') 3111 if (mode == 'r')
3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3112 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3016 else 3113 else
3017 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3114 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3018 PrivMode(state, bit); 3115 PrivMode (state, bit);
3019 } 3116 }
3020 return state; 3117 return state;
3021} 3118}
3022 3119
3023/* we're not using priv _yet_ */ 3120/* we're not using priv _yet_ */
3024void 3121void
3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3122rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3026{ 3123{
3027 unsigned int i, j; 3124 unsigned int i, j;
3028 int state; 3125 int state;
3029 static const struct { 3126 static const struct
3127 {
3030 const int argval; 3128 const int argval;
3031 const unsigned long bit; 3129 const unsigned long bit;
3130 }
3032 } argtopriv[] = { 3131 argtopriv[] = {
3033 { 1, PrivMode_aplCUR }, 3132 { 1, PrivMode_aplCUR },
3034 { 2, PrivMode_vt52 }, 3133 { 2, PrivMode_vt52 },
3035 { 3, PrivMode_132 }, 3134 { 3, PrivMode_132 },
3036 { 4, PrivMode_smoothScroll }, 3135 { 4, PrivMode_smoothScroll },
3037 { 5, PrivMode_rVideo }, 3136 { 5, PrivMode_rVideo },
3038 { 6, PrivMode_relOrigin }, 3137 { 6, PrivMode_relOrigin },
3039 { 7, PrivMode_Autowrap }, 3138 { 7, PrivMode_Autowrap },
3040 { 9, PrivMode_MouseX10 }, 3139 { 9, PrivMode_MouseX10 },
3041#ifdef menuBar_esc 3140#ifdef menuBar_esc
3042 { menuBar_esc, PrivMode_menuBar }, 3141 { menuBar_esc, PrivMode_menuBar },
3043#endif 3142#endif
3044#ifdef scrollBar_esc 3143#ifdef scrollBar_esc
3045 { scrollBar_esc, PrivMode_scrollBar }, 3144 { scrollBar_esc, PrivMode_scrollBar },
3046#endif 3145#endif
3047 { 25, PrivMode_VisibleCursor }, 3146 { 25, PrivMode_VisibleCursor },
3048 { 35, PrivMode_ShiftKeys }, 3147 { 35, PrivMode_ShiftKeys },
3049 { 40, PrivMode_132OK }, 3148 { 40, PrivMode_132OK },
3050 { 47, PrivMode_Screen }, 3149 { 47, PrivMode_Screen },
3051 { 66, PrivMode_aplKP }, 3150 { 66, PrivMode_aplKP },
3052#ifndef NO_BACKSPACE_KEY 3151#ifndef NO_BACKSPACE_KEY
3053 { 67, PrivMode_BackSpace }, 3152 { 67, PrivMode_BackSpace },
3054#endif 3153#endif
3055 { 1000, PrivMode_MouseX11 }, 3154 { 1000, PrivMode_MouseX11 },
3056 { 1010, PrivMode_TtyOutputInh }, 3155 { 1010, PrivMode_TtyOutputInh },
3057 { 1011, PrivMode_Keypress }, 3156 { 1011, PrivMode_Keypress },
3058 { 1047, PrivMode_Screen }, 3157 { 1047, PrivMode_Screen },
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3158 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3060 }; 3159 };
3061 3160
3062 if (nargs == 0) 3161 if (nargs == 0)
3063 return; 3162 return;
3064 3163
3065/* make lo/hi boolean */ 3164 /* make lo/hi boolean */
3066 if (mode == 'l') 3165 if (mode == 'l')
3067 mode = 0; /* reset */ 3166 mode = 0; /* reset */
3068 else if (mode == 'h') 3167 else if (mode == 'h')
3069 mode = 1; /* set */ 3168 mode = 1; /* set */
3070 3169
3071 for (i = 0; i < nargs; i++) { 3170 for (i = 0; i < nargs; i++)
3171 {
3072 state = -1; 3172 state = -1;
3073 3173
3074 /* basic handling */ 3174 /* basic handling */
3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3175 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3076 if (argtopriv[j].argval == arg[i]) { 3176 if (argtopriv[j].argval == arg[i])
3177 {
3077 state = privcases (mode, argtopriv[j].bit); 3178 state = privcases (mode, argtopriv[j].bit);
3078 break; 3179 break;
3079 } 3180 }
3080 3181
3081 /* extra handling for values with state unkept */ 3182 /* extra handling for values with state unkept */
3082 if (state == -1) 3183 if (state == -1)
3083 switch (arg[i]) { 3184 switch (arg[i])
3185 {
3084 case 1048: /* alternative cursor save */ 3186 case 1048: /* alternative cursor save */
3085 if (mode == 0) 3187 if (mode == 0)
3086 scr_cursor (RESTORE); 3188 scr_cursor (RESTORE);
3087 else if (mode == 1) 3189 else if (mode == 1)
3088 scr_cursor (SAVE); 3190 scr_cursor (SAVE);
3089 /* FALLTHROUGH */ 3191 /* FALLTHROUGH */
3090 default: 3192 default:
3091 continue; /* for(;i;) */ 3193 continue; /* for (;i;) */
3092 } 3194 }
3093 3195
3094 /* extra handling for values with valid 0 or 1 state */ 3196 /* extra handling for values with valid 0 or 1 state */
3095 switch (arg[i]) { 3197 switch (arg[i])
3198 {
3096 /* case 1: - application cursor keys */ 3199 /* case 1: - application cursor keys */
3097 case 2: /* VT52 mode */ 3200 case 2: /* VT52 mode */
3098 /* oddball mode. should be set regardless of set/reset 3201 /* oddball mode. should be set regardless of set/reset
3099 * parameter. Return from VT52 mode with an ESC < from 3202 * parameter. Return from VT52 mode with an ESC < from
3100 * within VT52 mode 3203 * within VT52 mode
3101 */ 3204 */
3102 PrivMode(1, PrivMode_vt52); 3205 PrivMode (1, PrivMode_vt52);
3103 break; 3206 break;
3104 case 3: /* 80/132 */ 3207 case 3: /* 80/132 */
3105 if (PrivateModes & PrivMode_132OK) 3208 if (PrivateModes & PrivMode_132OK)
3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3209 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3107 (unsigned int)TermWin.height); 3210 break;
3108 break;
3109 case 4: /* smooth scrolling */ 3211 case 4: /* smooth scrolling */
3110 if (state) 3212 if (state)
3111 Options &= ~Opt_jumpScroll; 3213 Options &= ~Opt_jumpScroll;
3112 else 3214 else
3113 Options |= Opt_jumpScroll; 3215 Options |= Opt_jumpScroll;
3114 break; 3216 break;
3115 case 5: /* reverse video */ 3217 case 5: /* reverse video */
3116 scr_rvideo_mode (state); 3218 scr_rvideo_mode (state);
3117 break; 3219 break;
3118 case 6: /* relative/absolute origins */ 3220 case 6: /* relative/absolute origins */
3119 scr_relative_origin (state); 3221 scr_relative_origin (state);
3120 break; 3222 break;
3121 case 7: /* autowrap */ 3223 case 7: /* autowrap */
3122 scr_autowrap (state); 3224 scr_autowrap (state);
3123 break; 3225 break;
3124 /* case 8: - auto repeat, can't do on a per window basis */ 3226 /* case 8: - auto repeat, can't do on a per window basis */
3125 case 9: /* X10 mouse reporting */ 3227 case 9: /* X10 mouse reporting */
3126 if (state) /* orthogonal */ 3228 if (state) /* orthogonal */
3127 PrivateModes &= ~(PrivMode_MouseX11); 3229 PrivateModes &= ~ (PrivMode_MouseX11);
3128 break; 3230 break;
3129#ifdef menuBar_esc 3231#ifdef menuBar_esc
3130 case menuBar_esc: 3232 case menuBar_esc:
3131#ifdef MENUBAR 3233#ifdef MENUBAR
3132 map_menuBar (state); 3234 map_menuBar (state);
3133#endif 3235#endif
3134 break; 3236 break;
3135#endif 3237#endif
3136#ifdef scrollBar_esc 3238#ifdef scrollBar_esc
3137 case scrollBar_esc: 3239 case scrollBar_esc:
3138 if (scrollbar_mapping (state)) { 3240 if (scrollbar_mapping (state))
3241 {
3139 resize_all_windows (0, 0, 0); 3242 resize_all_windows (0, 0, 0);
3140 scr_touch (true); 3243 scr_touch (true);
3141 } 3244 }
3142 break; 3245 break;
3143#endif 3246#endif
3144 case 25: /* visible/invisible cursor */ 3247 case 25: /* visible/invisible cursor */
3145 scr_cursor_visible (state); 3248 scr_cursor_visible (state);
3146 break; 3249 break;
3147 /* case 35: - shift keys */ 3250 /* case 35: - shift keys */
3148 /* case 40: - 80 <--> 132 mode */ 3251 /* case 40: - 80 <--> 132 mode */
3149 case 47: /* secondary screen */ 3252 case 47: /* secondary screen */
3150 scr_change_screen (state); 3253 scr_change_screen (state);
3151 break; 3254 break;
3152 /* case 66: - application key pad */ 3255 /* case 66: - application key pad */
3153 /* case 67: - backspace key */ 3256 /* case 67: - backspace key */
3154 case 1000: /* X11 mouse reporting */ 3257 case 1000: /* X11 mouse reporting */
3155 if (state) /* orthogonal */ 3258 if (state) /* orthogonal */
3156 PrivateModes &= ~(PrivMode_MouseX10); 3259 PrivateModes &= ~ (PrivMode_MouseX10);
3157 break; 3260 break;
3158#if 0 3261#if 0
3159 case 1001: 3262 case 1001:
3160 break; /* X11 mouse highlighting */ 3263 break; /* X11 mouse highlighting */
3161#endif 3264#endif
3162 case 1010: /* scroll to bottom on TTY output inhibit */ 3265 case 1010: /* scroll to bottom on TTY output inhibit */
3163 if (state) 3266 if (state)
3164 Options &= ~Opt_scrollTtyOutput; 3267 Options &= ~Opt_scrollTtyOutput;
3165 else 3268 else
3166 Options |= Opt_scrollTtyOutput; 3269 Options |= Opt_scrollTtyOutput;
3167 break; 3270 break;
3168 case 1011: /* scroll to bottom on key press */ 3271 case 1011: /* scroll to bottom on key press */
3169 if (state) 3272 if (state)
3170 Options |= Opt_scrollTtyKeypress; 3273 Options |= Opt_scrollTtyKeypress;
3171 else 3274 else
3172 Options &= ~Opt_scrollTtyKeypress; 3275 Options &= ~Opt_scrollTtyKeypress;
3173 break; 3276 break;
3174 case 1047: /* secondary screen w/ clearing */ 3277 case 1047: /* secondary screen w/ clearing */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3278 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3176 if (current_screen != PRIMARY) 3279 if (current_screen != PRIMARY)
3177 scr_erase_screen (2); 3280 scr_erase_screen (2);
3178 scr_change_screen (state); 3281 scr_change_screen (state);
3179 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
3180 default: 3283 default:
3181 break; 3284 break;
3182 } 3285 }
3183 } 3286 }
3184} 3287}
3185/*}}} */ 3288/*}}} */
3186 3289
3187/*{{{ process sgr sequences */ 3290/*{{{ process sgr sequences */
3188void 3291void
3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3292rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3190{ 3293{
3191 unsigned int i; 3294 unsigned int i;
3192 short rendset; 3295 short rendset;
3193 int rendstyle; 3296 int rendstyle;
3194 3297
3195 if (nargs == 0) { 3298 if (nargs == 0)
3299 {
3196 scr_rendition (0, ~RS_None); 3300 scr_rendition (0, ~RS_None);
3197 return; 3301 return;
3198 } 3302 }
3199 for (i = 0; i < nargs; i++) { 3303 for (i = 0; i < nargs; i++)
3304 {
3200 rendset = -1; 3305 rendset = -1;
3201 switch (arg[i]) { 3306 switch (arg[i])
3202 case 0: 3307 {
3308 case 0:
3203 rendset = 0, rendstyle = ~RS_None; 3309 rendset = 0, rendstyle = ~RS_None;
3204 break; 3310 break;
3205 case 1: 3311 case 1:
3206 rendset = 1, rendstyle = RS_Bold; 3312 rendset = 1, rendstyle = RS_Bold;
3207 break; 3313 break;
3208 case 4: 3314 case 4:
3209 rendset = 1, rendstyle = RS_Uline; 3315 rendset = 1, rendstyle = RS_Uline;
3210 break; 3316 break;
3211 case 5: 3317 case 5:
3212 rendset = 1, rendstyle = RS_Blink; 3318 rendset = 1, rendstyle = RS_Blink;
3213 break; 3319 break;
3214 case 7: 3320 case 7:
3215 rendset = 1, rendstyle = RS_RVid; 3321 rendset = 1, rendstyle = RS_RVid;
3216 break; 3322 break;
3217 case 22: 3323 case 22:
3218 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3219 break; 3325 break;
3220 case 24: 3326 case 24:
3221 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
3222 break; 3328 break;
3223 case 25: 3329 case 25:
3224 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3225 break; 3331 break;
3226 case 27: 3332 case 27:
3227 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3228 break; 3334 break;
3229 } 3335 }
3230 if (rendset != -1) { 3336 if (rendset != -1)
3337 {
3231 scr_rendition (rendset, rendstyle); 3338 scr_rendition (rendset, rendstyle);
3232 continue; /* for(;i;) */ 3339 continue; /* for (;i;) */
3233 } 3340 }
3234 3341
3235 switch (arg[i]) { 3342 switch (arg[i])
3236 case 30: 3343 {
3344 case 30:
3237 case 31: /* set fg color */ 3345 case 31: /* set fg color */
3238 case 32: 3346 case 32:
3239 case 33: 3347 case 33:
3240 case 34: 3348 case 34:
3241 case 35: 3349 case 35:
3242 case 36: 3350 case 36:
3243 case 37: 3351 case 37:
3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3245 Color_fg); 3353 Color_fg);
3246 break; 3354 break;
3247#ifdef TTY_256COLOR 3355#ifdef TTY_256COLOR
3248 case 38: 3356 case 38:
3249 if (nargs > i + 2 && arg[i + 1] == 5) { 3357 if (nargs > i + 2 && arg[i + 1] == 5)
3358 {
3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3251 Color_fg); 3360 Color_fg);
3252 i += 2; 3361 i += 2;
3253 } 3362 }
3254 break; 3363 break;
3255#endif 3364#endif
3256 case 39: /* default fg */ 3365 case 39: /* default fg */
3257 scr_color (Color_fg, Color_fg); 3366 scr_color (Color_fg, Color_fg);
3258 break; 3367 break;
3259 3368
3260 case 40: 3369 case 40:
3261 case 41: /* set bg color */ 3370 case 41: /* set bg color */
3262 case 42: 3371 case 42:
3263 case 43: 3372 case 43:
3264 case 44: 3373 case 44:
3265 case 45: 3374 case 45:
3266 case 46: 3375 case 46:
3267 case 47: 3376 case 47:
3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3377 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3269 Color_bg); 3378 Color_bg);
3270 break; 3379 break;
3271#ifdef TTY_256COLOR 3380#ifdef TTY_256COLOR
3272 case 48: 3381 case 48:
3273 if (nargs > i + 2 && arg[i + 1] == 5) { 3382 if (nargs > i + 2 && arg[i + 1] == 5)
3383 {
3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3275 Color_bg); 3385 Color_bg);
3276 i += 2; 3386 i += 2;
3277 } 3387 }
3278 break; 3388 break;
3279#endif 3389#endif
3280 case 49: /* default bg */ 3390 case 49: /* default bg */
3281 scr_color (Color_bg, Color_bg); 3391 scr_color (Color_bg, Color_bg);
3282 break; 3392 break;
3283 3393
3284#ifndef NO_BRIGHTCOLOR 3394#ifndef NO_BRIGHTCOLOR
3285 case 90: 3395 case 90:
3286 case 91: /* set bright fg color */ 3396 case 91: /* set bright fg color */
3287 case 92: 3397 case 92:
3288 case 93: 3398 case 93:
3289 case 94: 3399 case 94:
3290 case 95: 3400 case 95:
3291 case 96: 3401 case 96:
3292 case 97: 3402 case 97:
3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3294 Color_fg); 3404 Color_fg);
3295 break; 3405 break;
3296 case 100: 3406 case 100:
3297 case 101: /* set bright bg color */ 3407 case 101: /* set bright bg color */
3298 case 102: 3408 case 102:
3299 case 103: 3409 case 103:
3300 case 104: 3410 case 104:
3301 case 105: 3411 case 105:
3302 case 106: 3412 case 106:
3303 case 107: 3413 case 107:
3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3305 Color_bg); 3415 Color_bg);
3306 break; 3416 break;
3307#endif 3417#endif
3308 } 3418
3419 }
3309 } 3420 }
3310} 3421}
3311/*}}} */ 3422/*}}} */
3312 3423
3313/*{{{ process Rob Nation's own graphics mode sequences */ 3424/*{{{ process Rob Nation's own graphics mode sequences */
3314void 3425void
3315rxvt_term::process_graphics () 3426rxvt_term::process_graphics ()
3316{ 3427{
3317 unsigned char ch, cmd = cmd_getc (); 3428 unsigned char ch, cmd = cmd_getc ();
3318 3429
3319#ifndef RXVT_GRAPHICS 3430 if (cmd == 'Q')
3320 if (cmd == 'Q') { /* query graphics */ 3431 { /* query graphics */
3321 tt_printf("\033G0\n"); /* no graphics */ 3432 tt_printf ("\033G0\n"); /* no graphics */
3322 return; 3433 return;
3323 } 3434 }
3324/* swallow other graphics sequences until terminating ':' */ 3435 /* swallow other graphics sequences until terminating ':' */
3325 do 3436 do
3326 ch = cmd_getc ();
3327 while (ch != ':');
3328#else
3329 unsigned int nargs;
3330 int args[NGRX_PTS];
3331 unsigned char *text = NULL;
3332
3333 if (cmd == 'Q') { /* query graphics */
3334 tt_printf("\033G1\n"); /* yes, graphics (color) */
3335 return;
3336 }
3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3338 int neg;
3339
3340 ch = cmd_getc ();
3341 neg = (ch == '-');
3342 if (neg || ch == '+')
3343 ch = cmd_getc (); 3437 ch = cmd_getc ();
3344 3438 while (ch != ':');
3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3346 args[nargs] = args[nargs] * 10 + (ch - '0');
3347 if (neg)
3348 args[nargs] = -args[nargs];
3349
3350 nargs++;
3351 args[nargs] = 0;
3352 if (ch != ';')
3353 break;
3354 }
3355
3356 if ((cmd == 'T') && (nargs >= 5)) {
3357 int i, len = args[4];
3358
3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3360
3361 if (text != NULL) {
3362 for (i = 0; i < len; i++)
3363 text[i] = cmd_getc ();
3364 text[len] = '\0';
3365 }
3366 }
3367 Gr_do_graphics (cmd, nargs, args, text);
3368#endif
3369} 3439}
3370/*}}} */ 3440/*}}} */
3371 3441
3372/* ------------------------------------------------------------------------- */ 3442/* ------------------------------------------------------------------------- */
3373 3443
3374/* 3444/*
3375 * Send printf() formatted output to the command. 3445 * Send printf () formatted output to the command.
3376 * Only use for small amounts of data. 3446 * Only use for small amounts of data.
3377 */ 3447 */
3378void 3448void
3379rxvt_term::tt_printf (const char *fmt,...) 3449rxvt_term::tt_printf (const char *fmt,...)
3380{ 3450{

Diff Legend

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