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.39 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

… …
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
61class rxvt_composite_vec rxvt_composite;
62
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
64{
65 compose_char *cc;
66
67 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line.
69 cc = (*this)[c1];
70 while (cc)
71 {
72 if (cc->c2 == c2) return c1;
73 cc = (*this)[cc->c1];
74 }
75
76 // check to see wether this combination already exists otherwise
77 for (cc = v.end (); cc-- > v.begin (); )
78 {
79 if (cc->c1 == c1 && cc->c2 == c2)
80 return COMPOSE_LO + (cc - v.begin ());
81 }
82
83 // allocate a new combination
84 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
85 {
86 static int seen;
87
88 if (!seen++)
89 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
90
91 return REPLACEMENT_CHAR;
92 }
93
94 v.push_back (compose_char (c1, c2));
95
96 return v.size () - 1 + COMPOSE_LO;
97}
98
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
100{
101 compose_char *cc = (*this)[c];
102
103 if (!cc)
104 {
105 if (r) *r = c;
106 return 1;
107 }
108
109 int len = expand (cc->c1, r);
110
111 if (r) r += len;
112
113 if (cc->c2 != NOCHAR)
114 {
115 len++;
116 if (r) *r++ = cc->c2;
117 }
118
119 return len;
120
121}
122
123extern struct rxvt_composite_vec rxvt_composite;
61void * 124void *
62rxvt_term::operator new (size_t s) 125rxvt_term::operator new (size_t s)
63{ 126{
64 void *p = malloc (s); 127 void *p = malloc (s);
65 128
… …
80 vt_ev (this, &rxvt_term::x_cb), 143 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS 144#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb), 145 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif 146#endif
84#ifdef MENUBAR 147#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb), fixme 148 menubar_ev (this, &rxvt_term::x_cb),
86#endif 149#endif
87#ifdef CURSOR_BLINK 150#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif 152#endif
90#ifdef TEXT_BLINK 153#ifdef TEXT_BLINK
… …
117#endif 180#endif
118 181
119 delete TermWin.fontset; 182 delete TermWin.fontset;
120 183
121 if (display) 184 if (display)
185 {
186#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable;
188 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win);
190#endif
191 delete TermWin.drawable;
192 // destroy all windows
122 if (TermWin.parent[0]) 193 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]); 194 XDestroyWindow (display->display, TermWin.parent[0]);
195 }
124 196
125 // TODO: free pixcolours, colours should become part of rxvt_display 197 // TODO: free pixcolours, colours should become part of rxvt_display
126 198
127 delete PixColors; 199 delete PixColors;
128 200
… …
249 321
250 const char **cmd_argv = init_resources (argc, argv); 322 const char **cmd_argv = init_resources (argc, argv);
251 323
252 set_locale (""); 324 set_locale ("");
253 325
254#if (MENUBAR_MAX) 326#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 327 menubar_read (rs[Rs_menu]);
256#endif 328#endif
257#ifdef HAVE_SCROLLBARS 329#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 330 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 331 scrollBar.setIdle (); /* set existence for size calculations */
… …
262 create_windows (argc, argv); 334 create_windows (argc, argv);
263 335
264 init_xlocale (); 336 init_xlocale ();
265 337
266 scr_reset (); /* initialize screen */ 338 scr_reset (); /* initialize screen */
267#ifdef RXVT_GRAPHICS
268 Gr_reset (); /* reset graphics */
269#endif
270 339
271#if 0 340#if 0
272 XSynchronize (display->display, True); 341 XSynchronize (display->display, True);
273#endif 342#endif
274 343
275#ifdef HAVE_SCROLLBARS 344#ifdef HAVE_SCROLLBARS
276 if (Options & Opt_scrollBar) 345 if (Options & Opt_scrollBar)
277 resize_scrollbar (); /* create and map scrollbar */ 346 resize_scrollbar (); /* create and map scrollbar */
278#endif 347#endif
279#if (MENUBAR_MAX) 348#if (MENUBAR_MAX)
280 if (menubar_visible (r)) 349 if (menubar_visible ())
281 XMapWindow (display->display, menuBar.win); 350 XMapWindow (display->display, menuBar.win);
282#endif 351#endif
283#ifdef TRANSPARENT 352#ifdef TRANSPARENT
284 if (Options & Opt_transparent) 353 if (Options & Opt_transparent)
285 { 354 {
… …
379 448
380 p = malloc (size); 449 p = malloc (size);
381 if (p) 450 if (p)
382 return p; 451 return p;
383 452
384 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
385 rxvt_clean_exit (); 454 rxvt_clean_exit ();
386 exit (EXIT_FAILURE); 455 exit (EXIT_FAILURE);
387 /* NOTREACHED */ 456 /* NOTREACHED */
388} 457}
389 458
… …
395 464
396 p = calloc (number, size); 465 p = calloc (number, size);
397 if (p) 466 if (p)
398 return p; 467 return p;
399 468
400 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
401 rxvt_clean_exit (); 470 rxvt_clean_exit ();
402 exit (EXIT_FAILURE); 471 exit (EXIT_FAILURE);
403 /* NOTREACHED */ 472 /* NOTREACHED */
404} 473}
405 474
… …
414 else 483 else
415 p = malloc (size); 484 p = malloc (size);
416 if (p) 485 if (p)
417 return p; 486 return p;
418 487
419 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
420 rxvt_clean_exit (); 489 rxvt_clean_exit ();
421 exit (EXIT_FAILURE); 490 exit (EXIT_FAILURE);
422 /* NOTREACHED */ 491 /* NOTREACHED */
423} 492}
424 493
… …
718 * init = 1 - initialize 787 * init = 1 - initialize
719 * 788 *
720 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
721 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
722 */ 791 */
723void 792bool
724rxvt_term::change_font (int init, const char *fontname) 793rxvt_term::change_font (const char *fontname)
725{} 794{
795 if (fontname == FONT_UP)
796 {
797 // TODO
798 }
799 else if (fontname == FONT_DN)
800 {
801 // TODO
802 }
803 else
804 {
805 rxvt_fontset *fs = new rxvt_fontset (this);
726 806
727void 807 if (fs && fs->populate (fontname ? fontname : "fixed"))
808 {
809 delete TermWin.fontset;
810 TermWin.fontset = fs;
811 TermWin.fwidth = fs->base_font ()->width;
812 TermWin.fheight = fs->base_font ()->height;
813 TermWin.fbase = fs->base_font ()->ascent;
814
815 if (TermWin.parent[0])
816 {
817 resize_all_windows (0, 0, 0);
818 scr_remap_chars ();
819 scr_touch (true);
820 }
821
822 return true;
823 }
824 }
825
826 return false;
827}
828
829bool
728rxvt_term::font_up_down (int n, int direction) 830rxvt_term::font_up_down (int n, int direction)
729{} 831{
832 return false;
833}
730 834
731/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
732/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
733/* xterm sequences - title, iconName, color (exptl) */ 837/* xterm sequences - title, iconName, color (exptl) */
734void 838void
735rxvt_term::set_title (const char *str) 839rxvt_term::set_title (const char *str)
736{ 840{
737#ifndef SMART_WINDOW_TITLE 841#ifndef SMART_WINDOW_TITLE
738 XStoreName (display->display, TermWin.parent[0], str); 842 XStoreName (display->display, TermWin.parent[0], str);
739#else 843#else
740 char *name; 844 char *name;
741 845
742 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
743 name = NULL; 847 name = NULL;
744 if (name == NULL || STRCMP (name, str)) 848 if (name == NULL || STRCMP (name, str))
745 XStoreName (display->display, TermWin.parent[0], str); 849 XStoreName (display->display, TermWin.parent[0], str);
… …
752rxvt_term::set_iconName (const char *str) 856rxvt_term::set_iconName (const char *str)
753{ 857{
754#ifndef SMART_WINDOW_TITLE 858#ifndef SMART_WINDOW_TITLE
755 XSetIconName (display->display, TermWin.parent[0], str); 859 XSetIconName (display->display, TermWin.parent[0], str);
756#else 860#else
757 char *name; 861 char *name;
758 862
759 if (XGetIconName (display->display, TermWin.parent[0], &name)) 863 if (XGetIconName (display->display, TermWin.parent[0], &name))
760 name = NULL; 864 name = NULL;
761 if (name == NULL || STRCMP (name, str)) 865 if (name == NULL || STRCMP (name, str))
762 XSetIconName (display->display, TermWin.parent[0], str); 866 XSetIconName (display->display, TermWin.parent[0], str);
… …
767 871
768#ifdef XTERM_COLOR_CHANGE 872#ifdef XTERM_COLOR_CHANGE
769void 873void
770rxvt_term::set_window_color (int idx, const char *color) 874rxvt_term::set_window_color (int idx, const char *color)
771{ 875{
772 rxvt_color xcol; 876 rxvt_color xcol;
773 int i; 877 int i;
774 878
775 if (color == NULL || *color == '\0') 879 if (color == NULL || *color == '\0')
776 return; 880 return;
777 881
778 /* handle color aliases */ 882 /* handle color aliases */
… …
995 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
996 1100
997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
998 window_vt_y, TermWin_TotalWidth (), 1102 window_vt_y, TermWin_TotalWidth (),
999 TermWin_TotalHeight ()); 1103 TermWin_TotalHeight ());
1000#ifdef RXVT_GRAPHICS 1104 scr_clear (height != old_height);
1001 if (old_height)
1002 Gr_Resize (old_width - szHint.base_width,
1003 old_height - szHint.base_height);
1004#endif
1005 scr_clear ();
1006#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1007 resize_pixmap (); 1106 resize_pixmap ();
1008#endif 1107#endif
1009 1108
1010 } 1109 }

Diff Legend

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