diff options
| author | Andreas Schwab | 2010-07-12 19:47:17 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-12 19:47:17 +0200 |
| commit | d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e (patch) | |
| tree | eeb2e0ed5cb8f7ccb1cd41cfceb03c6aaa2897fc /src/xselect.c | |
| parent | ded80a25b7d4a088dd4c4a714666705749106138 (diff) | |
| download | emacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.tar.gz emacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.zip | |
Convert old-style definitions
* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 60 |
1 files changed, 18 insertions, 42 deletions
diff --git a/src/xselect.c b/src/xselect.c index 45690a05460..cd0307344ab 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1453,18 +1453,10 @@ x_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type, | |||
| 1453 | /* Use xfree, not XFree, to free the data obtained with this function. */ | 1453 | /* Use xfree, not XFree, to free the data obtained with this function. */ |
| 1454 | 1454 | ||
| 1455 | static void | 1455 | static void |
| 1456 | x_get_window_property (display, window, property, data_ret, bytes_ret, | 1456 | x_get_window_property (Display *display, Window window, Atom property, |
| 1457 | actual_type_ret, actual_format_ret, actual_size_ret, | 1457 | unsigned char **data_ret, int *bytes_ret, |
| 1458 | delete_p) | 1458 | Atom *actual_type_ret, int *actual_format_ret, |
| 1459 | Display *display; | 1459 | unsigned long *actual_size_ret, int delete_p) |
| 1460 | Window window; | ||
| 1461 | Atom property; | ||
| 1462 | unsigned char **data_ret; | ||
| 1463 | int *bytes_ret; | ||
| 1464 | Atom *actual_type_ret; | ||
| 1465 | int *actual_format_ret; | ||
| 1466 | unsigned long *actual_size_ret; | ||
| 1467 | int delete_p; | ||
| 1468 | { | 1460 | { |
| 1469 | int total_size; | 1461 | int total_size; |
| 1470 | unsigned long bytes_remaining; | 1462 | unsigned long bytes_remaining; |
| @@ -1572,19 +1564,12 @@ x_get_window_property (display, window, property, data_ret, bytes_ret, | |||
| 1572 | /* Use xfree, not XFree, to free the data obtained with this function. */ | 1564 | /* Use xfree, not XFree, to free the data obtained with this function. */ |
| 1573 | 1565 | ||
| 1574 | static void | 1566 | static void |
| 1575 | receive_incremental_selection (display, window, property, target_type, | 1567 | receive_incremental_selection (Display *display, Window window, Atom property, |
| 1576 | min_size_bytes, data_ret, size_bytes_ret, | 1568 | Lisp_Object target_type, |
| 1577 | type_ret, format_ret, size_ret) | 1569 | unsigned int min_size_bytes, |
| 1578 | Display *display; | 1570 | unsigned char **data_ret, int *size_bytes_ret, |
| 1579 | Window window; | 1571 | Atom *type_ret, int *format_ret, |
| 1580 | Atom property; | 1572 | unsigned long *size_ret) |
| 1581 | Lisp_Object target_type; /* for error messages only */ | ||
| 1582 | unsigned int min_size_bytes; | ||
| 1583 | unsigned char **data_ret; | ||
| 1584 | int *size_bytes_ret; | ||
| 1585 | Atom *type_ret; | ||
| 1586 | unsigned long *size_ret; | ||
| 1587 | int *format_ret; | ||
| 1588 | { | 1573 | { |
| 1589 | int offset = 0; | 1574 | int offset = 0; |
| 1590 | struct prop_location *wait_object; | 1575 | struct prop_location *wait_object; |
| @@ -1673,13 +1658,10 @@ receive_incremental_selection (display, window, property, target_type, | |||
| 1673 | TARGET_TYPE and SELECTION_ATOM are used in error message if this fails. */ | 1658 | TARGET_TYPE and SELECTION_ATOM are used in error message if this fails. */ |
| 1674 | 1659 | ||
| 1675 | static Lisp_Object | 1660 | static Lisp_Object |
| 1676 | x_get_window_property_as_lisp_data (display, window, property, target_type, | 1661 | x_get_window_property_as_lisp_data (Display *display, Window window, |
| 1677 | selection_atom) | 1662 | Atom property, |
| 1678 | Display *display; | 1663 | Lisp_Object target_type, |
| 1679 | Window window; | 1664 | Atom selection_atom) |
| 1680 | Atom property; | ||
| 1681 | Lisp_Object target_type; /* for error messages only */ | ||
| 1682 | Atom selection_atom; /* for error messages only */ | ||
| 1683 | { | 1665 | { |
| 1684 | Atom actual_type; | 1666 | Atom actual_type; |
| 1685 | int actual_format; | 1667 | int actual_format; |
| @@ -1869,16 +1851,10 @@ selection_data_to_lisp_data (Display *display, unsigned char *data, int size, At | |||
| 1869 | /* Use xfree, not XFree, to free the data obtained with this function. */ | 1851 | /* Use xfree, not XFree, to free the data obtained with this function. */ |
| 1870 | 1852 | ||
| 1871 | static void | 1853 | static void |
| 1872 | lisp_data_to_selection_data (display, obj, | 1854 | lisp_data_to_selection_data (Display *display, Lisp_Object obj, |
| 1873 | data_ret, type_ret, size_ret, | 1855 | unsigned char **data_ret, Atom *type_ret, |
| 1874 | format_ret, nofree_ret) | 1856 | unsigned int *size_ret, |
| 1875 | Display *display; | 1857 | int *format_ret, int *nofree_ret) |
| 1876 | Lisp_Object obj; | ||
| 1877 | unsigned char **data_ret; | ||
| 1878 | Atom *type_ret; | ||
| 1879 | unsigned int *size_ret; | ||
| 1880 | int *format_ret; | ||
| 1881 | int *nofree_ret; | ||
| 1882 | { | 1858 | { |
| 1883 | Lisp_Object type = Qnil; | 1859 | Lisp_Object type = Qnil; |
| 1884 | struct x_display_info *dpyinfo = x_display_info_for_display (display); | 1860 | struct x_display_info *dpyinfo = x_display_info_for_display (display); |