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.26 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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