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.8 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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