ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
47void * 125void *
48rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
49{ 127{
50 void *p = malloc (s); 128 void *p = malloc (s);
51 129
58{ 136{
59 free (p); 137 free (p);
60} 138}
61 139
62rxvt_term::rxvt_term () 140rxvt_term::rxvt_term ()
141 :
142 rootwin_ev (this, &rxvt_term::rootwin_cb),
143 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 144 vt_ev (this, &rxvt_term::x_cb),
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev (this, &rxvt_term::x_cb),
147#endif
148#ifdef MENUBAR
149 menubar_ev (this, &rxvt_term::x_cb),
150#endif
64#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
153#endif
154#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 156#endif
67#ifdef POINTER_BLANK 157#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 159#endif
160#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 164 destroy_ev (this, &rxvt_term::destroy_cb),
165 pty_ev (this, &rxvt_term::pty_cb),
166 incr_ev (this, &rxvt_term::incr_cb)
72{ 167{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 169}
75 170
76rxvt_term::~rxvt_term () 171rxvt_term::~rxvt_term ()
77{ 172{
78 rxvt_scr_release (this);
79
80#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE);
82#endif
83#ifdef UTMP_SUPPORT
84 rxvt_privileged_utmp (this, RESTORE);
85#endif
86#ifdef USE_XIM
87 if (Input_Context != NULL)
88 {
89 XDestroyIC (Input_Context);
90 Input_Context = NULL;
91 }
92#endif
93
94 if (cmd_fd >= 0) 173 if (cmd_fd >= 0)
95 close (cmd_fd); 174 close (cmd_fd);
96 175
97 if (Xfd >= 0) 176#ifndef NO_SETOWNER_TTYDEV
98 XCloseDisplay (Xdisplay); 177 privileged_ttydev (RESTORE);
178#endif
179#ifdef UTMP_SUPPORT
180 privileged_utmp (RESTORE);
181#endif
182
183 delete TermWin.fontset;
184
185 if (display)
186 {
187 selection_clear ();
188
189#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif
192#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif
196#ifdef PLAIN_SCROLLBAR
197 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
198#endif
199#ifdef NEXT_SCROLLBAR
200 if (blackGC) XFreeGC (display->display, blackGC);
201 if (whiteGC) XFreeGC (display->display, whiteGC);
202 if (grayGC) XFreeGC (display->display, grayGC);
203 if (darkGC) XFreeGC (display->display, darkGC);
204 if (stippleGC) XFreeGC (display->display, stippleGC);
205 if (dimple) XFreePixmap (display->display, dimple);
206 if (upArrow) XFreePixmap (display->display, upArrow);
207 if (downArrow) XFreePixmap (display->display, downArrow);
208 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
209 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
210#endif
211#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
212 if (topShadowGC) XFreeGC (display->display, topShadowGC);
213 if (botShadowGC) XFreeGC (display->display, botShadowGC);
214 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
215#endif
216 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
217
218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
219 delete menuBar.drawable;
220 //if (menuBar.win)
221 // XDestroyWindow (display->display, menuBar.win);
222#endif
223 delete TermWin.drawable;
224 // destroy all windows
225 if (TermWin.parent[0])
226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
228
229 // TODO: free pixcolours, colours should become part of rxvt_display
99 230
100 delete PixColors; 231 delete PixColors;
232
233 displays.put (display);
234
235 scr_release ();
236
237 /* clear all resources */
238 for (int i = 0; i < allocated.size (); i++)
239 free (allocated[i]);
240
241 free (selection.text);
242 // TODO: manage env vars in child only(!)
243 free (env_windowid);
244 free (env_display);
245 free (env_term);
246 free (env_colorfgbg);
247 free (locale);
248#if 0
249 free (codeset);
250#endif
251
252 delete envv;
253 delete argv;
101} 254}
102 255
103void 256void
104rxvt_term::destroy () 257rxvt_term::destroy ()
105{ 258{
259 if (display)
260 {
261 rootwin_ev.stop (display);
262 termwin_ev.stop (display);
263 vt_ev.stop (display);
264#ifdef USE_XIM
265 im_destroy ();
266 im_ev.stop (display);
267#endif
268#ifdef HAVE_SCROLLBARS
269 scrollbar_ev.stop (display);
270#endif
271#ifdef MENUBAR
272 menubar_ev.stop (display);
273#endif
274 }
275
276 check_ev.stop ();
106 pty_ev.stop (); 277 pty_ev.stop ();
107 x_ev.stop ();
108#ifdef CURSOR_BLINK 278#ifdef CURSOR_BLINK
279 cursor_blink_ev.stop ();
280#endif
281#ifdef TEXT_BLINK
109 blink_ev.stop (); 282 text_blink_ev.stop ();
110#endif 283#endif
111#ifdef POINTER_BLANK 284#ifdef POINTER_BLANK
112 pointer_ev.stop (); 285 pointer_ev.stop ();
113#endif 286#endif
114 287
122 295
123 delete this; 296 delete this;
124} 297}
125 298
126/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 300/* rxvt_init () */
128/* LIBPROTO */
129rxvt_t
130rxvt_init(int argc, const char *const *argv)
131{
132 SET_R(new rxvt_term);
133 dR;
134
135 if (!R->init_vars () || !R->init (argc, argv))
136 {
137 delete R;
138 return NULL;
139 }
140
141 return R;
142}
143
144/* EXTPROTO */
145void
146rxvt_init_signals ()
147{
148/* install exit handler for cleanup */
149#if 0
150#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit);
152#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif
157#endif
158
159 struct sigaction sa;
160
161 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */
171
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174}
175
176bool 301bool
177rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
178{ 303{
179 dR;//TODO (scrollbar, setidle) 304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
180 308
181 /* 309 /*
182 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 311 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 314 * 2. chown tty on some systems
187 */ 315 */
188 rxvt_privileges (this, SAVE); 316 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 317 privileges (IGNORE);
190 318
191 rxvt_init_secondary (this); 319 init_secondary ();
192 320
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
194 322
323 set_locale ("");
324
195#if (MENUBAR_MAX) 325#if MENUBAR_MAX
196 rxvt_menubar_read (this, rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
197#endif 327#endif
198#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 331#endif
202 332
203 rxvt_Create_Windows (this, argc, argv); 333 create_windows (argc, argv);
204 334
205 rxvt_init_xlocale (this); 335 init_xlocale ();
206 336
207 rxvt_scr_reset (this); /* initialize screen */ 337 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */
210#endif
211 338
212#if 0 339#if 0
213#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 340 XSynchronize (display->display, True);
215#endif
216#endif 341#endif
217 342
218#ifdef HAVE_SCROLLBARS 343#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 344 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 345 resize_scrollbar (); /* create and map scrollbar */
221#endif 346#endif
222#if (MENUBAR_MAX) 347#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 348 if (menubar_visible ())
224 XMapWindow (Xdisplay, menuBar.win); 349 XMapWindow (display->display, menuBar.win);
225#endif 350#endif
226#ifdef TRANSPARENT 351#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 352 if (Options & Opt_transparent)
228 { 353 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 354 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 355 check_our_parents ();
231 } 356 }
232#endif 357#endif
358
359 rootwin_ev.start (display, display->root);
360
233 XMapWindow (Xdisplay, TermWin.vt); 361 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 362 XMapWindow (display->display, TermWin.parent[0]);
235 363
236 rxvt_init_env (this);
237 rxvt_init_command (this, cmd_argv); 364 init_command (cmd_argv);
238 365
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
241 367
242 flush (); 368 check_ev.start ();
243 369
244 return true; 370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */
399
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
245} 402}
246 403
247/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
248 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
249 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
251 * Catch a SIGCHLD signal and exit if the direct child has died 408 * Catch a SIGCHLD signal and exit if the direct child has died
252 */ 409 */
253/* ARGSUSED */ 410/* ARGSUSED */
254/* EXTPROTO */ 411/* EXTPROTO */
255RETSIGTYPE 412RETSIGTYPE
256rxvt_Child_signal(int sig __attribute__ ((unused))) 413rxvt_Child_signal (int sig __attribute__ ((unused)))
257{ 414{
258 int pid, save_errno = errno; 415 int pid, save_errno = errno;
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 416 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 417 ;
261 errno = save_errno; 418 errno = save_errno;
262 419
263#if 0 420#if 0
264 if (pid == R->cmd_pid) 421 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 422 exit (EXIT_SUCCESS);
266#endif 423#endif
267} 424}
268 425
269/* 426/*
270 * Catch a fatal signal and tidy up before quitting 427 * Catch a fatal signal and tidy up before quitting
271 */ 428 */
272/* EXTPROTO */ 429/* EXTPROTO */
273RETSIGTYPE 430RETSIGTYPE
274rxvt_Exit_signal(int sig) 431rxvt_Exit_signal (int sig)
275{ 432{
276 signal(sig, SIG_DFL); 433 signal (sig, SIG_DFL);
277#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
278 rxvt_print_error("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
279#endif 436#endif
280 rxvt_clean_exit(); 437 rxvt_clean_exit ();
281 kill(getpid(), sig); 438 kill (getpid (), sig);
282} 439}
283 440
284/* ARGSUSED */
285/* INTPROTO */ 441/* INTPROTO */
286int 442int
287rxvt_xerror_handler(const Display * display 443rxvt_xerror_handler (Display *display, XErrorEvent *event)
288 __attribute__ ((unused)), const XErrorEvent * event)
289{ 444{
290 dR;
291
292 if (R->allowedxerror == -1) 445 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 446 GET_R->allowedxerror = event->error_code;
294 else 447 else
295 { 448 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 449 old_xerror_handler (display, event);
297 event->request_code, event->minor_code,
298 event->error_code);
299
300 R->destroy (); 450 GET_R->destroy ();
301 } 451 }
302 452
303 return 0; 453 return 0;
304} 454}
305 455
310 */ 460 */
311/* EXTPROTO */ 461/* EXTPROTO */
312void 462void
313rxvt_clean_exit () 463rxvt_clean_exit ()
314{ 464{
315 dR; 465 // TODO: rxvtd should clean up all ressources
316 466 if (GET_R)
317 R->destroy (); 467 GET_R->destroy ();
318} 468}
319 469
320/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 471 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 473/* EXTPROTO */
324void * 474void *
325rxvt_malloc(size_t size) 475rxvt_malloc (size_t size)
326{ 476{
327 void *p; 477 void *p;
328 478
329 p = malloc(size); 479 p = malloc (size);
330 if (p) 480 if (p)
331 return p; 481 return p;
332 482
333 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
334 rxvt_clean_exit(); 484 rxvt_clean_exit ();
335 exit(EXIT_FAILURE); 485 exit (EXIT_FAILURE);
336/* NOTREACHED */ 486 /* NOTREACHED */
337} 487}
338 488
339/* EXTPROTO */ 489/* EXTPROTO */
340void * 490void *
341rxvt_calloc(size_t number, size_t size) 491rxvt_calloc (size_t number, size_t size)
342{ 492{
343 void *p; 493 void *p;
344 494
345 p = calloc(number, size); 495 p = calloc (number, size);
346 if (p) 496 if (p)
347 return p; 497 return p;
348 498
349 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
350 rxvt_clean_exit(); 500 rxvt_clean_exit ();
351 exit(EXIT_FAILURE); 501 exit (EXIT_FAILURE);
352/* NOTREACHED */ 502 /* NOTREACHED */
353} 503}
354 504
355/* EXTPROTO */ 505/* EXTPROTO */
356void * 506void *
357rxvt_realloc(void *ptr, size_t size) 507rxvt_realloc (void *ptr, size_t size)
358{ 508{
359 void *p; 509 void *p;
360 510
361 if (ptr) 511 if (ptr)
362 p = realloc(ptr, size); 512 p = realloc (ptr, size);
363 else 513 else
364 p = malloc(size); 514 p = malloc (size);
365 if (p) 515 if (p)
366 return p; 516 return p;
367 517
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit(); 519 rxvt_clean_exit ();
370 exit(EXIT_FAILURE); 520 exit (EXIT_FAILURE);
371/* NOTREACHED */ 521 /* NOTREACHED */
372} 522}
373 523
374/* ------------------------------------------------------------------------- * 524/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 525 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 526 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 527/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 528void
380rxvt_privileges(pR_ int mode) 529rxvt_term::privileges (int mode)
381{ 530{
382#if ! defined(__CYGWIN32__) 531#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 532# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 533 /* setreuid () is the poor man's setuid (), seteuid () */
385# define seteuid(a) setreuid(-1, (a)) 534# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 535# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 536# define HAVE_SETEUID
388# endif 537# endif
389# ifdef HAVE_SETEUID 538# ifdef HAVE_SETEUID
390 switch (mode) { 539 switch (mode)
540 {
391 case IGNORE: 541 case IGNORE:
392 /* 542 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 543 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 544 * back to root later, as required
395 */ 545 */
396 seteuid(getuid()); 546 seteuid (getuid ());
397 setegid(getgid()); 547 setegid (getgid ());
398 break; 548 break;
399 case SAVE: 549 case SAVE:
400 R->euid = geteuid(); 550 euid = geteuid ();
401 R->egid = getegid(); 551 egid = getegid ();
402 break; 552 break;
403 case RESTORE: 553 case RESTORE:
404 seteuid(R->euid); 554 seteuid (euid);
405 setegid(R->egid); 555 setegid (egid);
406 break; 556 break;
407 } 557 }
408# else 558# else
409 switch (mode) { 559 switch (mode)
560 {
410 case IGNORE: 561 case IGNORE:
411 setuid(getuid()); 562 setuid (getuid ());
412 setgid(getgid()); 563 setgid (getgid ());
413 /* FALLTHROUGH */ 564 /* FALLTHROUGH */
414 case SAVE: 565 case SAVE:
415 /* FALLTHROUGH */ 566 /* FALLTHROUGH */
416 case RESTORE: 567 case RESTORE:
417 break; 568 break;
418 } 569 }
419# endif 570# endif
420#endif 571#endif
421} 572}
422 573
423#ifdef UTMP_SUPPORT 574#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 575void
426rxvt_privileged_utmp(pR_ char action) 576rxvt_term::privileged_utmp (char action)
427{ 577{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 578 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 579 action, next_utmp_action, getpid ()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 580 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 581 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 582 || ttydev == NULL || *ttydev == '\0')
433 return; 583 return;
434 584
435 rxvt_privileges(aR_ RESTORE); 585 privileges (RESTORE);
436 if (action == SAVE) { 586 if (action == SAVE)
587 {
437 R->next_utmp_action = RESTORE; 588 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 589 makeutent (ttydev, rs[Rs_display_name]);
590 }
591 else
439 } else { /* action == RESTORE */ 592 { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 593 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 594 cleanutent ();
442 } 595 }
443 rxvt_privileges(aR_ IGNORE); 596 privileges (IGNORE);
444} 597}
445#endif 598#endif
446 599
447#ifndef NO_SETOWNER_TTYDEV 600#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 601void
450rxvt_privileged_ttydev(pR_ char action) 602rxvt_term::privileged_ttydev (char action)
451{ 603{
452 D_MAIN((stderr, 604 D_MAIN ((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 605 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 606 action, next_tty_action, getpid ()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 607 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 608 || ttydev == NULL || *ttydev == '\0')
457 return; 609 return;
458 610
459 rxvt_privileges(aR_ RESTORE); 611 privileges (RESTORE);
460 612
461 if (action == SAVE) { 613 if (action == SAVE)
614 {
462 R->next_tty_action = RESTORE; 615 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 616# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 617 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 618 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 619 next_tty_action = IGNORE;
467 else 620 else
468# endif 621# endif
622
469 { 623 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 624 chown (ttydev, getuid (), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 625 chmod (ttydev, ttymode);
472# ifdef HAVE_REVOKE 626# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 627 revoke (ttydev);
474# endif 628# endif
629
475 } 630 }
631 }
632 else
476 } else { /* action == RESTORE */ 633 { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 634 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 635# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 636 chmod (ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 637 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 638# else
482 chmod(R->ttydev, 639 chmod (ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 640 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 641 chown (ttydev, 0, 0);
485# endif 642# endif
486 }
487 643
644 }
645
488 rxvt_privileges(aR_ IGNORE); 646 privileges (IGNORE);
489 647
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 648# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 649 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 650 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 651 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 652 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 653 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 654 ttyfd_stat.st_gid));
497# endif 655# endif
498} 656}
499#endif 657#endif
500 658
501/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
502/* 660/*
503 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
505 */ 663 */
506/* EXTPROTO */
507void 664void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 665rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 666{
510 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 669 unsigned int w, h;
513 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
514 671
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 672 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 673 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 674 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 675 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 676 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 677 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 678
522 recalc_x = recalc_y = 0; 679 recalc_x = recalc_y = 0;
523 flags = 0; 680 flags = 0;
524 if (!R->parsed_geometry) { 681 if (!parsed_geometry)
682 {
525 R->parsed_geometry = 1; 683 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 684 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 685 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 686 if (flags & WidthValue)
687 {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 688 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
530 R->szHint.flags |= USSize; 689 szHint.flags |= USSize;
531 } 690 }
532 if (flags & HeightValue) { 691 if (flags & HeightValue)
692 {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 693 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
534 R->szHint.flags |= USSize; 694 szHint.flags |= USSize;
535 } 695 }
536 if (flags & XValue) { 696 if (flags & XValue)
697 {
537 R->szHint.x = x; 698 szHint.x = x;
538 R->szHint.flags |= USPosition; 699 szHint.flags |= USPosition;
539 if (flags & XNegative) { 700 if (flags & XNegative)
701 {
540 recalc_x = 1; 702 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 703 szHint.win_gravity = NorthEastGravity;
542 } 704 }
543 } 705 }
544 if (flags & YValue) { 706 if (flags & YValue)
707 {
545 R->szHint.y = y; 708 szHint.y = y;
546 R->szHint.flags |= USPosition; 709 szHint.flags |= USPosition;
547 if (flags & YNegative) { 710 if (flags & YNegative)
711 {
548 recalc_y = 1; 712 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 713 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 714 szHint.win_gravity = SouthEastGravity;
551 else 715 else
552 R->szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
553 } 717 }
554 } 718 }
555 } 719 }
720
556/* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
561 726
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 727 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 728
564 sb_w = mb_h = 0; 729 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 730 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 731 if (scrollbar_visible ())
732 {
567 sb_w = scrollbar_TotalWidth(); 733 sb_w = scrollbar_TotalWidth ();
568 R->szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 735 if (! (Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 736 window_vt_x = sb_w;
571 } 737 }
572 if (menubar_visible(R)) { 738 if (menubar_visible ())
739 {
573 mb_h = menuBar_TotalHeight(); 740 mb_h = menuBar_TotalHeight ();
574 R->szHint.base_height += mb_h; 741 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 742 window_vt_y = mb_h;
576 } 743 }
577 R->szHint.width_inc = R->TermWin.fwidth; 744 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 745 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 746 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 747 szHint.min_height = szHint.base_height + szHint.height_inc;
581 748
582 if (width && width - R->szHint.base_width < max_width) { 749 if (width && width - szHint.base_width < max_width)
750 {
583 R->szHint.width = width; 751 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 752 TermWin.width = width - szHint.base_width;
585 } else { 753 }
754 else
755 {
586 MIN_IT(R->TermWin.width, max_width); 756 MIN_IT (TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 757 szHint.width = szHint.base_width + TermWin.width;
588 } 758 }
589 if (height && height - R->szHint.base_height < max_height) { 759 if (height && height - szHint.base_height < max_height)
760 {
590 R->szHint.height = height; 761 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 762 TermWin.height = height - szHint.base_height;
592 } else { 763 }
764 else
765 {
593 MIN_IT(R->TermWin.height, max_height); 766 MIN_IT (TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 767 szHint.height = szHint.base_height + TermWin.height;
595 } 768 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 769 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 770 window_sb_x = szHint.width - sb_w;
598 771
599 if (recalc_x) 772 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 773 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 774 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 775 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 776 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 777 - szHint.height - 2 * TermWin.ext_bwidth);
605 778
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 779 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 780 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 781 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 782 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 783 szHint.height));
611 return; 784 return;
612} 785}
613 786
614/*----------------------------------------------------------------------*/ 787/*----------------------------------------------------------------------*/
615/* 788/*
616 * Tell the teletype handler what size the window is. 789 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 790 * Called after a window size change.
618 */ 791 */
619/* EXTPROTO */
620void 792void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 793rxvt_term::tt_winch ()
622{ 794{
623 struct winsize ws; 795 struct winsize ws;
624 796
625 if (fd < 0) 797 if (cmd_fd < 0)
626 return; 798 return;
799
627 ws.ws_col = col; 800 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 801 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 802 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 803#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 804 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 805#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 806 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 807 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 808# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 809 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 810 kill (cmd_pid, SIGWINCH);
639# endif 811# endif
640#endif 812#endif
641} 813}
642 814
643/*----------------------------------------------------------------------*/ 815/*----------------------------------------------------------------------*/
644/* rxvt_change_font() - Switch to a new font */ 816/* rxvt_change_font () - Switch to a new font */
645/* 817/*
646 * init = 1 - initialize 818 * init = 1 - initialize
647 * 819 *
648 * fontname == FONT_UP - switch to bigger font 820 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 821 * fontname == FONT_DN - switch to smaller font
650 */ 822 */
651/* EXTPROTO */ 823bool
652void
653rxvt_change_font(pR_ int init, const char *fontname) 824rxvt_term::change_font (const char *fontname)
654{ 825{
655} 826 if (fontname == FONT_UP)
827 {
828 // TODO
829 }
830 else if (fontname == FONT_DN)
831 {
832 // TODO
833 }
834 else
835 {
836 rxvt_fontset *fs = new rxvt_fontset (this);
656 837
657/* INTPROTO */ 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
658void 839 {
840 delete TermWin.fontset;
841 TermWin.fontset = fs;
842 TermWin.fwidth = fs->base_font ()->width;
843 TermWin.fheight = fs->base_font ()->height;
844 TermWin.fbase = fs->base_font ()->ascent;
845
846 if (TermWin.parent[0])
847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
852
853 return true;
854 }
855 }
856
857 return false;
858}
859
860bool
659rxvt_font_up_down(pR_ int n, int direction) 861rxvt_term::font_up_down (int n, int direction)
660{ 862{
863 return false;
661} 864}
662 865
663/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 869void
668rxvt_set_title(pR_ const char *str) 870rxvt_term::set_title (const char *str)
669{ 871{
670#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
672#else 874#else
673 char *name; 875 char *name;
674 876
675 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
676 name = NULL; 878 name = NULL;
879
677 if (name == NULL || STRCMP(name, str)) 880 if (name == NULL || STRCMP (name, str))
678 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
679 if (name) 883 if (name)
680 XFree(name); 884 XFree (name);
681#endif 885#endif
682} 886}
683 887
684/* EXTPROTO */
685void 888void
686rxvt_set_iconName(pR_ const char *str) 889rxvt_term::set_icon_name (const char *str)
687{ 890{
688#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
689 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
690#else 893#else
691 char *name; 894 char *name;
692 895
693 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
694 name = NULL; 897 name = NULL;
898
695 if (name == NULL || STRCMP(name, str)) 899 if (name == NULL || STRCMP (name, str))
696 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
697 if (name) 902 if (name)
698 XFree(name); 903 XFree (name);
699#endif 904#endif
700} 905}
701 906
702#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
703/* EXTPROTO */
704void 908void
705rxvt_set_window_color(pR_ int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
706{ 910{
707 rxvt_color xcol; 911 rxvt_color xcol;
708 int i; 912 int i;
709 913
710 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
711 return; 915 return;
712 916
713/* handle color aliases */ 917 /* handle color aliases */
714 if (isdigit(*color)) { 918 if (isdigit (*color))
919 {
715 i = atoi(color); 920 i = atoi (color);
921 if (i >= 8 && i <= 15)
716 if (i >= 8 && i <= 15) { /* bright colors */ 922 { /* bright colors */
717 i -= 8; 923 i -= 8;
718# ifndef NO_BRIGHTCOLOR 924# ifndef NO_BRIGHTCOLOR
719 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 925 PixColors[idx] = PixColors[minBrightCOLOR + i];
720 SET_PIXCOLOR(R, idx); 926 SET_PIXCOLOR (idx);
721 goto Done; 927 goto Done;
722# endif 928# endif
929
723 } 930 }
724 if (i >= 0 && i <= 7) { /* normal colors */ 931 if (i >= 0 && i <= 7)
932 { /* normal colors */
725 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 933 PixColors[idx] = PixColors[minCOLOR + i];
726 SET_PIXCOLOR(R, idx); 934 SET_PIXCOLOR (idx);
727 goto Done; 935 goto Done;
728 } 936 }
729 } 937 }
730 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 938 if (!rXParseAllocColor (& xcol, color))
731 return; 939 return;
732/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 940 /* XStoreColor (display->display, XCMAP, XColor*); */
733 941
734/* 942 /*
735 * FIXME: should free colors here, but no idea how to do it so instead, 943 * FIXME: should free colors here, but no idea how to do it so instead,
736 * so just keep gobbling up the colormap 944 * so just keep gobbling up the colormap
737 */ 945 */
738# if 0 946# if 0
739 for (i = Color_Black; i <= Color_White; i++) 947 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[idx] == R->PixColors[i]) 948 if (PixColors[idx] == PixColors[i])
741 break; 949 break;
742 if (i > Color_White) { 950 if (i > Color_White)
951 {
743 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 952 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
744 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 953 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
745 DisplayPlanes(R->Xdisplay, Xscreen)); 954 DisplayPlanes (display->display, display->screen));
746 } 955 }
747# endif 956# endif
748 957
749 R->PixColors[idx] = xcol; 958 PixColors[idx] = xcol;
750 SET_PIXCOLOR(R, idx); 959 SET_PIXCOLOR (idx);
751 960
752/* XSetWindowAttributes attr; */ 961 /* XSetWindowAttributes attr; */
753/* Cursor cursor; */ 962 /* Cursor cursor; */
754 Done: 963Done:
755 if (idx == Color_bg && !(R->Options & Opt_transparent)) 964 if (idx == Color_bg && ! (Options & Opt_transparent))
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 965 XSetWindowBackground (display->display, TermWin.vt,
757 R->PixColors[Color_bg]); 966 PixColors[Color_bg]);
758 967
759/* handle Color_BD, scrollbar background, etc. */ 968 /* handle Color_BD, scrollbar background, etc. */
760 969
761 rxvt_set_colorfgbg(aR); 970 set_colorfgbg ();
762 rxvt_recolour_cursor(aR); 971 recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 972 /* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 973 scr_poweron ();
765} 974}
766 975
767#else 976#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 977# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 978#endif /* XTERM_COLOR_CHANGE */
770 979
771/* EXTPROTO */
772void 980void
773rxvt_recolour_cursor(pR) 981rxvt_term::recolour_cursor ()
774{ 982{
775 rxvt_color xcol[2];
776
777#if TODO 983#if TODO
984 rxvt_color xcol[2];
985
778 xcol[0] = R->PixColors[Color_pointer]; 986 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 987 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 988 XQueryColors (display->display, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 989 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
782#endif 990#endif
783} 991}
784 992
785/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
786/* 994/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 996 */
789/* INTPROTO */
790void 997void
791rxvt_set_colorfgbg(pR) 998rxvt_term::set_colorfgbg ()
792{ 999{
793 unsigned int i; 1000 unsigned int i;
794 const char *xpmb = "\0"; 1001 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
796 1003
797 R->env_colorfgbg = 1004 env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1005 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 1006 STRCPY (fstr, "default");
800 STRCPY(bstr, "default"); 1007 STRCPY (bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1009 if (PixColors[Color_fg] == PixColors[i])
1010 {
803 sprintf(fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", (i - Color_Black));
804 break; 1012 break;
805 } 1013 }
806 for (i = Color_Black; i <= Color_White; i++) 1014 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1015 if (PixColors[Color_bg] == PixColors[i])
1016 {
808 sprintf(bstr, "%d", (i - Color_Black)); 1017 sprintf (bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 1018#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 1019 xpmb = "default;";
811#endif 1020#endif
812 break; 1021 break;
813 } 1022 }
1023
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
815 putenv(R->env_colorfgbg);
816 1025
817#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
818 R->colorfgbg = DEFAULT_RSTYLE; 1027 colorfgbg = DEFAULT_RSTYLE;
819 for (i = minCOLOR; i <= maxCOLOR; i++) { 1028 for (i = minCOLOR; i <= maxCOLOR; i++)
1029 {
820 if (R->PixColors[Color_fg] == R->PixColors[i]) 1030 if (PixColors[Color_fg] == PixColors[i])
821 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 1031 colorfgbg = SET_FGCOLOR (colorfgbg, i);
822 if (R->PixColors[Color_bg] == R->PixColors[i]) 1032 if (PixColors[Color_bg] == PixColors[i])
823 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 1033 colorfgbg = SET_BGCOLOR (colorfgbg, i);
824 } 1034 }
825#endif 1035#endif
826} 1036}
827 1037
828/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
829/* 1039/*
830 * Colour determination for low colour displays, routine from 1040 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl> 1041 * Hans de Goede <hans@highrise.nl>
832 */ 1042 */
833 1043
834/* EXTPROTO */
835int 1044int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 1046{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 1047 if (!screen_in_out->set (display, colour))
841 rxvt_print_error("can't allocate colour: %s", colour); 1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
842 return false; 1050 return false;
843 } 1051 }
844 1052
845 return true; 1053 return true;
846} 1054}
847 1055
848/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 1058 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 1059void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1060rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 1061{
856 int fix_screen; 1062 int fix_screen;
857 1063
858#ifdef SMART_RESIZE 1064#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 1065 int old_width = szHint.width, old_height = szHint.height;
860#endif 1066#endif
861 1067
862 rxvt_window_calc(aR_ width, height); 1068 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1069 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 1070 if (!ignoreparent)
1071 {
865#ifdef SMART_RESIZE 1072#ifdef SMART_RESIZE
866/* 1073 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1074 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 1075 * reposition window on resize depending on placement on screen
869 */ 1076 */
870 int x, y, x1, y1; 1077 int x, y, x1, y1;
871 int dx, dy; 1078 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1079 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 1080 Window unused_cr;
874 1081
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1082 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
876 0, 0, &x, &y, &unused_cr); 1083 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1084 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1085 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 1086 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 1087 * if display->root isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 1088 * our position for handles and decorations. Counter it
882 */ 1089 */
883 if (x1 != x || y1 != y) { 1090 if (x1 != x || y1 != y)
1091 {
884 x -= x1; 1092 x -= x1;
885 y -= y1; 1093 y -= y1;
886 } 1094 }
887 1095
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1096 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1097 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
890 dx = old_width - R->szHint.width; 1098 dx = old_width - szHint.width;
891 dy = old_height - R->szHint.height; 1099 dy = old_height - szHint.height;
892 1100
893 /* Check position of the center of the window */ 1101 /* Check position of the center of the window */
894 if (x < x1) /* left half */ 1102 if (x < x1) /* left half */
895 dx = 0; 1103 dx = 0;
896 else if (x == x1) /* exact center */ 1104 else if (x == x1) /* exact center */
897 dx /= 2; 1105 dx /= 2;
898 if (y < y1) /* top half */ 1106 if (y < y1) /* top half */
899 dy = 0; 1107 dy = 0;
900 else if (y == y1) /* exact center */ 1108 else if (y == y1) /* exact center */
901 dy /= 2; 1109 dy /= 2;
902 1110
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1111 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height); 1112 szHint.width, szHint.height);
905#else 1113#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1114 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
907 R->szHint.height); 1115 szHint.height);
908#endif 1116#endif
909 }
910 1117
1118 }
1119
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 1120 fix_screen = (TermWin.ncol != prev_ncol
912 || R->TermWin.nrow != R->prev_nrow); 1121 || TermWin.nrow != prev_nrow);
1122
913 if (fix_screen || width != R->old_width || height != R->old_height) { 1123 if (fix_screen || width != old_width || height != old_height)
1124 {
914 if (scrollbar_visible(R)) { 1125 if (scrollbar_visible ())
1126 {
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1127 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
916 0, scrollbar_TotalWidth(), R->szHint.height); 1128 0, scrollbar_TotalWidth (), szHint.height);
917 rxvt_Resize_scrollBar(aR); 1129 resize_scrollbar ();
918 } 1130 }
1131
919 if (menubar_visible(R)) 1132 if (menubar_visible ())
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1133 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1135
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(), 1137 window_vt_y, TermWin_TotalWidth (),
924 TermWin_TotalHeight()); 1138 TermWin_TotalHeight ());
925#ifdef RXVT_GRAPHICS 1139 scr_clear (height != old_height);
926 if (R->old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
928 R->old_height - R->szHint.base_height);
929#endif
930 rxvt_scr_clear(aR);
931#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR); 1141 resize_pixmap ();
933#endif 1142#endif
934 }
935 1143
1144 }
1145
936 if (fix_screen || R->old_height == 0) { 1146 if (fix_screen || old_height == 0)
1147 {
937 int curr_screen = -1; 1148 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol; 1149 int old_ncol = prev_ncol;
939 1150
940 /* scr_reset only works on the primary screen */ 1151 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */ 1152 if (old_height) /* this is not the first time through */
1153 {
1154 unsigned int ncol = TermWin.ncol;
1155 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1156 curr_screen = scr_change_screen (PRIMARY);
943 rxvt_scr_reset(aR); 1157 TermWin.ncol = ncol;
944 if (curr_screen >= 0) { /* this is not the first time through */
945 rxvt_scr_change_screen(aR_ curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
947 } 1158 }
948 }
949 1159
1160 scr_reset ();
1161
1162 if (curr_screen >= 0) /* this is not the first time through */
1163 {
1164 scr_change_screen (curr_screen);
1165 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1166 }
1167 }
1168
950 R->old_width = R->szHint.width; 1169 old_width = szHint.width;
951 R->old_height = R->szHint.height; 1170 old_height = szHint.height;
952 1171
953#ifdef USE_XIM 1172#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 1173 IMSetStatusPosition ();
955#endif 1174#endif
956} 1175}
957 1176
958/* 1177/*
959 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 1179 * good for toggling 80/132 columns
961 */ 1180 */
962/* EXTPROTO */
963void 1181void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1182rxvt_term::set_widthheight (unsigned int width, unsigned int height)
965{ 1183{
966 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
967 1185
968 if (width == 0 || height == 0) { 1186 if (width == 0 || height == 0)
1187 {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1188 XGetWindowAttributes (display->display, display->root, &wattr);
970 if (width == 0) 1189 if (width == 0)
971 width = wattr.width - R->szHint.base_width; 1190 width = wattr.width - szHint.base_width;
972 if (height == 0) 1191 if (height == 0)
973 height = wattr.height - R->szHint.base_height; 1192 height = wattr.height - szHint.base_height;
974 } 1193 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 1194 if (width != TermWin.width || height != TermWin.height)
1195 {
976 width += R->szHint.base_width; 1196 width += szHint.base_width;
977 height += R->szHint.base_height; 1197 height += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1198 resize_all_windows (width, height, 0);
979 } 1199 }
980} 1200}
981 1201
982/* -------------------------------------------------------------------- * 1202/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1203 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1204 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1205#ifdef USE_XIM
986/* INTPROTO */ 1206
987void 1207void
988rxvt_setSize(pR_ XRectangle * size) 1208rxvt_term::im_set_size (XRectangle *size)
989{ 1209{
990 size->x = R->TermWin.int_bwidth; 1210 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1211 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1212 size->width = Width2Pixel (TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1213 size->height = Height2Pixel (TermWin.nrow);
994} 1214}
995 1215
996/* INTPROTO */
997void 1216void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1217rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
999{ 1218{
1000 *fg = R->PixColors[Color_fg]; 1219 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1220 *bg = PixColors[Color_bg];
1002} 1221}
1003 1222
1004/* Checking whether input method is running. */ 1223/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1224bool
1007rxvt_IMisRunning(pR) 1225rxvt_term::IMisRunning ()
1008{ 1226{
1009 char *p; 1227 char *p;
1010 Atom atom; 1228 Atom atom;
1011 Window win; 1229 Window win;
1012 char server[IMBUFSIZ]; 1230 char server[IMBUFSIZ];
1013 1231
1014/* get current locale modifier */ 1232 /* get current locale modifier */
1015 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1233 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1234 {
1016 STRCPY(server, "@server="); 1235 STRCPY (server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1236 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1237 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1238 *p = '\0';
1020 1239
1021 atom = XInternAtom(R->Xdisplay, server, False); 1240 atom = XInternAtom (display->display, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1241 win = XGetSelectionOwner (display->display, atom);
1023 if (win != None) 1242 if (win != None)
1024 return True; 1243 return True;
1025 } 1244 }
1026 return False; 1245 return False;
1027} 1246}
1028 1247
1029/* EXTPROTO */
1030void 1248void
1031rxvt_IMSendSpot(pR) 1249rxvt_term::IMSendSpot ()
1032{ 1250{
1033 XPoint spot; 1251 XPoint spot;
1034 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1035 1253
1036 if (R->Input_Context == NULL 1254 if (Input_Context == NULL
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1255 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1038 || !(R->event_type == KeyPress 1256 || ! (event_type == KeyPress
1039 || R->event_type == Expose 1257 || event_type == Expose
1040 || R->event_type == NoExpose 1258 || event_type == NoExpose
1041 || R->event_type == SelectionNotify 1259 || event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1260 || event_type == ButtonRelease || event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR)) 1261 || !IMisRunning ())
1044 return; 1262 return;
1045 1263
1046 rxvt_setPosition(aR_ & spot); 1264 im_set_position (&spot);
1047 1265
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1266 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1267 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1268 XFree (preedit_attr);
1051} 1269}
1052 1270
1053/* EXTPROTO */
1054void 1271void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1272rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect) 1273 XRectangle * needed_rect)
1069{ 1274{
1070 int mbh, vtx = 0; 1275 int mbh, vtx = 0;
1071 1276
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1277 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth(); 1278 vtx = scrollbar_TotalWidth ();
1279
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1280 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1075 mbh -= R->TermWin.lineSpace; 1281 mbh -= TermWin.lineSpace;
1076 1282
1077 preedit_rect->x = needed_rect->width + vtx; 1283 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1284 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1079 1285
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1286 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1); 1287 preedit_rect->height = Height2Pixel (1);
1083 1288
1084 status_rect->x = vtx; 1289 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1290 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1086 1291
1087 status_rect->width = needed_rect->width ? needed_rect->width 1292 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1); 1293 status_rect->height = Height2Pixel (1);
1090} 1294}
1091 1295
1092/* ARGSUSED */
1093/* INTPROTO */
1094void 1296void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1297rxvt_term::im_destroy ()
1096 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused)))
1098{ 1298{
1099 dR; 1299 if (Input_Context)
1100 1300 {
1301 XDestroyIC (Input_Context);
1101 R->Input_Context = NULL; 1302 Input_Context = NULL;
1102/* To avoid Segmentation Fault in C locale: Solaris only? */ 1303 }
1103 if (STRCMP(R->locale, "C"))
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL);
1106}
1107 1304
1108/* 1305 if (input_method)
1109 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't
1111 * use the first argument - need to update this to be nice for
1112 * both types via some sort of configure detection
1113 */
1114/* ARGSUSED */
1115/* EXTPROTO */
1116void
1117rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused)))
1121{
1122 dR;
1123 int i, found, had_im;
1124 const char *p;
1125 char **s;
1126 char buf[IMBUFSIZ];
1127
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context)
1130 return;
1131
1132 found = had_im = 0;
1133 p = R->rs[Rs_inputMethod];
1134 if (p && *p) {
1135 had_im = 1;
1136 s = rxvt_splitcommastring(p);
1137 for (i = 0; s[i]; i++) {
1138 if (*s[i]) {
1139 STRCPY(buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1142 && (rxvt_IM_get_IC(aR) == True)) {
1143 found = 1;
1144 break;
1145 }
1146 }
1147 }
1148 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 } 1306 {
1152 if (found) 1307 display->put_xim (input_method);
1153 return; 1308 input_method = 0;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 } 1309 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165} 1310}
1166 1311
1167/* 1312/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1313 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1314 * open a suitable preedit type
1170 */ 1315 */
1171/* INTPROTO */
1172Bool 1316bool
1173rxvt_IM_get_IC(pR) 1317rxvt_term::IM_get_IC (const char *modifiers)
1174{ 1318{
1175 int i, j, found; 1319 int i, j, found;
1176 XIM xim; 1320 XIM xim;
1177 XPoint spot; 1321 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1322 XRectangle rect, status_rect, needed_rect;
1179 unsigned long fg, bg; 1323 unsigned long fg, bg;
1180 const char *p; 1324 const char *p;
1181 char **s; 1325 char **s;
1182 XIMStyles *xim_styles; 1326 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1327 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback;
1185 1328
1329 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1330 return false;
1331
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1332 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1333 input_method = display->get_xim (locale, modifiers);
1188 if (xim == NULL) 1334 if (input_method == NULL)
1189 return False; 1335 return false;
1190 1336
1337 xim = input_method->xim;
1338
1191 xim_styles = NULL; 1339 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1340 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1341 || !xim_styles || !xim_styles->count_styles)
1194 XCloseIM(xim); 1342 {
1343 display->put_xim (input_method);
1195 return False; 1344 return false;
1196 } 1345 }
1197 1346
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1347 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1199 : "OverTheSpot,OffTheSpot,Root";
1200 s = rxvt_splitcommastring(p); 1348 s = rxvt_splitcommastring (p);
1201 for (i = found = 0; !found && s[i]; i++) { 1349 for (i = found = 0; !found && s[i]; i++)
1350 {
1202 if (!STRCMP(s[i], "OverTheSpot")) 1351 if (!STRCMP (s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1352 input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot")) 1353 else if (!STRCMP (s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea); 1354 input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root")) 1355 else if (!STRCMP (s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1356 input_style = (XIMPreeditNothing | XIMStatusNothing);
1208 1357
1209 for (j = 0; j < xim_styles->count_styles; j++) 1358 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) { 1359 if (input_style == xim_styles->supported_styles[j])
1360 {
1211 found = 1; 1361 found = 1;
1362 break;
1363 }
1364 }
1365
1366 for (i = 0; s[i]; i++)
1367 free (s[i]);
1368
1369 free (s);
1370 XFree (xim_styles);
1371
1372 if (!found)
1373 {
1374 display->put_xim (input_method);
1375 return false;
1376 }
1377
1378 preedit_attr = status_attr = NULL;
1379
1380 if (input_style & XIMPreeditPosition)
1381 {
1382 im_set_size (&rect);
1383 im_set_position (&spot);
1384 im_set_color (&fg, &bg);
1385
1386 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1387 XNSpotLocation, &spot,
1388 XNForeground, fg, XNBackground, bg,
1389 //XNFontSet, TermWin.fontset,
1390 NULL);
1391 }
1392 else if (input_style & XIMPreeditArea)
1393 {
1394 im_set_color (&fg, &bg);
1395
1396 /*
1397 * The necessary width of preedit area is unknown
1398 * until create input context.
1399 */
1400 needed_rect.width = 0;
1401
1402 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1403
1404 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1405 XNForeground, fg, XNBackground, bg,
1406 //XNFontSet, TermWin.fontset,
1407 NULL);
1408 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1409 XNForeground, fg, XNBackground, bg,
1410 //XNFontSet, TermWin.fontset,
1411 NULL);
1412 }
1413
1414 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1415 XNClientWindow, TermWin.parent[0],
1416 XNFocusWindow, TermWin.parent[0],
1417 preedit_attr ? XNPreeditAttributes : NULL,
1418 preedit_attr,
1419 status_attr ? XNStatusAttributes : NULL,
1420 status_attr, NULL);
1421 if (preedit_attr) XFree (preedit_attr);
1422 if (status_attr) XFree (status_attr);
1423
1424 if (Input_Context == NULL)
1425 {
1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1427 display->put_xim (input_method);
1428 return false;
1429 }
1430
1431 if (input_style & XIMPreeditArea)
1432 IMSetStatusPosition ();
1433
1434 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1435 return true;
1436}
1437
1438void
1439rxvt_term::im_cb ()
1440{
1441 int i, found, had_im;
1442 const char *p;
1443 char **s;
1444 char buf[IMBUFSIZ];
1445
1446 im_destroy ();
1447
1448 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1449 if (Input_Context)
1450 return;
1451
1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1453 if (rs[Rs_imLocale])
1454 SET_LOCALE (rs[Rs_imLocale]);
1455#endif
1456
1457 p = rs[Rs_inputMethod];
1458 if (p && *p)
1459 {
1460 bool found = false;
1461
1462 s = rxvt_splitcommastring (p);
1463 for (i = 0; s[i]; i++)
1464 {
1465 if (*s[i])
1466 {
1467 STRCPY (buf, "@im=");
1468 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1469 if (IM_get_IC (buf))
1470 {
1471 found = true;
1212 break; 1472 break;
1473 }
1213 } 1474 }
1214 } 1475 }
1215 for (i = 0; s[i]; i++) 1476 for (i = 0; s[i]; i++)
1216 free(s[i]); 1477 free (s[i]);
1217 free(s); 1478 free (s);
1218 XFree(xim_styles);
1219 1479
1220 if (!found) { 1480 if (found)
1221 XCloseIM(xim); 1481 goto done;
1222 return False;
1223 } 1482 }
1224 1483
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1484 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC (""))
1486 goto done;
1226 1487
1227/* XXX: not sure why we need this (as well as IC one below) */ 1488 /* try with no modifiers base IF the user didn't specify an IM */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1489 if (IM_get_IC ("@im=none"))
1490 goto done;
1229 1491
1230 preedit_attr = status_attr = NULL; 1492done:
1231 1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1232 if (R->input_style & XIMPreeditPosition) { 1494 if (rs[Rs_imLocale])
1233 rxvt_setSize(aR_ & rect); 1495 SET_LOCALE (locale);
1234 rxvt_setPosition(aR_ & spot); 1496#endif
1235 rxvt_setColor(aR_ & fg, &bg);
1236
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset,
1241 NULL);
1242 } else if (R->input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg);
1244
1245 /*
1246 * The necessary width of preedit area is unknown
1247 * until create input context.
1248 */
1249 needed_rect.width = 0;
1250
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1252
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset,
1256 NULL);
1257 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1258 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, R->TermWin.fontset,
1260 NULL);
1261 }
1262 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1263 XNClientWindow, R->TermWin.parent[0],
1264 XNFocusWindow, R->TermWin.parent[0],
1265 XNDestroyCallback, &ximcallback,
1266 preedit_attr ? XNPreeditAttributes : NULL,
1267 preedit_attr,
1268 status_attr ? XNStatusAttributes : NULL,
1269 status_attr, NULL);
1270 if (preedit_attr)
1271 XFree(preedit_attr);
1272 if (status_attr)
1273 XFree(status_attr);
1274 if (R->Input_Context == NULL) {
1275 rxvt_print_error("failed to create input context");
1276 XCloseIM(xim);
1277 return False;
1278 }
1279 if (R->input_style & XIMPreeditArea)
1280 rxvt_IMSetStatusPosition(aR);
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True;
1283} 1497}
1284 1498
1285/* EXTPROTO */
1286void 1499void
1287rxvt_IMSetStatusPosition(pR) 1500rxvt_term::IMSetStatusPosition ()
1288{ 1501{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1502 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1503 XVaNestedList preedit_attr, status_attr;
1291 1504
1292 if (R->Input_Context == NULL 1505 if (Input_Context == NULL
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1506 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1507 || !IMisRunning ())
1295 return; 1508 return;
1296 1509
1297/* Getting the necessary width of preedit area */ 1510 /* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1511 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1512 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1513 XFree (status_attr);
1301 1514
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1515 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1303 1516
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1517 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1518 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1306 1519
1307 XSetICValues(R->Input_Context, 1520 XSetICValues (Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1521 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1522 XNStatusAttributes, status_attr, NULL);
1310 1523
1311 XFree(preedit_attr); 1524 XFree (preedit_attr);
1312 XFree(status_attr); 1525 XFree (status_attr);
1313} 1526}
1314#endif /* USE_XIM */ 1527#endif /* USE_XIM */
1315 1528
1316/*----------------------------------------------------------------------*/ 1529/*----------------------------------------------------------------------*/
1317rxvt_t rxvt_current_term; 1530rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines