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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines