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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC

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

Diff Legend

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