diff options
| author | Richard M. Stallman | 1994-01-31 05:35:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-01-31 05:35:36 +0000 |
| commit | 345a94f994fecd2420b1d6485d2661deb5f24cb4 (patch) | |
| tree | 9b31cb59e411fb834859b40f297c0a38d648fe5d /src/widget.c | |
| parent | ab9d3e3c85c284fb4efde1a78ebab37ada89516b (diff) | |
| download | emacs-345a94f994fecd2420b1d6485d2661deb5f24cb4.tar.gz emacs-345a94f994fecd2420b1d6485d2661deb5f24cb4.zip | |
*** empty log message ***
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 94 |
1 files changed, 66 insertions, 28 deletions
diff --git a/src/widget.c b/src/widget.c index e93fbaf5c6b..ba46b247e2f 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -191,8 +191,12 @@ pixel_to_char_size (ew, pixel_width, pixel_height, char_width, char_height) | |||
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | static void | 193 | static void |
| 194 | char_to_pixel_size (EmacsFrame ew, int char_width, int char_height, | 194 | char_to_pixel_size (ew, char_width, char_height, pixel_width, pixel_height) |
| 195 | Dimension* pixel_width, Dimension* pixel_height) | 195 | EmacsFrame ew; |
| 196 | int char_width; | ||
| 197 | int char_height; | ||
| 198 | Dimension* pixel_width; | ||
| 199 | Dimension* pixel_height; | ||
| 196 | { | 200 | { |
| 197 | struct frame* f = ew->emacs_frame.frame; | 201 | struct frame* f = ew->emacs_frame.frame; |
| 198 | *pixel_width = CHAR_TO_PIXEL_WIDTH (f, char_width); | 202 | *pixel_width = CHAR_TO_PIXEL_WIDTH (f, char_width); |
| @@ -200,9 +204,12 @@ char_to_pixel_size (EmacsFrame ew, int char_width, int char_height, | |||
| 200 | } | 204 | } |
| 201 | 205 | ||
| 202 | static void | 206 | static void |
| 203 | round_size_to_char (EmacsFrame ew, | 207 | round_size_to_char (ew, in_width, in_height, out_width, out_height) |
| 204 | Dimension in_width, Dimension in_height, | 208 | EmacsFrame ew; |
| 205 | Dimension* out_width, Dimension* out_height) | 209 | Dimension in_width; |
| 210 | Dimension in_height; | ||
| 211 | Dimension* out_width; | ||
| 212 | Dimension* out_height; | ||
| 206 | { | 213 | { |
| 207 | int char_width; | 214 | int char_width; |
| 208 | int char_height; | 215 | int char_height; |
| @@ -211,7 +218,8 @@ round_size_to_char (EmacsFrame ew, | |||
| 211 | } | 218 | } |
| 212 | 219 | ||
| 213 | static Widget | 220 | static Widget |
| 214 | get_wm_shell (Widget w) | 221 | get_wm_shell (w) |
| 222 | Widget w; | ||
| 215 | { | 223 | { |
| 216 | Widget wmshell; | 224 | Widget wmshell; |
| 217 | 225 | ||
| @@ -223,7 +231,8 @@ get_wm_shell (Widget w) | |||
| 223 | } | 231 | } |
| 224 | 232 | ||
| 225 | static void | 233 | static void |
| 226 | mark_shell_size_user_specified (Widget wmshell) | 234 | mark_shell_size_user_specified (wmshell) |
| 235 | Widget wmshell; | ||
| 227 | { | 236 | { |
| 228 | if (! XtIsWMShell (wmshell)) abort (); | 237 | if (! XtIsWMShell (wmshell)) abort (); |
| 229 | /* This is kind of sleazy, but I can't see how else to tell it to make it | 238 | /* This is kind of sleazy, but I can't see how else to tell it to make it |
| @@ -241,7 +250,8 @@ mark_shell_size_user_specified (Widget wmshell) | |||
| 241 | static Boolean first_frame_p = True; | 250 | static Boolean first_frame_p = True; |
| 242 | 251 | ||
| 243 | static void | 252 | static void |
| 244 | set_frame_size (EmacsFrame ew) | 253 | set_frame_size (ew) |
| 254 | EmacsFrame ew; | ||
| 245 | { | 255 | { |
| 246 | /* The widget hierarchy is | 256 | /* The widget hierarchy is |
| 247 | 257 | ||
| @@ -468,7 +478,8 @@ set_frame_size (EmacsFrame ew) | |||
| 468 | 478 | ||
| 469 | 479 | ||
| 470 | static void | 480 | static void |
| 471 | update_wm_hints (EmacsFrame ew) | 481 | update_wm_hints (ew) |
| 482 | EmacsFrame ew; | ||
| 472 | { | 483 | { |
| 473 | Widget wmshell = get_wm_shell ((Widget)ew); | 484 | Widget wmshell = get_wm_shell ((Widget)ew); |
| 474 | int cw; | 485 | int cw; |
| @@ -510,7 +521,8 @@ update_wm_hints (EmacsFrame ew) | |||
| 510 | } | 521 | } |
| 511 | 522 | ||
| 512 | static void | 523 | static void |
| 513 | create_frame_gcs (EmacsFrame ew) | 524 | create_frame_gcs (ew) |
| 525 | EmacsFrame ew; | ||
| 514 | { | 526 | { |
| 515 | struct frame* s = ew->emacs_frame.frame; | 527 | struct frame* s = ew->emacs_frame.frame; |
| 516 | 528 | ||
| @@ -523,7 +535,8 @@ create_frame_gcs (EmacsFrame ew) | |||
| 523 | } | 535 | } |
| 524 | 536 | ||
| 525 | static void | 537 | static void |
| 526 | setup_frame_gcs (EmacsFrame ew) | 538 | setup_frame_gcs (ew) |
| 539 | EmacsFrame ew; | ||
| 527 | { | 540 | { |
| 528 | XGCValues gc_values; | 541 | XGCValues gc_values; |
| 529 | struct frame* s = ew->emacs_frame.frame; | 542 | struct frame* s = ew->emacs_frame.frame; |
| @@ -599,7 +612,8 @@ setup_frame_gcs (EmacsFrame ew) | |||
| 599 | } | 612 | } |
| 600 | 613 | ||
| 601 | static void | 614 | static void |
| 602 | update_various_frame_slots (EmacsFrame ew) | 615 | update_various_frame_slots (ew) |
| 616 | EmacsFrame ew; | ||
| 603 | { | 617 | { |
| 604 | struct x_display* x = ew->emacs_frame.frame->display.x; | 618 | struct x_display* x = ew->emacs_frame.frame->display.x; |
| 605 | x->pixel_height = ew->core.height; | 619 | x->pixel_height = ew->core.height; |
| @@ -609,7 +623,8 @@ update_various_frame_slots (EmacsFrame ew) | |||
| 609 | } | 623 | } |
| 610 | 624 | ||
| 611 | static void | 625 | static void |
| 612 | update_from_various_frame_slots (EmacsFrame ew) | 626 | update_from_various_frame_slots (ew) |
| 627 | EmacsFrame ew; | ||
| 613 | { | 628 | { |
| 614 | struct x_display* x = ew->emacs_frame.frame->display.x; | 629 | struct x_display* x = ew->emacs_frame.frame->display.x; |
| 615 | ew->core.height = x->pixel_height; | 630 | ew->core.height = x->pixel_height; |
| @@ -623,8 +638,11 @@ update_from_various_frame_slots (EmacsFrame ew) | |||
| 623 | } | 638 | } |
| 624 | 639 | ||
| 625 | static void | 640 | static void |
| 626 | EmacsFrameInitialize (Widget request, Widget new, | 641 | EmacsFrameInitialize (request, new, dum1, dum2) |
| 627 | ArgList dum1, Cardinal *dum2) | 642 | Widget request; |
| 643 | Widget new; | ||
| 644 | ArgList dum1; | ||
| 645 | Cardinal *dum2; | ||
| 628 | { | 646 | { |
| 629 | EmacsFrame ew = (EmacsFrame)new; | 647 | EmacsFrame ew = (EmacsFrame)new; |
| 630 | 648 | ||
| @@ -681,8 +699,10 @@ EmacsFrameInitialize (Widget request, Widget new, | |||
| 681 | 699 | ||
| 682 | 700 | ||
| 683 | static void | 701 | static void |
| 684 | EmacsFrameRealize (Widget widget, XtValueMask *mask, | 702 | EmacsFrameRealize (widget, mask, attrs) |
| 685 | XSetWindowAttributes *attrs) | 703 | Widget widget; |
| 704 | XtValueMask *mask; | ||
| 705 | XSetWindowAttributes *attrs; | ||
| 686 | { | 706 | { |
| 687 | EmacsFrame ew = (EmacsFrame)widget; | 707 | EmacsFrame ew = (EmacsFrame)widget; |
| 688 | 708 | ||
| @@ -699,10 +719,11 @@ EmacsFrameRealize (Widget widget, XtValueMask *mask, | |||
| 699 | update_wm_hints (ew); | 719 | update_wm_hints (ew); |
| 700 | } | 720 | } |
| 701 | 721 | ||
| 702 | extern void free_frame_faces (struct frame *); | 722 | extern void free_frame_faces (/* struct frame * */); |
| 703 | 723 | ||
| 704 | static void | 724 | static void |
| 705 | EmacsFrameDestroy (Widget widget) | 725 | EmacsFrameDestroy (widget) |
| 726 | Widget widget; | ||
| 706 | { | 727 | { |
| 707 | EmacsFrame ew = (EmacsFrame) widget; | 728 | EmacsFrame ew = (EmacsFrame) widget; |
| 708 | struct frame* s = ew->emacs_frame.frame; | 729 | struct frame* s = ew->emacs_frame.frame; |
| @@ -723,7 +744,8 @@ EmacsFrameDestroy (Widget widget) | |||
| 723 | } | 744 | } |
| 724 | 745 | ||
| 725 | void | 746 | void |
| 726 | EmacsFrameResize (Widget widget) | 747 | EmacsFrameResize (widget) |
| 748 | Widget widget; | ||
| 727 | { | 749 | { |
| 728 | EmacsFrame ew = (EmacsFrame)widget; | 750 | EmacsFrame ew = (EmacsFrame)widget; |
| 729 | struct frame *f = ew->emacs_frame.frame; | 751 | struct frame *f = ew->emacs_frame.frame; |
| @@ -762,8 +784,12 @@ EmacsFrameResize (Widget widget) | |||
| 762 | } | 784 | } |
| 763 | 785 | ||
| 764 | static Boolean | 786 | static Boolean |
| 765 | EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, | 787 | EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2) |
| 766 | ArgList dum1, Cardinal *dum2) | 788 | Widget cur_widget; |
| 789 | Widget req_widget; | ||
| 790 | Widget new_widget; | ||
| 791 | ArgList dum1; | ||
| 792 | Cardinal *dum2; | ||
| 767 | { | 793 | { |
| 768 | EmacsFrame cur = (EmacsFrame)cur_widget; | 794 | EmacsFrame cur = (EmacsFrame)cur_widget; |
| 769 | EmacsFrame new = (EmacsFrame)new_widget; | 795 | EmacsFrame new = (EmacsFrame)new_widget; |
| @@ -834,8 +860,10 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, | |||
| 834 | } | 860 | } |
| 835 | 861 | ||
| 836 | static XtGeometryResult | 862 | static XtGeometryResult |
| 837 | EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry* request, | 863 | EmacsFrameQueryGeometry (widget, request, result) |
| 838 | XtWidgetGeometry* result) | 864 | Widget widget; |
| 865 | XtWidgetGeometry* request; | ||
| 866 | XtWidgetGeometry* result; | ||
| 839 | { | 867 | { |
| 840 | EmacsFrame ew = (EmacsFrame)widget; | 868 | EmacsFrame ew = (EmacsFrame)widget; |
| 841 | 869 | ||
| @@ -868,13 +896,20 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry* request, | |||
| 868 | it to make the focus handlers work?? | 896 | it to make the focus handlers work?? |
| 869 | */ | 897 | */ |
| 870 | static void | 898 | static void |
| 871 | key_press (Widget w, XEvent* event, String *params, Cardinal *n_params) | 899 | key_press (w, event, params, n_params) |
| 900 | Widget w; | ||
| 901 | XEvent* event; | ||
| 902 | String *params; | ||
| 903 | Cardinal *n_params; | ||
| 872 | { | 904 | { |
| 873 | } | 905 | } |
| 874 | 906 | ||
| 875 | static void | 907 | static void |
| 876 | emacs_frame_focus_handler (Widget w, XEvent *event, String *params, | 908 | emacs_frame_focus_handler (w, event, params, n_params) |
| 877 | Cardinal *n_params) | 909 | Widget w; |
| 910 | XEvent *event; | ||
| 911 | String *params; | ||
| 912 | Cardinal *n_params; | ||
| 878 | { | 913 | { |
| 879 | emacs_Xt_focus_event_handler (event, 0); | 914 | emacs_Xt_focus_event_handler (event, 0); |
| 880 | } | 915 | } |
| @@ -882,7 +917,10 @@ emacs_frame_focus_handler (Widget w, XEvent *event, String *params, | |||
| 882 | 917 | ||
| 883 | /* Special entrypoints */ | 918 | /* Special entrypoints */ |
| 884 | void | 919 | void |
| 885 | EmacsFrameSetCharSize (Widget widget, int columns, int rows) | 920 | EmacsFrameSetCharSize (widget, columns, rows) |
| 921 | Widget widget; | ||
| 922 | int columns; | ||
| 923 | int rows; | ||
| 886 | { | 924 | { |
| 887 | EmacsFrame ew = (EmacsFrame) widget; | 925 | EmacsFrame ew = (EmacsFrame) widget; |
| 888 | Dimension pixel_width, pixel_height, granted_width, granted_height; | 926 | Dimension pixel_width, pixel_height, granted_width, granted_height; |