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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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