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.16 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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