diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/fringe.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/src/fringe.c b/src/fringe.c index dcb4705e2e5..9e1d7003d4f 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -490,8 +490,7 @@ int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS; | |||
| 490 | Return 0 if not a bitmap. */ | 490 | Return 0 if not a bitmap. */ |
| 491 | 491 | ||
| 492 | int | 492 | int |
| 493 | lookup_fringe_bitmap (bitmap) | 493 | lookup_fringe_bitmap (Lisp_Object bitmap) |
| 494 | Lisp_Object bitmap; | ||
| 495 | { | 494 | { |
| 496 | int bn; | 495 | int bn; |
| 497 | 496 | ||
| @@ -517,8 +516,7 @@ lookup_fringe_bitmap (bitmap) | |||
| 517 | Return BN if not found in Vfringe_bitmaps. */ | 516 | Return BN if not found in Vfringe_bitmaps. */ |
| 518 | 517 | ||
| 519 | static Lisp_Object | 518 | static Lisp_Object |
| 520 | get_fringe_bitmap_name (bn) | 519 | get_fringe_bitmap_name (int bn) |
| 521 | int bn; | ||
| 522 | { | 520 | { |
| 523 | Lisp_Object bitmaps; | 521 | Lisp_Object bitmaps; |
| 524 | Lisp_Object num; | 522 | Lisp_Object num; |
| @@ -550,11 +548,7 @@ get_fringe_bitmap_name (bn) | |||
| 550 | */ | 548 | */ |
| 551 | 549 | ||
| 552 | static void | 550 | static void |
| 553 | draw_fringe_bitmap_1 (w, row, left_p, overlay, which) | 551 | draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int overlay, int which) |
| 554 | struct window *w; | ||
| 555 | struct glyph_row *row; | ||
| 556 | int left_p, overlay; | ||
| 557 | int which; | ||
| 558 | { | 552 | { |
| 559 | struct frame *f = XFRAME (WINDOW_FRAME (w)); | 553 | struct frame *f = XFRAME (WINDOW_FRAME (w)); |
| 560 | struct draw_fringe_bitmap_params p; | 554 | struct draw_fringe_bitmap_params p; |
| @@ -690,9 +684,7 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which) | |||
| 690 | } | 684 | } |
| 691 | 685 | ||
| 692 | static int | 686 | static int |
| 693 | get_logical_cursor_bitmap (w, cursor) | 687 | get_logical_cursor_bitmap (struct window *w, Lisp_Object cursor) |
| 694 | struct window *w; | ||
| 695 | Lisp_Object cursor; | ||
| 696 | { | 688 | { |
| 697 | Lisp_Object cmap, bm = Qnil; | 689 | Lisp_Object cmap, bm = Qnil; |
| 698 | 690 | ||
| @@ -715,10 +707,7 @@ get_logical_cursor_bitmap (w, cursor) | |||
| 715 | } | 707 | } |
| 716 | 708 | ||
| 717 | static int | 709 | static int |
| 718 | get_logical_fringe_bitmap (w, bitmap, right_p, partial_p) | 710 | get_logical_fringe_bitmap (struct window *w, Lisp_Object bitmap, int right_p, int partial_p) |
| 719 | struct window *w; | ||
| 720 | Lisp_Object bitmap; | ||
| 721 | int right_p, partial_p; | ||
| 722 | { | 711 | { |
| 723 | Lisp_Object cmap, bm1 = Qnil, bm2 = Qnil, bm; | 712 | Lisp_Object cmap, bm1 = Qnil, bm2 = Qnil, bm; |
| 724 | int ln1 = 0, ln2 = 0; | 713 | int ln1 = 0, ln2 = 0; |
| @@ -818,10 +807,7 @@ get_logical_fringe_bitmap (w, bitmap, right_p, partial_p) | |||
| 818 | 807 | ||
| 819 | 808 | ||
| 820 | void | 809 | void |
| 821 | draw_fringe_bitmap (w, row, left_p) | 810 | draw_fringe_bitmap (struct window *w, struct glyph_row *row, int left_p) |
| 822 | struct window *w; | ||
| 823 | struct glyph_row *row; | ||
| 824 | int left_p; | ||
| 825 | { | 811 | { |
| 826 | int overlay = 0; | 812 | int overlay = 0; |
| 827 | 813 | ||
| @@ -874,9 +860,7 @@ draw_fringe_bitmap (w, row, left_p) | |||
| 874 | function with input blocked. */ | 860 | function with input blocked. */ |
| 875 | 861 | ||
| 876 | void | 862 | void |
| 877 | draw_row_fringe_bitmaps (w, row) | 863 | draw_row_fringe_bitmaps (struct window *w, struct glyph_row *row) |
| 878 | struct window *w; | ||
| 879 | struct glyph_row *row; | ||
| 880 | { | 864 | { |
| 881 | xassert (interrupt_input_blocked); | 865 | xassert (interrupt_input_blocked); |
| 882 | 866 | ||
| @@ -904,9 +888,7 @@ draw_row_fringe_bitmaps (w, row) | |||
| 904 | */ | 888 | */ |
| 905 | 889 | ||
| 906 | int | 890 | int |
| 907 | draw_window_fringes (w, no_fringe) | 891 | draw_window_fringes (struct window *w, int no_fringe) |
| 908 | struct window *w; | ||
| 909 | int no_fringe; | ||
| 910 | { | 892 | { |
| 911 | struct glyph_row *row; | 893 | struct glyph_row *row; |
| 912 | int yb = window_text_bottom_y (w); | 894 | int yb = window_text_bottom_y (w); |
| @@ -944,9 +926,7 @@ draw_window_fringes (w, no_fringe) | |||
| 944 | If KEEP_CURRENT_P is 0, update current_matrix too. */ | 926 | If KEEP_CURRENT_P is 0, update current_matrix too. */ |
| 945 | 927 | ||
| 946 | int | 928 | int |
| 947 | update_window_fringes (w, keep_current_p) | 929 | update_window_fringes (struct window *w, int keep_current_p) |
| 948 | struct window *w; | ||
| 949 | int keep_current_p; | ||
| 950 | { | 930 | { |
| 951 | struct glyph_row *row, *cur = 0; | 931 | struct glyph_row *row, *cur = 0; |
| 952 | int yb = window_text_bottom_y (w); | 932 | int yb = window_text_bottom_y (w); |
| @@ -1188,9 +1168,7 @@ update_window_fringes (w, keep_current_p) | |||
| 1188 | */ | 1168 | */ |
| 1189 | 1169 | ||
| 1190 | void | 1170 | void |
| 1191 | compute_fringe_widths (f, redraw) | 1171 | compute_fringe_widths (struct frame *f, int redraw) |
| 1192 | struct frame *f; | ||
| 1193 | int redraw; | ||
| 1194 | { | 1172 | { |
| 1195 | int o_left = FRAME_LEFT_FRINGE_WIDTH (f); | 1173 | int o_left = FRAME_LEFT_FRINGE_WIDTH (f); |
| 1196 | int o_right = FRAME_RIGHT_FRINGE_WIDTH (f); | 1174 | int o_right = FRAME_RIGHT_FRINGE_WIDTH (f); |
| @@ -1272,8 +1250,7 @@ compute_fringe_widths (f, redraw) | |||
| 1272 | /* Free resources used by a user-defined bitmap. */ | 1250 | /* Free resources used by a user-defined bitmap. */ |
| 1273 | 1251 | ||
| 1274 | void | 1252 | void |
| 1275 | destroy_fringe_bitmap (n) | 1253 | destroy_fringe_bitmap (int n) |
| 1276 | int n; | ||
| 1277 | { | 1254 | { |
| 1278 | struct fringe_bitmap **fbp; | 1255 | struct fringe_bitmap **fbp; |
| 1279 | 1256 | ||
| @@ -1342,10 +1319,7 @@ static const unsigned char swap_nibble[16] = { | |||
| 1342 | #endif /* HAVE_X_WINDOWS */ | 1319 | #endif /* HAVE_X_WINDOWS */ |
| 1343 | 1320 | ||
| 1344 | void | 1321 | void |
| 1345 | init_fringe_bitmap (which, fb, once_p) | 1322 | init_fringe_bitmap (int which, struct fringe_bitmap *fb, int once_p) |
| 1346 | int which; | ||
| 1347 | struct fringe_bitmap *fb; | ||
| 1348 | int once_p; | ||
| 1349 | { | 1323 | { |
| 1350 | if (once_p || fb->dynamic) | 1324 | if (once_p || fb->dynamic) |
| 1351 | { | 1325 | { |
| @@ -1620,7 +1594,7 @@ Return nil if POS is not visible in WINDOW. */) | |||
| 1620 | ***********************************************************************/ | 1594 | ***********************************************************************/ |
| 1621 | 1595 | ||
| 1622 | void | 1596 | void |
| 1623 | syms_of_fringe () | 1597 | syms_of_fringe (void) |
| 1624 | { | 1598 | { |
| 1625 | Qtruncation = intern_c_string ("truncation"); | 1599 | Qtruncation = intern_c_string ("truncation"); |
| 1626 | staticpro (&Qtruncation); | 1600 | staticpro (&Qtruncation); |
| @@ -1657,7 +1631,7 @@ If nil, also continue lines which are exactly as wide as the window. */); | |||
| 1657 | /* Garbage collection hook */ | 1631 | /* Garbage collection hook */ |
| 1658 | 1632 | ||
| 1659 | void | 1633 | void |
| 1660 | mark_fringe_data () | 1634 | mark_fringe_data (void) |
| 1661 | { | 1635 | { |
| 1662 | int i; | 1636 | int i; |
| 1663 | 1637 | ||
| @@ -1669,7 +1643,7 @@ mark_fringe_data () | |||
| 1669 | /* Initialize this module when Emacs starts. */ | 1643 | /* Initialize this module when Emacs starts. */ |
| 1670 | 1644 | ||
| 1671 | void | 1645 | void |
| 1672 | init_fringe_once () | 1646 | init_fringe_once (void) |
| 1673 | { | 1647 | { |
| 1674 | int bt; | 1648 | int bt; |
| 1675 | 1649 | ||
| @@ -1678,7 +1652,7 @@ init_fringe_once () | |||
| 1678 | } | 1652 | } |
| 1679 | 1653 | ||
| 1680 | void | 1654 | void |
| 1681 | init_fringe () | 1655 | init_fringe (void) |
| 1682 | { | 1656 | { |
| 1683 | int i; | 1657 | int i; |
| 1684 | 1658 | ||