From f90ee8e9dfcb3ab286c5202e96a0715429f0e4e7 Mon Sep 17 00:00:00 2001
From: sabetts <sabetts>
Date: Mon, 13 Dec 2004 01:04:15 +0000
Subject: * src/sbuf.c (sbuf_concat): call sbuf_nconcat. move bulk of body to
 sbuf_nconcat. (sbuf_nconcat): new function

* src/globals.c (init_globals): new function

* src/main.c (main): call init_globals.

* src/globals.c: include unistd.h.
(x_export_selection): new function
(set_nselection): likewise
(set_selection): call x_export_selection
(get_cut_buffer): new function
(get_primary_selection): likewise
(get_selection): likewise

* src/editor.c (editor_kill_word): add the deleted text to the X11
selection
(editor_backward_kill_word): likewise
(editor_kill_line): likewise
(backward_kill_line): new fuction
(editor_backward_kill_line): add the deleted text to the X11
selection. call backward_kill_line.
(paste_cut_buffer): remove function
(paste_primary_selection): likewise
(editor_paste_selection): call get_selection to get the X11
selection.
(editor_complete): call backward_kill_line instead of
editor_backward_kill_line.

* src/ratpoison.h: Include string.h. Include X11/XAtom.h.

* src/globals.c (selection): new global
(set_selection): new function

* src/events.c: include X11/Xmd.h
(selection_request): new function
(selection_clear): new function
(delegate_event): call selection_request and selection_clear for
SelectionRequest and SelectionClear events.

* src/actions.c (user_commands): remove duplicate focusprev entry. Add putsel. Add getsel.
(cmd_putsel): new function
(cmd_getsel): new function

* contrib/genrpbindings: add a missing paren to the elisp bindings.
---
 src/sbuf.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/sbuf.c')

diff --git a/src/sbuf.c b/src/sbuf.c
index 640b283..53c1490 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -69,9 +69,9 @@ sbuf_free_struct (struct sbuf *b)
 }
 
 char *
-sbuf_concat (struct sbuf *b, const char *str)
+sbuf_nconcat (struct sbuf *b, const char *str, int len)
 {
-  size_t minsz = b->len + strlen (str) + 1;
+  size_t minsz = b->len + len + 1;
 
   if (b->maxsz < minsz)
     {
@@ -86,6 +86,13 @@ sbuf_concat (struct sbuf *b, const char *str)
   return b->data;
 }
 
+
+char *
+sbuf_concat (struct sbuf *b, const char *str)
+{
+  return sbuf_nconcat (b, str, strlen (str));
+}
+
 char *
 sbuf_copy (struct sbuf *b, const char *str)
 {
-- 
cgit v1.2.3