1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-01-27 15:25:24 -05:00

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

This commit is contained in:
Dave Davenport 2016-12-19 17:35:24 +01:00
commit 7fa4c164ab
6 changed files with 15 additions and 6 deletions

View file

@ -9,6 +9,8 @@ v1.3.0: Dan vs. Greg: The never ending story. (unreleased)
- Dynamically sizing window with content. - Dynamically sizing window with content.
- When placed at bottom of screen re-order screen to have entry at bottom. - When placed at bottom of screen re-order screen to have entry at bottom.
Improvements Improvements
- 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. - Improve resizing of window, don't make X whipe background.
- Improve close window (shift-delete) action, by sending NET_WM_CLOSE instead of destroying window. - Improve close window (shift-delete) action, by sending NET_WM_CLOSE instead of destroying window.
- Create cache and run directory on startup. (#497) - Create cache and run directory on startup. (#497)

View file

@ -121,7 +121,7 @@ Settings config = {
.fullscreen = FALSE, .fullscreen = FALSE,
.fake_transparency = FALSE, .fake_transparency = FALSE,
.dpi = -1, .dpi = -1,
.threads = 1, .threads = 0,
.scrollbar_width = 8, .scrollbar_width = 8,
.scroll_method = 0, .scroll_method = 0,
.fake_background = "screenshot", .fake_background = "screenshot",

View file

@ -91,6 +91,8 @@ There are currently three methods of setting configuration options (evaluated in
By default XDG_USER_CONFIG_DIR defaults to `$HOME/.config`. (See `rofi -h` for current location). By default XDG_USER_CONFIG_DIR defaults to `$HOME/.config`. (See `rofi -h` for current location).
* Command-line options: Arguments passed to **rofi**. * Command-line options: Arguments passed to **rofi**.
**TIP**: To get a template config file run: `rofi -dump-xresources > rofi-example.config`.
The Xresources file expects options starting with `rofi.` followed by it's name. An Example to set the number of lines: The Xresources file expects options starting with `rofi.` followed by it's name. An Example to set the number of lines:
rofi.lines: 10 rofi.lines: 10

View file

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "ROFI\-MANPAGE" "" "2016-12-14" "" "" .TH "ROFI\-MANPAGE" "" "2016-12-19" "" ""
. .
.SH "NAME" .SH "NAME"
\fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement \fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement
@ -55,6 +55,9 @@ Command\-line options: Arguments passed to \fBrofi\fR\.
.IP "" 0 .IP "" 0
. .
.P .P
\fBTIP\fR: To get a template config file run: \fBrofi \-dump\-xresources > rofi\-example\.config\fR\.
.
.P
The Xresources file expects options starting with \fBrofi\.\fR followed by it\'s name\. An Example to set the number of lines: The Xresources file expects options starting with \fBrofi\.\fR followed by it\'s name\. An Example to set the number of lines:
. .
.IP "" 4 .IP "" 4

View file

@ -80,6 +80,8 @@ by making all colors transparent).
### Improvements ### Improvements
- 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. - Improve resizing of window, don't make X whipe background.
- Improve close window (shift-delete) action, by sending NET_WM_CLOSE instead of destroying window. - Improve close window (shift-delete) action, by sending NET_WM_CLOSE instead of destroying window.
- Create cache and run directory on startup. (#497) - Create cache and run directory on startup. (#497)

View file

@ -135,14 +135,14 @@ static void async_read_callback ( GObject *source_object, GAsyncResult *res, gpo
g_free ( data ); g_free ( data );
rofi_view_reload (); rofi_view_reload ();
g_data_input_stream_read_upto_async ( pd->data_input_stream, &( pd->separator ), 1, G_PRIORITY_DEFAULT, pd->cancel, g_data_input_stream_read_upto_async ( pd->data_input_stream, &( pd->separator ), 1, G_PRIORITY_LOW, pd->cancel,
async_read_callback, pd ); async_read_callback, pd );
return; return;
} }
if ( !g_cancellable_is_cancelled ( pd->cancel ) ) { if ( !g_cancellable_is_cancelled ( pd->cancel ) ) {
// Hack, don't use get active. // Hack, don't use get active.
rofi_view_set_overlay ( rofi_view_get_active (), NULL ); rofi_view_set_overlay ( rofi_view_get_active (), NULL );
g_input_stream_close_async ( G_INPUT_STREAM ( stream ), G_PRIORITY_DEFAULT, pd->cancel, async_close_callback, pd ); g_input_stream_close_async ( G_INPUT_STREAM ( stream ), G_PRIORITY_LOW, pd->cancel, async_close_callback, pd );
} }
} }
@ -153,7 +153,7 @@ static void async_read_cancel ( G_GNUC_UNUSED GCancellable *cancel, G_GNUC_UNUSE
static void get_dmenu_async ( DmenuModePrivateData *pd ) static void get_dmenu_async ( DmenuModePrivateData *pd )
{ {
g_data_input_stream_read_upto_async ( pd->data_input_stream, &( pd->separator ), 1, G_PRIORITY_DEFAULT, pd->cancel, g_data_input_stream_read_upto_async ( pd->data_input_stream, &( pd->separator ), 1, G_PRIORITY_LOW, pd->cancel,
async_read_callback, pd ); async_read_callback, pd );
} }
static void get_dmenu_sync ( DmenuModePrivateData *pd ) static void get_dmenu_sync ( DmenuModePrivateData *pd )
@ -168,7 +168,7 @@ static void get_dmenu_sync ( DmenuModePrivateData *pd )
read_add ( pd, data, len ); read_add ( pd, data, len );
g_free ( data ); g_free ( data );
} }
g_input_stream_close_async ( G_INPUT_STREAM ( pd->input_stream ), G_PRIORITY_DEFAULT, pd->cancel, async_close_callback, pd ); g_input_stream_close_async ( G_INPUT_STREAM ( pd->input_stream ), G_PRIORITY_LOW, pd->cancel, async_close_callback, pd );
} }
static unsigned int dmenu_mode_get_num_entries ( const Mode *sw ) static unsigned int dmenu_mode_get_num_entries ( const Mode *sw )