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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.157 by root, Tue Jan 3 18:11:34 2006 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring>
48
49vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
50 52
51static char curlocale[128]; 53static char curlocale[128], savelocale[128];
52 54
53bool 55bool
54rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
55{ 57{
56 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 59 return false;
58 60
59 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
61 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
62} 77}
63 78
64#if ENABLE_COMBINING 79#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
66 81
… …
122 137
123 return len; 138 return len;
124 139
125} 140}
126#endif 141#endif
127
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 memset (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142 142
143rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
144 : 144 :
145#if TRANSPARENT 145#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
… …
181 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
182{ 182{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 184
185 termlist.push_back (this); 185 termlist.push_back (this);
186}
187 186
188rxvt_term::~rxvt_term () 187#ifdef KEYSYM_RESOURCE
189{ 188 keyboard = new keyboard_manager;
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191 189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif
193}
194
195// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit
197void rxvt_term::emergency_cleanup ()
198{
192 if (cmd_pid) 199 if (cmd_pid)
193 kill (-cmd_pid, SIGHUP); 200 kill (-cmd_pid, SIGHUP);
194 201
195 pty.put ();
196
197#ifdef UTMP_SUPPORT 202#ifdef UTMP_SUPPORT
198 privileged_utmp (RESTORE); 203 privileged_utmp (RESTORE);
199#endif 204#endif
200 205
206 pty.put ();
207}
208
209rxvt_term::~rxvt_term ()
210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this));
214
215 emergency_cleanup ();
216
217#if ENABLE_STYLES
218 for (int i = RS_styleCount; --i; )
219 if (fontset[i] != fontset[0])
220 delete fontset[i];
221#endif
201 delete TermWin.fontset; 222 delete fontset[0];
202 223
203 if (display) 224 if (display)
204 { 225 {
226 dDisp;
227
205 selection_clear (); 228 selection_clear ();
206 229
207#ifdef USE_XIM 230#ifdef USE_XIM
208 im_destroy (); 231 im_destroy ();
209#endif 232#endif
210#ifdef MENUBAR 233#ifdef MENUBAR
211 if (menubarGC) XFreeGC (display->display, menubarGC); 234 if (menubarGC) XFreeGC (disp, menubarGC);
212#endif 235#endif
213#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
214 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
215 if (ShadowGC) XFreeGC (display->display, ShadowGC); 238 if (ShadowGC) XFreeGC (disp, ShadowGC);
216#endif 239#endif
217#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
218 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
219#endif 242#endif
220#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
221 if (blackGC) XFreeGC (display->display, blackGC); 244 if (blackGC) XFreeGC (disp, blackGC);
222 if (whiteGC) XFreeGC (display->display, whiteGC); 245 if (whiteGC) XFreeGC (disp, whiteGC);
223 if (grayGC) XFreeGC (display->display, grayGC); 246 if (grayGC) XFreeGC (disp, grayGC);
224 if (darkGC) XFreeGC (display->display, darkGC); 247 if (darkGC) XFreeGC (disp, darkGC);
225 if (stippleGC) XFreeGC (display->display, stippleGC); 248 if (stippleGC) XFreeGC (disp, stippleGC);
226 if (dimple) XFreePixmap (display->display, dimple); 249 if (dimple) XFreePixmap (disp, dimple);
227 if (upArrow) XFreePixmap (display->display, upArrow); 250 if (upArrow) XFreePixmap (disp, upArrow);
228 if (downArrow) XFreePixmap (display->display, downArrow); 251 if (downArrow) XFreePixmap (disp, downArrow);
229 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 252 if (upArrowHi) XFreePixmap (disp, upArrowHi);
230 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 253 if (downArrowHi) XFreePixmap (disp, downArrowHi);
231#endif 254#endif
232#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
233 if (topShadowGC) XFreeGC (display->display, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
234 if (botShadowGC) XFreeGC (display->display, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
235 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
236#endif 259#endif
237 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
238 261
239#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
240 delete menuBar.drawable; 263 delete menuBar.drawable;
241 //if (menuBar.win) 264 //if (menuBar.win)
242 // XDestroyWindow (display->display, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
243#endif 266#endif
244 delete TermWin.drawable; 267 delete drawable;
245 // destroy all windows 268 // destroy all windows
246 if (TermWin.parent[0]) 269 if (parent[0])
247 XDestroyWindow (display->display, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
248 } 271 }
249 272
250 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
251 274
252 delete pix_colors_focused; 275 delete pix_colors_focused;
253#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
254 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
255#endif 278#endif
256 279
257 displays.put (display); 280 displays.put (display);
258 281
259 scr_release (); 282 scr_release ();
260 283
261 /* clear all resources */ 284 /* clear all resources */
262 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
263 free (allocated[i]); 286 free (allocated [i]);
264 287
265 free (selection.text); 288 free (selection.text);
266 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
267 free (env_windowid); 290 free (env_windowid);
268 free (env_display); 291 free (env_display);
269 free (env_term); 292 free (env_term);
270 free (env_colorfgbg); 293 free (env_colorfgbg);
271 free (locale); 294 free (locale);
272#if 0 295 free (v_buffer);
273 free (codeset); 296 free (incr_buf);
274#endif
275 297
276 delete envv; 298 delete envv;
277 delete argv; 299 delete argv;
300
301#ifdef KEYSYM_RESOURCE
302 delete keyboard;
303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
278} 313}
279 314
280void 315void
281rxvt_term::destroy () 316rxvt_term::destroy ()
282{ 317{
… …
334 369
335 delete this; 370 delete this;
336} 371}
337 372
338/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
339/* rxvt_init () */ 374/*
375 * Exit gracefully, clearing the utmp entry and restoring tty attributes
376 * TODO: if debugging, this should free up any known resources if we can
377 */
378static XErrorHandler old_xerror_handler;
379
380static void
381rxvt_emergency_cleanup ()
382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup ();
385}
386
387#if ENABLE_FRILLS
388static void
389print_x_error (Display *dpy, XErrorEvent *event)
390{
391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ];
393 char number[32];
394 char *mtype = "XlibMessage";
395 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
396 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
397 rxvt_warn ("An X Error occured, trying to continue after report.\n");
398 rxvt_warn ("%s: %s\n", mesg, buffer);
399 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
401 sprintf(number, "%d", event->request_code);
402 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
403 rxvt_warn ("(which is %s)\n", buffer);
404 if (event->request_code >= 128) {
405 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
406 mesg, BUFSIZ);
407 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
408 }
409 if ((event->error_code == BadWindow) ||
410 (event->error_code == BadPixmap) ||
411 (event->error_code == BadCursor) ||
412 (event->error_code == BadFont) ||
413 (event->error_code == BadDrawable) ||
414 (event->error_code == BadColor) ||
415 (event->error_code == BadGC) ||
416 (event->error_code == BadIDChoice) ||
417 (event->error_code == BadValue) ||
418 (event->error_code == BadAtom)) {
419 if (event->error_code == BadValue)
420 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
421 mesg, BUFSIZ);
422 else if (event->error_code == BadAtom)
423 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
424 mesg, BUFSIZ);
425 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433}
434#endif
435
436int
437rxvt_xerror_handler (Display *display, XErrorEvent *event)
438{
439 if (GET_R->allowedxerror == -1)
440 GET_R->allowedxerror = event->error_code;
441 else
442 {
443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue
445#if ENABLE_FRILLS
446 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif
450 }
451
452 return 0;
453}
454
455int
456rxvt_xioerror_handler (Display *display)
457{
458 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
459 DisplayString (display));
460 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE);
462}
463
464/*----------------------------------------------------------------------*/
340bool 465bool
341rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
342{ 467{
343 SET_R (this); 468 SET_R (this);
344 469
470 set_locale ("");
471
345 if (!init_vars ()) 472 if (!init_vars ())
346 return false; 473 return false;
347 474
348 init_secondary (); 475 init_secondary ();
349 476
350 const char **cmd_argv = init_resources (argc, argv); 477 const char **cmd_argv = init_resources (argc, argv);
351 478
352 set_locale (""); 479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done ();
481#endif
353 482
354#if MENUBAR_MAX 483#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
356#endif 485#endif
357#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
358 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
359 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
360#endif 489#endif
361 490
491#if ENABLE_PERL
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
497#endif
498
362 create_windows (argc, argv); 499 create_windows (argc, argv);
363 500
501 dDisp;
502
364 init_xlocale (); 503 init_xlocale ();
365 504
366 scr_reset (); /* initialize screen */ 505 scr_reset (); /* initialize screen */
367 506
368#if 0 507#if 0
369 XSynchronize (display->display, True); 508 XSynchronize (disp, True);
370#endif 509#endif
371 510
372#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar) 512 if (OPTION (Opt_scrollBar))
374 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
375#endif 514#endif
376#if (MENUBAR_MAX) 515#if (MENUBAR_MAX)
377 if (menubar_visible ()) 516 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win); 517 XMapWindow (disp, menuBar.win);
379#endif 518#endif
380#ifdef TRANSPARENT 519#ifdef TRANSPARENT
381 if (options & Opt_transparent) 520 if (OPTION (Opt_transparent))
382 { 521 {
383 XSelectInput (display->display, display->root, PropertyChangeMask); 522 XSelectInput (disp, display->root, PropertyChangeMask);
384 check_our_parents (); 523 check_our_parents ();
385 rootwin_ev.start (display, display->root); 524 rootwin_ev.start (display, display->root);
386 } 525 }
387#endif 526#endif
388 527
389 XMapWindow (display->display, TermWin.vt); 528 XMapWindow (disp, vt);
390 XMapWindow (display->display, TermWin.parent[0]); 529 XMapWindow (disp, parent[0]);
530
531 set_colorfgbg ();
391 532
392 init_command (cmd_argv); 533 init_command (cmd_argv);
393 534
535 free (cmd_argv);
536
394 pty_ev.start (pty.pty, EVENT_READ); 537 pty_ev.start (pty.pty, EVENT_READ);
395 538
396 check_ev.start (); 539 check_ev.start ();
397 540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
542
398 return true; 543 return true;
399} 544}
400 545
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 546static struct sig_handlers
547{
548 sig_watcher sw_chld, sw_term, sw_int;
549
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /*
565 * Catch a fatal signal and tidy up before quitting
566 */
567 void
568 sig_term (sig_watcher &w)
569 {
570#ifdef DEBUG_CMD
571 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
572#endif
573 rxvt_emergency_cleanup ();
574 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum);
576 }
577
578 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term)
582 {
583 }
584} sig_handlers;
402 585
403void 586void
404rxvt_init () 587rxvt_init ()
405{ 588{
406 /* install exit handler for cleanup */
407#if 0
408#ifdef HAVE_ATEXIT
409 atexit (rxvt_clean_exit);
410#else
411#endif
412#endif
413 /* 589 /*
414 * Save and then give up any super-user privileges 590 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it. 591 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases: 592 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems 593 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems 594 * 2. chown tty on some systems
419 */ 595 */
420 rxvt_privileges (SAVE); 596 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE); 597 rxvt_privileges (IGNORE);
422 598
423 struct sigaction sa; 599 signal (SIGHUP, SIG_IGN);
600 signal (SIGPIPE, SIG_IGN);
424 601
425 sigfillset (&sa.sa_mask); 602 sig_handlers.sw_chld.start (SIGCHLD);
426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 603 sig_handlers.sw_term.start (SIGTERM);
427 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 604 sig_handlers.sw_int.start (SIGINT);
428 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
430 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
431 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
432 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
433 605
434 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
435 /* signal (SIGURG, SIG_DFL); */ 607 /* signal (SIGURG, SIG_DFL); */
436 608
437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 611 XSetIOErrorHandler (rxvt_xioerror_handler);
439}
440
441/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */
444/*
445 * Catch a SIGCHLD signal and exit if the direct child has died
446 */
447
448void rxvt_term::child_exited (int pid)
449{
450 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
451 if (pid == (*t)->cmd_pid)
452 {
453 (*t)->destroy ();
454 break;
455 }
456}
457
458/* ARGSUSED */
459/* INTPROTO */
460RETSIGTYPE
461rxvt_Child_signal (int sig __attribute__ ((unused)))
462{
463 int pid, save_errno = errno;
464
465 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
466 rxvt_term::child_exited (pid);
467
468 errno = save_errno;
469}
470
471/*
472 * Catch a fatal signal and tidy up before quitting
473 */
474/* INTPROTO */
475RETSIGTYPE
476rxvt_Exit_signal (int sig)
477{
478 signal (sig, SIG_DFL);
479#ifdef DEBUG_CMD
480 rxvt_warn ("caught signal %d, exiting.\n", sig);
481#endif
482 rxvt_clean_exit ();
483 kill (getpid (), sig);
484}
485
486/* INTPROTO */
487int
488rxvt_xerror_handler (Display *display, XErrorEvent *event)
489{
490 if (GET_R->allowedxerror == -1)
491 GET_R->allowedxerror = event->error_code;
492 else
493 {
494 old_xerror_handler (display, event);
495 GET_R->destroy ();
496 }
497
498 return 0;
499}
500
501/*----------------------------------------------------------------------*/
502/*
503 * Exit gracefully, clearing the utmp entry and restoring tty attributes
504 * TODO: if debugging, this should free up any known resources if we can
505 */
506/* INTPROTO */
507void
508rxvt_clean_exit ()
509{
510 // TODO: rxvtd should clean up all ressources
511 if (GET_R)
512 GET_R->destroy ();
513} 612}
514 613
515/* ------------------------------------------------------------------------- * 614/* ------------------------------------------------------------------------- *
516 * MEMORY ALLOCATION WRAPPERS * 615 * MEMORY ALLOCATION WRAPPERS *
517 * ------------------------------------------------------------------------- */ 616 * ------------------------------------------------------------------------- */
518/* INTPROTO */ 617void *
519void *
520rxvt_malloc (size_t size) 618rxvt_malloc (size_t size)
521{ 619{
522 void *p;
523
524 p = malloc (size); 620 void *p = malloc (size);
621
525 if (p) 622 if (!p)
526 return p;
527
528 rxvt_fatal ("memory allocation failure. aborting.\n"); 623 rxvt_fatal ("memory allocation failure. aborting.\n");
529 /* NOTREACHED */
530}
531 624
532/* INTPROTO */ 625 return p;
533void * 626}
627
628void *
534rxvt_calloc (size_t number, size_t size) 629rxvt_calloc (size_t number, size_t size)
535{ 630{
536 void *p;
537
538 p = calloc (number, size); 631 void *p = calloc (number, size);
632
539 if (p) 633 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 634 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */
544}
545 635
546/* INTPROTO */ 636 return p;
637}
638
547void * 639void *
548rxvt_realloc (void *ptr, size_t size) 640rxvt_realloc (void *ptr, size_t size)
549{ 641{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 642 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 643
557 if (p) 644 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 645 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */ 646
647 return p;
562} 648}
563 649
564/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS * 651 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
… …
618 704
619#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
620void 706void
621rxvt_term::privileged_utmp (rxvt_privaction action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
622{ 708{
623 if ((options & Opt_utmpInhibit) 709 if (OPTION (Opt_utmpInhibit)
624 || !pty.name || !*pty.name) 710 || !pty.name || !*pty.name)
625 return; 711 return;
626 712
627 rxvt_privileges (RESTORE); 713 rxvt_privileges (RESTORE);
628 714
… …
639/* 725/*
640 * window size/position calculcations for XSizeHint and other storage. 726 * window size/position calculcations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 727 * if width/height are non-zero then override calculated width/height
642 */ 728 */
643void 729void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 731{
646 short recalc_x, recalc_y; 732 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 733 int x, y, sb_w, mb_h, flags;
648 unsigned int w, h; 734 unsigned int w, h;
649 unsigned int max_width, max_height; 735 unsigned int max_width, max_height;
736 dDisp;
650 737
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 739 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 740
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 742 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 744
658 recalc_x = recalc_y = 0; 745 recalc_x = recalc_y = 0;
659 flags = 0; 746 flags = 0;
747
660 if (!parsed_geometry) 748 if (!parsed_geometry)
661 { 749 {
662 parsed_geometry = 1; 750 parsed_geometry = 1;
751
663 if (rs[Rs_geometry]) 752 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
754
665 if (flags & WidthValue) 755 if (flags & WidthValue)
666 { 756 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 758 szHint.flags |= USSize;
669 } 759 }
760
670 if (flags & HeightValue) 761 if (flags & HeightValue)
671 { 762 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 764 szHint.flags |= USSize;
674 } 765 }
766
675 if (flags & XValue) 767 if (flags & XValue)
676 { 768 {
677 szHint.x = x; 769 szHint.x = x;
678 szHint.flags |= USPosition; 770 szHint.flags |= USPosition;
771
679 if (flags & XNegative) 772 if (flags & XNegative)
680 { 773 {
681 recalc_x = 1; 774 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 775 szHint.win_gravity = NorthEastGravity;
683 } 776 }
684 } 777 }
778
685 if (flags & YValue) 779 if (flags & YValue)
686 { 780 {
687 szHint.y = y; 781 szHint.y = y;
688 szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
689 if (flags & YNegative) 784 if (flags & YNegative)
690 { 785 {
691 recalc_y = 1; 786 recalc_y = 1;
787
692 if (szHint.win_gravity == NorthEastGravity) 788 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 789 szHint.win_gravity = SouthEastGravity;
694 else 790 else
695 szHint.win_gravity = SouthWestGravity; 791 szHint.win_gravity = SouthWestGravity;
696 } 792 }
697 } 793 }
698 } 794 }
699 795
700 /* TODO: BOUNDS */ 796 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 797 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 798 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 799 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 800 max_height = MAX_ROWS * fheight;
705 801
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 802 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 803
708 sb_w = mb_h = 0; 804 sb_w = mb_h = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 805 window_vt_x = window_vt_y = int_bwidth;
710 806
711 if (scrollbar_visible ()) 807 if (scrollbar_visible ())
712 { 808 {
713 sb_w = scrollbar_TotalWidth (); 809 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 812 window_vt_x += sb_w;
717 } 813 }
718 814
719 if (menubar_visible ()) 815 if (menubar_visible ())
720 { 816 {
721 mb_h = menuBar_TotalHeight (); 817 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h; 818 szHint.base_height += mb_h;
723 window_vt_y += mb_h; 819 window_vt_y += mb_h;
724 } 820 }
725 821
726 szHint.width_inc = TermWin.fwidth; 822 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 823 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 824 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 825 szHint.min_height = szHint.base_height + szHint.height_inc;
730 826
731 if (width && width - szHint.base_width < max_width) 827 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 828 {
733 szHint.width = width; 829 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 830 width = newwidth - szHint.base_width;
735 } 831 }
736 else 832 else
737 { 833 {
738 MIN_IT (TermWin.width, max_width); 834 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 835 szHint.width = szHint.base_width + width;
740 } 836 }
741 837
742 if (height && height - szHint.base_height < max_height) 838 if (newheight && newheight - szHint.base_height < max_height)
743 { 839 {
744 szHint.height = height; 840 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 841 height = newheight - szHint.base_height;
746 } 842 }
747 else 843 else
748 { 844 {
749 MIN_IT (TermWin.height, max_height); 845 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 846 szHint.height = szHint.base_height + height;
751 } 847 }
752 848
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
755 851
756 if (recalc_x) 852 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 854 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 856
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 857 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 858 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 859 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 860 ncol, nrow, szHint.width,
767 szHint.height)); 861 szHint.height));
768 return; 862 return;
769} 863}
770 864
771/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
… …
779 if (pty.pty < 0) 873 if (pty.pty < 0)
780 return; 874 return;
781 875
782 struct winsize ws; 876 struct winsize ws;
783 877
784 ws.ws_col = TermWin.ncol; 878 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 879 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 880 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 881 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789 883
790#if 0 884#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 886 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 887 kill (-cmd_pid, SIGWINCH);
794#endif 888#endif
795} 889}
796 890
797/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 892/* set_fonts () - load and set the various fonts
799/* 893 *
800 * init = 1 - initialize 894 * init = 1 - initialize
801 * 895 *
802 * fontname == FONT_UP - switch to bigger font 896 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 897 * fontname == FONT_DN - switch to smaller font
804 */ 898 */
805bool 899bool
806rxvt_term::change_font (const char *fontname) 900rxvt_term::set_fonts ()
807{ 901{
808 if (fontname == FONT_UP)
809 {
810 // TODO
811 }
812 else if (fontname == FONT_DN)
813 {
814 // TODO
815 }
816 else
817 {
818 rxvt_fontset *fs = new rxvt_fontset (this); 902 rxvt_fontset *fs = new rxvt_fontset (this);
903 rxvt_fontprop prop;
819 904
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 905 if (!fs
906 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
907 || !fs->realize_font (1))
908 {
909 delete fs;
910 return false;
911 }
912
913#if ENABLE_STYLES
914 for (int i = RS_styleCount; --i; )
915 if (fontset[i] != fontset[0])
916 delete fontset[i];
917#endif
918
919 delete fontset[0];
920 fontset[0] = fs;
921
922 prop = (*fs)[1]->properties ();
923 prop.height += lineSpace;
924 fs->set_prop (prop);
925
926 fwidth = prop.width;
927 fheight = prop.height;
928 fbase = (*fs)[1]->ascent;
929
930 for (int style = 1; style < 4; style++)
931 {
932#if ENABLE_STYLES
933 const char *res = rs[Rs_font + style];
934
935 if (res && !*res)
936 fontset[style] = fontset[0];
937 else
821 { 938 {
822 delete TermWin.fontset; 939 fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 940 rxvt_fontprop prop2 = prop;
824 TermWin.fwidth = fs->base_font ()->width;
825 TermWin.fheight = fs->base_font ()->height;
826 TermWin.fbase = fs->base_font ()->ascent;
827 941
828 if (TermWin.parent[0]) 942 if (res)
943 prop2.weight = prop2.slant = rxvt_fontprop::unset;
944 else
829 { 945 {
830 resize_all_windows (0, 0, 0); 946 res = fontset[0]->fontdesc;
831 scr_remap_chars (); 947
832 scr_touch (true); 948 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
949 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 950 }
834 951
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 952 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 953 fs->set_prop (prop2);
837
838 return true;
839 } 954 }
955#else
956 fontset[style] = fontset[0];
957#endif
958 }
959
960 if (parent[0])
840 } 961 {
962 resize_all_windows (0, 0, 0);
963 scr_remap_chars ();
964 scr_touch (true);
965 }
841 966
842 return false; 967 return true;
843} 968}
844 969
845bool 970void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 971{
848 return false; 972 XChangeProperty (display->display, parent[0],
973 prop, XA_STRING, 8, PropModeReplace,
974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
975}
976
977void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
978{
979 wchar_t *ws = rxvt_mbstowcs (str, len);
980 char *s = rxvt_wcstoutf8 (ws);
981
982 XChangeProperty (display->display, parent[0],
983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
984 (const unsigned char *)s, strlen (s));
985
986 free (s);
987 free (ws);
849} 988}
850 989
851/*----------------------------------------------------------------------*/ 990/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 991/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 992/* xterm sequences - title, iconName, color (exptl) */
854void 993void
855rxvt_term::set_title (const char *str) 994rxvt_term::set_title (const char *str)
856{ 995{
857#ifdef SMART_WINDOW_TITLE 996 set_string_property (XA_WM_NAME, str);
858 char *name; 997#if ENABLE_EWMH
859 998 set_utf8_property (xa[XA_NET_WM_NAME], str);
860 if (!XFetchName (display->display, TermWin.parent[0], &name))
861 name = NULL;
862
863 if (name == NULL || strcmp (name, str))
864#endif
865 XStoreName (display->display, TermWin.parent[0], str);
866
867#ifdef SMART_WINDOW_TITLE
868 if (name)
869 XFree (name);
870#endif 999#endif
871} 1000}
872 1001
873void 1002void
874rxvt_term::set_icon_name (const char *str) 1003rxvt_term::set_icon_name (const char *str)
875{ 1004{
876#ifdef SMART_WINDOW_TITLE 1005 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 1006#if ENABLE_EWMH
878 1007 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
879 if (!XGetIconName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XSetIconName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 1008#endif
890} 1009}
891 1010
892#ifdef XTERM_COLOR_CHANGE 1011#ifdef XTERM_COLOR_CHANGE
893void 1012void
… …
901 1020
902 /* handle color aliases */ 1021 /* handle color aliases */
903 if (isdigit (*color)) 1022 if (isdigit (*color))
904 { 1023 {
905 i = atoi (color); 1024 i = atoi (color);
1025
906 if (i >= 8 && i <= 15) 1026 if (i >= 8 && i <= 15)
907 { /* bright colors */ 1027 { /* bright colors */
908 i -= 8; 1028 i -= 8;
909# ifndef NO_BRIGHTCOLOR 1029# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 1031 SET_PIXCOLOR (idx);
912 goto Done; 1032 goto done;
913# endif 1033# endif
914
915 } 1034 }
1035
916 if (i >= 0 && i <= 7) 1036 if (i >= 0 && i <= 7)
917 { /* normal colors */ 1037 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 1039 SET_PIXCOLOR (idx);
920 goto Done; 1040 goto done;
921 } 1041 }
922 } 1042 }
923 1043
924 if (!rXParseAllocColor (& xcol, color)) 1044 if (!rXParseAllocColor (&xcol, color))
925 return; 1045 return;
926 1046
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 1047 /* XStoreColor (display->display, display->cmap, XColor*); */
928 1048
929 /* 1049 /*
… …
945 pix_colors_focused[idx] = xcol; 1065 pix_colors_focused[idx] = xcol;
946 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
947 1067
948 /* XSetWindowAttributes attr; */ 1068 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 1069 /* Cursor cursor; */
950Done: 1070done:
1071
951#ifdef OFF_FOCUS_FADING 1072#if OFF_FOCUS_FADING
1073 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1074 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif 1075#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 1076
957 /* handle Color_BD, scrollbar background, etc. */ 1077 /*TODO: handle Color_BD, scrollbar background, etc. */
958 1078
959 set_colorfgbg ();
960 recolour_cursor (); 1079 recolour_cursor ();
961 scr_touch (true); 1080 scr_recolour ();
962} 1081}
963 1082
964#else 1083#else
965# define set_window_color (idx,color) ((void)0) 1084# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 1085#endif /* XTERM_COLOR_CHANGE */
… …
968void 1087void
969rxvt_term::recolour_cursor () 1088rxvt_term::recolour_cursor ()
970{ 1089{
971 XColor xcol[2]; 1090 XColor xcol[2];
972 1091
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 1092 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
974 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg]; 1093 ? pix_colors_focused[Color_pointer_fg]
1094 : pix_colors_focused[Color_fg];
1095 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1096 ? pix_colors_focused[Color_pointer_bg]
1097 : pix_colors_focused[Color_bg];
1098
975 XQueryColors (display->display, display->cmap, xcol, 2); 1099 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1100 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1101}
978 1102
979/*----------------------------------------------------------------------*/ 1103/*----------------------------------------------------------------------*/
… …
981 * find if fg/bg matches any of the normal (low-intensity) colors 1105 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1106 */
983void 1107void
984rxvt_term::set_colorfgbg () 1108rxvt_term::set_colorfgbg ()
985{ 1109{
986 unsigned int i; 1110 unsigned int i;
987 const char *xpmb = "\0"; 1111 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1112 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1113
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1114 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1115 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1116 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1117 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1118 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1119 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1120 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1121 break;
999 } 1122 }
1123
1000 for (i = Color_Black; i <= Color_White; i++) 1124 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1125 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1126 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1127 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1128#ifdef XPM_BACKGROUND
… …
1006#endif 1130#endif
1007 break; 1131 break;
1008 } 1132 }
1009 1133
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1134 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1011
1012#ifndef NO_BRIGHTCOLOR
1013 colorfgbg = DEFAULT_RSTYLE;
1014 for (i = minCOLOR; i <= maxCOLOR; i++)
1015 {
1016 if (pix_colors[Color_fg] == pix_colors[i])
1017 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1018 if (pix_colors[Color_bg] == pix_colors[i])
1019 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1020 }
1021#endif
1022} 1135}
1023 1136
1024/*----------------------------------------------------------------------*/ 1137/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1138
1030int 1139int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1140rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1141{
1033 if (!screen_in_out->set (display, colour)) 1142 if (!screen_in_out->set (display, colour))
… …
1041 1150
1042/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
1043 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
1044 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
1045void 1154void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1047{ 1156{
1048 int fix_screen; 1157 int fix_screen;
1049
1050#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1158 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1159 dDisp;
1053 1160
1054 window_calc (width, height); 1161 window_calc (newwidth, newheight);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1162 XSetWMNormalHints (disp, parent[0], &szHint);
1056 1163
1057 if (!ignoreparent) 1164 if (!ignoreparent)
1058 { 1165 {
1059#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
1060 /* 1167 /*
… …
1064 int x, y, x1, y1; 1171 int x, y, x1, y1;
1065 int dx, dy; 1172 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1174 Window unused_cr;
1068 1175
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1176 XTranslateCoordinates (disp, parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1180 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1181 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
1076 */ 1183 */
… …
1078 { 1185 {
1079 x -= x1; 1186 x -= x1;
1080 y -= y1; 1187 y -= y1;
1081 } 1188 }
1082 1189
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1190 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1191 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1192 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1193 dy = old_height - szHint.height;
1087 1194
1088 /* Check position of the center of the window */ 1195 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1196 if (x < x1) /* left half */
… …
1093 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
1094 dy = 0; 1201 dy = 0;
1095 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
1096 dy /= 2; 1203 dy /= 2;
1097 1204
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1206 szHint.width, szHint.height);
1100#else 1207#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1102#endif 1209#endif
1103 } 1210 }
1104 1211
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1213
1107 if (fix_screen || width != old_width || height != old_height) 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1215 {
1109 if (scrollbar_visible ()) 1216 if (scrollbar_visible ())
1110 { 1217 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1218 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1219 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1220 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1221 resize_scrollbar ();
1115 } 1222 }
1116 1223
1117 if (menubar_visible ()) 1224 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1119 window_vt_x, 0, 1226 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1121 1228
1122 XMoveResizeWindow (display->display, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1123 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 TermWin_TotalWidth (), TermWin_TotalHeight ());
1232
1125 scr_clear (); 1233 scr_clear ();
1126#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1235 resize_pixmap ();
1128#endif 1236#endif
1129 } 1237 }
… …
1134 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1135 1243
1136 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1137 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1138 { 1246 {
1139 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1140 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1141 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1142 TermWin.ncol = ncol; 1250 ncol = ocol;
1143 } 1251 }
1144 1252
1145 scr_reset (); 1253 scr_reset ();
1146 1254
1147 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1148 { 1256 {
1149 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1150 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1151 } 1259 }
1152 } 1260 }
1153 1261
1154 old_width = szHint.width; 1262 old_width = szHint.width;
1155 old_height = szHint.height; 1263 old_height = szHint.height;
1264
1265#ifdef XPM_BACKGROUND
1266 if (pixmap)
1267 scr_touch (false);
1268#endif
1156 1269
1157#ifdef USE_XIM 1270#ifdef USE_XIM
1158 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
1159#endif 1272#endif
1160} 1273}
… …
1162/* 1275/*
1163 * Set the width/height of the vt window in characters. Units are pixels. 1276 * Set the width/height of the vt window in characters. Units are pixels.
1164 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1165 */ 1278 */
1166void 1279void
1167rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1168{ 1281{
1169 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1170 1283
1171 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1172 { 1285 {
1173 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
1174 if (width == 0) 1288 if (newwidth == 0)
1175 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1176 if (height == 0) 1290 if (newheight == 0)
1177 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1178 }
1179
1180 if (width != TermWin.width || height != TermWin.height)
1181 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1182 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1183 height += szHint.base_height; 1297 newheight += szHint.base_height;
1184 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1185 } 1299 }
1186} 1300}
1187 1301
1188/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1189 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1199 1313
1200void 1314void
1201rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1202{ 1316{
1203 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1204 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1205 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1208} 1322}
1209 1323
1210void 1324void
1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect, 1326 XRectangle &status_rect,
1213 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1214{ 1328{
1215 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1216 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1219 1333
1220 status_rect.x = 0; 1334 status_rect.x = 0;
1221 status_rect.y = 0; 1335 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1336 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1223 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1224} 1338}
1225 1339
1226/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1227bool 1341bool
1228rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1252} 1366}
1253 1367
1254void 1368void
1255rxvt_term::IMSendSpot () 1369rxvt_term::IMSendSpot ()
1256{ 1370{
1257 XPoint spot; 1371 XPoint nspot;
1258 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1259 1373
1260 if (!Input_Context 1374 if (!Input_Context
1261 || !TermWin.focus 1375 || !focus
1262 || !(input_style & XIMPreeditPosition) 1376 || !(input_style & XIMPreeditPosition))
1263#if 0
1264 || !(event_type == KeyPress
1265 || event_type == Expose
1266 || event_type == NoExpose
1267 || event_type == SelectionNotify
1268 || event_type == ButtonRelease || event_type == FocusIn)
1269#endif
1270 || !IMisRunning ())
1271 return; 1377 return;
1272 1378
1273 im_set_position (spot); 1379 im_set_position (nspot);
1380
1381 if (nspot.x == spot.x && nspot.y == spot.y)
1382 return;
1383
1384 spot = nspot;
1274 1385
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1386 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1387 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1388 XFree (preedit_attr);
1278} 1389}
1279 1390
1280void 1391void
1281rxvt_term::im_destroy () 1392rxvt_term::im_destroy ()
1282{ 1393{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1394 if (input_method)
1290 { 1395 {
1396 if (Input_Context && input_method->xim)
1397 XDestroyIC (Input_Context);
1398
1291 display->put_xim (input_method); 1399 display->put_xim (input_method);
1292 input_method = 0; 1400 input_method = 0;
1293 } 1401 }
1402
1403 Input_Context = 0;
1294} 1404}
1295 1405
1296/* 1406/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1407 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1408 * open a suitable preedit type
… …
1316 input_method = display->get_xim (locale, modifiers); 1426 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1427 if (input_method == NULL)
1318 return false; 1428 return false;
1319 1429
1320 xim = input_method->xim; 1430 xim = input_method->xim;
1431 spot.x = spot.y = -1;
1321 1432
1322 xim_styles = NULL; 1433 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1434 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1435 || !xim_styles || !xim_styles->count_styles)
1325 { 1436 {
1326 im_destroy (); 1437 im_destroy ();
1327 return false; 1438 return false;
1328 } 1439 }
1329 1440
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1441 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1442
1443 for (int pi = 0; pi < 2; pi++)
1444 {
1445 p = pet[pi];
1446
1447 if (!p)
1448 continue;
1449
1331 s = rxvt_splitcommastring (p); 1450 s = rxvt_splitcommastring (p);
1332 1451
1333 for (i = found = 0; !found && s[i]; i++) 1452 for (i = found = 0; !found && s[i]; i++)
1334 { 1453 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1454 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1455 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1456 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1457 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1458 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1459 input_style = (XIMPreeditNothing | XIMStatusNothing);
1460 else if (!strcmp (s[i], "None"))
1461 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1462
1342 for (j = 0; j < xim_styles->count_styles; j++) 1463 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1464 if (input_style == xim_styles->supported_styles[j])
1344 { 1465 {
1466 rxvt_freecommastring (s);
1467
1345 found = 1; 1468 found = 1;
1346 break; 1469 goto foundpet;
1470 }
1471
1347 } 1472 }
1348 }
1349 1473
1350 for (i = 0; s[i]; i++) 1474 rxvt_freecommastring (s);
1351 free (s[i]); 1475 }
1352 1476
1353 free (s); 1477foundpet:
1478
1354 XFree (xim_styles); 1479 XFree (xim_styles);
1355 1480
1356 if (!found) 1481 if (!found)
1357 { 1482 {
1358 im_destroy (); 1483 im_destroy ();
… …
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*", 1504 "*",
1380 TermWin.fheight, 1505 fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1383 1508
1384 fs = XCreateFontSet (display->display, pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1386 1511
1387 if (missing_charset_list) 1512 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1513 XFreeStringList (missing_charset_list);
1389 1514
… …
1433 NULL); 1558 NULL);
1434 } 1559 }
1435 1560
1436 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1438 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1439 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1440 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1441 preedit_attr, 1566 preedit_attr,
1442 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1443 status_attr, NULL); 1568 status_attr, NULL);
1444 1569
… …
1461} 1586}
1462 1587
1463void 1588void
1464rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1465{ 1590{
1466 int i, found, had_im; 1591 int i;
1467 const char *p; 1592 const char *p;
1468 char **s; 1593 char **s;
1469 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1470 1595
1596 SET_R (this);
1597
1471 im_destroy (); 1598 im_destroy ();
1472 1599
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1601 if (Input_Context)
1475 return; 1602 return;
… …
1483 if (p && *p) 1610 if (p && *p)
1484 { 1611 {
1485 bool found = false; 1612 bool found = false;
1486 1613
1487 s = rxvt_splitcommastring (p); 1614 s = rxvt_splitcommastring (p);
1615
1488 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1489 { 1617 {
1490 if (*s[i]) 1618 if (*s[i])
1491 { 1619 {
1492 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
… …
1496 found = true; 1624 found = true;
1497 break; 1625 break;
1498 } 1626 }
1499 } 1627 }
1500 } 1628 }
1501 for (i = 0; s[i]; i++) 1629
1502 free (s[i]); 1630 rxvt_freecommastring (s);
1503 free (s);
1504 1631
1505 if (found) 1632 if (found)
1506 goto done; 1633 goto done;
1507 } 1634 }
1508 1635
… …
1526{ 1653{
1527 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1528 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1529 1656
1530 if (!Input_Context 1657 if (!Input_Context
1531 || !TermWin.focus 1658 || !focus
1532 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1533 || !IMisRunning ()) 1660 || !IMisRunning ())
1534 return; 1661 return;
1535 1662
1536 /* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */

Diff Legend

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