Merge remote-tracking branch 'origin/master' into themer

8 files changed, 44 insertions, 22 deletions

diff --git a/Changelog b/Changelog
index fe695d5f..b46cc70b 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,4 @@
-v1.3.0: Dan vs. Greg: The never ending story. (unreleased)
+v1.3.0: Dan vs. Greg: The never ending story.
 	New Features
 		- Use randr for getting monitor layout. Fallback to xinerama if not available.
 		- Re-add fuzzy matcher.
@@ -9,6 +9,7 @@ v1.3.0: Dan vs. Greg: The never ending story. (unreleased)
 		- Dynamically sizing window with content.
 		- When placed at bottom of screen re-order screen to have entry at bottom.
 	Improvements
+		- Fix pasting secondary clipboard. (#516)
 		- By default use all cores to filter entries.
 		- Make sure drawing priority is higher then reading input data.
 		- Improve resizing of window, don't make X whipe background.
diff --git a/README.md b/README.md
index 991ac09f..270b09d0 100644
--- a/README.md
+++ b/README.md
@@ -249,3 +249,15 @@ For more detailed information, please see the [manpage](doc/rofi-manpage.markdow
 
 Please see the [installation guide](https://davedavenport.github.io/rofi/p08-INSTALL.html) for instruction on how to
 install **Rofi**.
+
+# What is rofi not?
+
+Rofi is not:
+
+ * A preview application.  In other words, it will not show a (small) preview of image, movie or other files.
+ * A UI toolkit.
+ * A library to be used in other applications.
+ * An application that can support every possible use-case. It tries to generic enough to be usable by everybody.
+   Specific functionality can be added using scripts.
+ * Just a dmenu replacement. The dmenu functionality is a nice 'extra' to **rofi** not it main purpose.
+
diff --git a/configure.ac b/configure.ac
index ca32299e..3b5b0a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([rofi], [1.2.0], [https://github.com/DaveDavenport/rofi/],[],[https://forum.qtools.org/])
+AC_INIT([rofi], [1.3.0], [https://github.com/DaveDavenport/rofi/],[],[https://forum.qtools.org/])
 
 AC_CONFIG_SRCDIR([source/rofi.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index 21e3f977..d159b87a 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -234,11 +234,7 @@ Default: *1*
 
 The following options are further explained in the theming section:
 
-`-color-enabled`
-
-Enable the extended coloring options.
-
-`-color-window` *background* *border color* *separator color */
+`-color-window` *background* *border color* *separator color* 
 
 Set window background, border and separator color.
 
@@ -912,14 +908,25 @@ Use `qalc` to get a simple calculator in **rofi**:
 
 **rofi** website can be found at [here](https://davedavenport.github.io/rofi/)
 
-**rofi** bugtracker can be found [here](https://github.com/DaveDavenport/rofi/issues)
+## SUPPORT
 
 **rofi** support can be obtained [here](irc://irc.freenode.net/#rofi) (#rofi on irc.freenode.net), or via the
 [forum](https://forum.qtools.org/)
 
+## DEBUGGING
+
+Please see [this](https://github.com/DaveDavenport/rofi/wiki/Debugging Rofi) wiki entry.
+
+## ISSUE TRACKER
+
+**rofi** issue tracker can be found [here](https://github.com/DaveDavenport/rofi/issues)
+
+When creating an issue, please read [this](https://github.com/DaveDavenport/rofi/blob/master/.github/CONTRIBUTING.md)
+first.
+
 ## SEE ALSO
 
-rofi-sensible-terminal(1)
+rofi-sensible-terminal(1), dmenu(1)
 
 ## AUTHOR
 
diff --git a/doc/rofi.1 b/doc/rofi.1
index d3b91151..fbd20911 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-MANPAGE" "" "2016-12-21" "" ""
+.TH "ROFI\-MANPAGE" "" "2016-12-23" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement
@@ -358,13 +358,7 @@ Default: \fI1\fR
 The following options are further explained in the theming section:
 .
 .P
-\fB\-color\-enabled\fR
-.
-.P
-Enable the extended coloring options\.
-.
-.P
-\fB\-color\-window\fR \fIbackground\fR \fIborder color\fR \fIseparator color\fR/
+\fB\-color\-window\fR \fIbackground\fR \fIborder color\fR \fIseparator color\fR
 .
 .P
 Set window background, border and separator color\.
@@ -1499,14 +1493,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\.
 .SH "WEBSITE"
 \fBrofi\fR website can be found at here \fIhttps://davedavenport\.github\.io/rofi/\fR
 .
-.P
-\fBrofi\fR bugtracker can be found here \fIhttps://github\.com/DaveDavenport/rofi/issues\fR
+.SH "SUPPORT"
+\fBrofi\fR support can be obtained here \fIirc://irc\.freenode\.net/#rofi\fR (#rofi on irc\.freenode\.net), or via the forum \fIhttps://forum\.qtools\.org/\fR
+.
+.SH "DEBUGGING"
+Please see this \fIhttps://github\.com/DaveDavenport/rofi/wiki/Debugging%20Rofi\fR wiki entry\.
+.
+.SH "ISSUE TRACKER"
+\fBrofi\fR issue tracker can be found here \fIhttps://github\.com/DaveDavenport/rofi/issues\fR
 .
 .P
-\fBrofi\fR support can be obtained here \fIirc://irc\.freenode\.net/#rofi\fR (#rofi on irc\.freenode\.net), or via the forum \fIhttps://forum\.qtools\.org/\fR
+When creating an issue, please read this \fIhttps://github\.com/DaveDavenport/rofi/blob/master/\.github/CONTRIBUTING\.md\fR first\.
 .
 .SH "SEE ALSO"
-rofi\-sensible\-terminal(1)
+rofi\-sensible\-terminal(1), dmenu(1)
 .
 .SH "AUTHOR"
 Qball Cow \fIqball@gmpclient\.org\fR
diff --git a/include/x11-helper.h b/include/x11-helper.h
index 80a32689..e950fdc7 100644
--- a/include/x11-helper.h
+++ b/include/x11-helper.h
@@ -44,6 +44,7 @@ void window_set_atom_prop ( xcb_window_t w, xcb_atom_t prop, xcb_atom_t *atoms,
     X ( I3_SOCKET_PATH ),         \
     X ( UTF8_STRING ),            \
     X ( STRING ),                 \
+    X ( CLIPBOARD ),              \
     X ( WM_WINDOW_ROLE ),         \
     X ( _XROOTPMAP_ID ),          \
     X ( _MOTIF_WM_HINTS ),        \
diff --git a/releasenotes/1.3.0/release-1.3.0.markdown b/releasenotes/1.3.0/release-1.3.0.markdown
index b12e8894..c52ba7d3 100644
--- a/releasenotes/1.3.0/release-1.3.0.markdown
+++ b/releasenotes/1.3.0/release-1.3.0.markdown
@@ -80,6 +80,7 @@ by making all colors transparent).
 
 ### Improvements
 
+- Fix pasting secondary clipboard. (#516)
 - By default use all cores to filter entries.
 - Make sure drawing priority is higher then reading input data.
 - Improve resizing of window, don't make X whipe background.
diff --git a/source/view.c b/source/view.c
index bbf5d328..4cf5db2e 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1014,7 +1014,7 @@ gboolean rofi_view_trigger_action ( RofiViewState *state, KeyBindingAction actio
         xcb_flush ( xcb->connection );
         break;
     case PASTE_SECONDARY:
-        xcb_convert_selection ( xcb->connection, CacheState.main_window, XCB_ATOM_SECONDARY,
+        xcb_convert_selection ( xcb->connection, CacheState.main_window, netatoms[CLIPBOARD],
                                 xcb->ewmh.UTF8_STRING, xcb->ewmh.UTF8_STRING, XCB_CURRENT_TIME );
         xcb_flush ( xcb->connection );
         break;