Clean up various bits of Haiku code

* src/haiku_font_support.cc (BFont_string_width): Delete unused
function.
* src/haiku_support.cc (BWindow_new): Clean up type of `view'.
(BWindow_quit): Clean up coding style.
(BView_mouse_down, BView_mouse_up, BView_mouse_moved): Delete
unused functions.
(unwind_popup_file_dialog): Clean up coding style.
(be_popup_file_dialog_safe_set_target): Delete function.
(be_popup_file_dialog): Improve code clarity.
* src/haiku_support.h: Fix coding style.
* src/haikufns.c (haiku_get_color, haiku_display_info_for_name)
(check_haiku_display_info, Fhaiku_read_file_name)
(Fx_display_save_under, Fhaiku_frame_restack): Remove references
to "Be displays" and replace them with "Haiku displays".
* src/haikuselect.h: Clean up coding style.
* src/haikuterm.c (haiku_read_socket): Clean up coding style and
fix a few latent bugs.

1 files changed, 45 insertions, 78 deletions

diff --git a/src/haikuselect.h b/src/haikuselect.h
index bac9663c702..a99721dd221 100644
--- a/src/haikuselect.h
+++ b/src/haikuselect.h
@@ -36,86 +36,53 @@ enum haiku_clipboard
 #include <stdio.h>
 extern "C"
 {
-  extern void init_haiku_select (void);
+extern void init_haiku_select (void);
 #endif
-
-  /* Whether or not the selection was recently changed.  */
-  extern int selection_state_flag;
-
-  /* Find a string with the MIME type TYPE in the system clipboard.  */
-  extern char *
-  BClipboard_find_system_data (const char *type, ssize_t *len);
-
-  /* Ditto, but for the primary selection and not clipboard.  */
-  extern char *
-  BClipboard_find_primary_selection_data (const char *type, ssize_t *len);
-
-  /* Ditto, this time for the secondary selection.  */
-  extern char *
-  BClipboard_find_secondary_selection_data (const char *type, ssize_t *len);
-
-  extern void
-  BClipboard_set_system_data (const char *type, const char *data, ssize_t len,
-			      bool clear);
-
-  extern void
-  BClipboard_set_primary_selection_data (const char *type, const char *data,
-					 ssize_t len, bool clear);
-
-  extern void
-  BClipboard_set_secondary_selection_data (const char *type, const char *data,
-					   ssize_t len, bool clear);
-
-  extern void
-  BClipboard_system_targets (char **buf, int len);
-
-  extern void
-  BClipboard_primary_targets (char **buf, int len);
-
-  extern void
-  BClipboard_secondary_targets (char **buf, int len);
-
-  extern bool
-  BClipboard_owns_clipboard (void);
-
-  extern bool
-  BClipboard_owns_primary (void);
-
-  extern bool BClipboard_owns_secondary (void);
-
-  /* Free the returned data.  */
-  extern void BClipboard_free_data (void *ptr);
-
-  extern int be_enum_message (void *message, int32 *tc, int32 index,
-			      int32 *count, const char **name_return);
-  extern int be_get_message_data (void *message, const char *name,
-				  int32 type_code, int32 index,
-				  const void **buf_return,
-				  ssize_t *size_return);
-  extern int be_get_refs_data (void *message, const char *name,
-			       int32 index, char **path_buffer);
-  extern int be_get_point_data (void *message, const char *name,
-				int32 index, float *x, float *y);
-  extern uint32 be_get_message_type (void *message);
-  extern void be_set_message_type (void *message, uint32 what);
-  extern void *be_get_message_message (void *message, const char *name,
-				       int32 index);
-  extern void *be_create_simple_message (void);
-  extern int be_add_message_data (void *message, const char *name,
-				  int32 type_code, const void *buf,
-				  ssize_t buf_size);
-  extern int be_add_refs_data (void *message, const char *name,
-			       const char *filename);
-  extern int be_add_point_data (void *message, const char *name,
-				float x, float y);
-  extern int be_add_message_message (void *message, const char *name,
-				     void *data);
-  extern int be_lock_clipboard_message (enum haiku_clipboard clipboard,
-					void **message_return,
-					bool clear);
-  extern void be_unlock_clipboard (enum haiku_clipboard clipboard,
-				   bool discard);
+/* Whether or not the selection was recently changed.  */
+extern int selection_state_flag;
+
+/* Find a string with the MIME type TYPE in the system clipboard.  */
+extern char *BClipboard_find_system_data (const char *, ssize_t *);
+extern char *BClipboard_find_primary_selection_data (const char *, ssize_t *);
+extern char *BClipboard_find_secondary_selection_data (const char *, ssize_t *);
+
+extern void BClipboard_set_system_data (const char *, const char *, ssize_t, bool);
+extern void BClipboard_set_primary_selection_data (const char *, const char *,
+						   ssize_t, bool);
+extern void BClipboard_set_secondary_selection_data (const char *, const char *,
+						     ssize_t, bool);
+
+extern void BClipboard_system_targets (char **, int);
+extern void BClipboard_primary_targets (char **, int);
+extern void BClipboard_secondary_targets (char **, int);
+
+extern bool BClipboard_owns_clipboard (void);
+extern bool BClipboard_owns_primary (void);
+extern bool BClipboard_owns_secondary (void);
+
+/* Free the returned data.  */
+extern void BClipboard_free_data (void *);
+
+extern int be_enum_message (void *, int32 *, int32, int32 *, const char **);
+extern int be_get_message_data (void *, const char *, int32, int32,
+				const void **, ssize_t *);
+extern int be_get_refs_data (void *, const char *, int32, char **);
+extern int be_get_point_data (void *, const char *, int32, float *, float *);
+extern uint32 be_get_message_type (void *);
+extern void be_set_message_type (void *, uint32);
+extern void *be_get_message_message (void *, const char *, int32);
+extern void *be_create_simple_message (void);
+extern int be_add_message_data (void *, const char *, int32, const void *, ssize_t);
+extern int be_add_refs_data (void *, const char *, const char *);
+extern int be_add_point_data (void *, const char *, float, float);
+extern int be_add_message_message (void *, const char *, void *);
+extern int be_lock_clipboard_message (enum haiku_clipboard, void **, bool);
+extern void be_unlock_clipboard (enum haiku_clipboard, bool);
 #ifdef __cplusplus
 };
 #endif
 #endif /* _HAIKU_SELECT_H_ */
+
+// Local Variables:
+// eval: (setf (alist-get 'inextern-lang c-offsets-alist) 0)
+// End: