mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-29 15:56:00 +01:00
Code Issues Projects Releases Packages Wiki Activity
zathura/config.c

536 lines
38 KiB
C
Raw Normal View History

Updated file structure
2010-11-10 20:31:15 +01:00
/* See LICENSE file for license and copyright information */
Begin to test config structure
2010-11-12 13:48:18 +01:00
replace global Zathura object with zathura session
2011-04-18 17:22:44 +02:00
#include "config.h"
Complete printer list and execute command
2010-11-29 14:58:56 +01:00
#include "commands.h"
#include "completion.h"
Allow changing of "pages-per-row" variable at runtime
2011-07-21 14:47:24 +02:00
#include "callbacks.h"
Begin to test config structure
2010-11-12 13:48:18 +01:00
#include "shortcuts.h"
#include "zathura.h"
Re-render all pages when calling cb_color_change
2012-03-14 18:09:00 +01:00
#include "render.h"
Implemented marks
2012-04-21 04:59:58 +02:00
#include "marks.h"
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
#include "utils.h"
Begin to test config structure
2010-11-12 13:48:18 +01:00
update includes due to girara restructuring
2011-10-23 17:01:15 +02:00
#include <girara/settings.h>
#include <girara/session.h>
#include <girara/shortcuts.h>
#include <girara/config.h>
#include <girara/commands.h>
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
#include <girara/utils.h>
Make strings in confic.c translatable.
2012-03-05 12:39:53 +01:00
#include <glib/gi18n.h>
update includes due to girara restructuring
2011-10-23 17:01:15 +02:00
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
#define GLOBAL_RC "/etc/zathurarc"
#define ZATHURA_RC "zathurarc"
Implemented jumplist bound to ^o ^i zathura records jumps through searches, index, links, etc. and enables to go back and forth via ^o ^i. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-17 14:14:57 +02:00
static void
cb_jumplist_change(girara_session_t* session, const char* name,
Update style
2012-10-09 01:12:18 +02:00
girara_setting_type_t UNUSED(type), void* value, void* UNUSED(data))
Implemented jumplist bound to ^o ^i zathura records jumps through searches, index, links, etc. and enables to go back and forth via ^o ^i. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-17 14:14:57 +02:00
{
g_return_if_fail(value != NULL);
g_return_if_fail(session != NULL);
g_return_if_fail(session->global.data != NULL);
g_return_if_fail(name != NULL);
zathura_t* zathura = session->global.data;
Make the jumplist persistent on a per-file basis This patch implements two new ZathuraDatabaseInterface functions, save_jumplist and load_jumplist, for both the plain and sqlite backends (along with some cleanups). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:30:04 +02:00
Remove two casts Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-09-27 01:41:35 +02:00
const int* ivalue = value;
if (*ivalue < 0) {
Make the jumplist persistent on a per-file basis This patch implements two new ZathuraDatabaseInterface functions, save_jumplist and load_jumplist, for both the plain and sqlite backends (along with some cleanups). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:30:04 +02:00
zathura->jumplist.max_size = 0;
} else {
Remove two casts Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-09-27 01:41:35 +02:00
zathura->jumplist.max_size = *ivalue;
Implemented jumplist bound to ^o ^i zathura records jumps through searches, index, links, etc. and enables to go back and forth via ^o ^i. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-17 14:14:57 +02:00
}
Make the jumplist persistent on a per-file basis This patch implements two new ZathuraDatabaseInterface functions, save_jumplist and load_jumplist, for both the plain and sqlite backends (along with some cleanups). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-21 14:30:04 +02:00
Fix cb_jumplist_change Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-04-24 01:42:46 +02:00
if (zathura->jumplist.list != NULL && zathura->jumplist.size != 0) {
zathura_jumplist_trim(zathura);
}
Implemented jumplist bound to ^o ^i zathura records jumps through searches, index, links, etc. and enables to go back and forth via ^o ^i. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-17 14:14:57 +02:00
}
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
static void
Re-render all pages when calling cb_color_change
2012-03-14 18:09:00 +01:00
cb_color_change(girara_session_t* session, const char* name,
Update style
2012-10-09 01:12:18 +02:00
girara_setting_type_t UNUSED(type), void* value, void* UNUSED(data))
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
{
g_return_if_fail(value != NULL);
g_return_if_fail(session != NULL);
g_return_if_fail(session->global.data != NULL);
g_return_if_fail(name != NULL);
zathura_t* zathura = session->global.data;
A const Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-12-03 17:05:09 +01:00
const char* string_value = (const char*) value;
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
if (g_strcmp0(name, "highlight-color") == 0) {
Replace some more GdkColors with GdkRGBA Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-12-01 16:04:04 +01:00
gdk_rgba_parse(&(zathura->ui.colors.highlight_color), string_value);
Check for the correct name.
2012-03-02 21:26:47 +01:00
} else if (g_strcmp0(name, "highlight-active-color") == 0) {
Replace some more GdkColors with GdkRGBA Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-12-01 16:04:04 +01:00
gdk_rgba_parse(&(zathura->ui.colors.highlight_color_active), string_value);
make the recolor colors changeable too
2012-02-14 14:53:45 +01:00
} else if (g_strcmp0(name, "recolor-darkcolor") == 0) {
Move recolor state to the renderer Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-24 00:07:32 +02:00
if (zathura->sync.render_thread != NULL) {
zathura_renderer_set_recolor_colors_str(zathura->sync.render_thread, NULL, string_value);
}
make the recolor colors changeable too
2012-02-14 14:53:45 +01:00
} else if (g_strcmp0(name, "recolor-lightcolor") == 0) {
Move recolor state to the renderer Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-24 00:07:32 +02:00
if (zathura->sync.render_thread != NULL) {
zathura_renderer_set_recolor_colors_str(zathura->sync.render_thread, string_value, NULL);
}
Implement colors for 'Loading ...'. Thanks to oblique for the patch. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-23 17:33:03 +01:00
} else if (g_strcmp0(name, "render-loading-bg") == 0) {
Replace some more GdkColors with GdkRGBA Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-12-01 16:04:04 +01:00
gdk_rgba_parse(&(zathura->ui.colors.render_loading_bg), string_value);
Implement colors for 'Loading ...'. Thanks to oblique for the patch. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-23 17:33:03 +01:00
} else if (g_strcmp0(name, "render-loading-fg") == 0) {
Replace some more GdkColors with GdkRGBA Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-12-01 16:04:04 +01:00
gdk_rgba_parse(&(zathura->ui.colors.render_loading_fg), string_value);
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
}
Re-render all pages when calling cb_color_change
2012-03-14 18:09:00 +01:00
render_all(zathura);
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
}
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
static void
cb_nohlsearch_changed(girara_session_t* session, const char* UNUSED(name),
Update style
2012-10-09 01:12:18 +02:00
girara_setting_type_t UNUSED(type), void* value, void* UNUSED(data))
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
{
g_return_if_fail(value != NULL);
g_return_if_fail(session != NULL);
g_return_if_fail(session->global.data != NULL);
zathura_t* zathura = session->global.data;
document_draw_search_results(zathura, !(*(bool*) value));
render_all(zathura);
}
Added incremental-search config parameter The incremental-search config parameter enables / disables the incremental search. I've set it disabled by default, as in large files it may become unresponsive for some time. Signed-off-by: Sebastian Ramacher <s.ramacher@gmx.at>
2012-09-09 12:04:13 +02:00
static void
cb_incsearch_changed(girara_session_t* session, const char* UNUSED(name),
Update style
2012-10-09 01:12:18 +02:00
girara_setting_type_t UNUSED(type), void* value, void* UNUSED(data))
Added incremental-search config parameter The incremental-search config parameter enables / disables the incremental search. I've set it disabled by default, as in large files it may become unresponsive for some time. Signed-off-by: Sebastian Ramacher <s.ramacher@gmx.at>
2012-09-09 12:04:13 +02:00
{
g_return_if_fail(value != NULL);
g_return_if_fail(session != NULL);
g_return_if_fail(session->global.data != NULL);
bool inc_search = *(bool*) value;
girara_special_command_add(session, '/', cmd_search, inc_search, FORWARD, NULL);
girara_special_command_add(session, '?', cmd_search, inc_search, BACKWARD, NULL);
}
Begin to test config structure
2010-11-12 13:48:18 +01:00
void
replace global Zathura object with zathura session
2011-04-18 17:22:44 +02:00
config_load_default(zathura_t* zathura)
Begin to test config structure
2010-11-12 13:48:18 +01:00
{
CS
2012-02-07 14:56:57 +01:00
if (zathura == NULL || zathura->ui.session == NULL) {
Begin to test config structure
2010-11-12 13:48:18 +01:00
return;
replace global Zathura object with zathura session
2011-04-18 17:22:44 +02:00
}
Begin to test config structure
2010-11-12 13:48:18 +01:00
Merge branch 'render' into girara Conflicts: Makefile config.c config.h document.c ft/djvu/Makefile ft/pdf-mupdf/Makefile ft/pdf-poppler/Makefile render.c zathura.c
2011-04-19 21:54:24 +02:00
int int_value = 0;
g_free return values of girara_setting_get
2011-10-21 15:32:50 +02:00
float float_value = 0;
Add option to disable rendering of 'Loading ...'
2012-02-01 17:30:43 +01:00
bool bool_value = false;
Make the X clipboard buffer configurable This patch adds a new configuration setting, selection-clipboard, which allows us to choose between the PRIMARY selection, and the CLIPBOARD selection, for determining which X clipboard to use for storing mouse-selected data. It has only two valid values: "primary" and "clipboard", with "clipboard" being set as the it's default value. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-31 06:18:31 +02:00
char* string_value = NULL;
replace global Zathura object with zathura session
2011-04-18 17:22:44 +02:00
girara_session_t* gsession = zathura->ui.session;
Implemented sc_rotate
2011-03-06 14:49:44 +01:00
Update modes
2011-05-07 22:00:52 +02:00
/* mode settings */
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
zathura->modes.normal = gsession->modes.normal;
zathura->modes.fullscreen = girara_mode_add(gsession, "fullscreen");
zathura->modes.index = girara_mode_add(gsession, "index");
zathura->modes.insert = girara_mode_add(gsession, "insert");
zathura->modes.presentation = girara_mode_add(gsession, "presentation");
Update modes
2011-05-07 22:00:52 +02:00
#define NORMAL zathura->modes.normal
#define INSERT zathura->modes.insert
#define INDEX zathura->modes.index
#define FULLSCREEN zathura->modes.fullscreen
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
#define PRESENTATION zathura->modes.presentation
Update modes
2011-05-07 22:00:52 +02:00
Add shortcuts for ^C and Esc in all modes This should fix #392 and hopefully doesn't break anything else. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-02-14 12:59:25 +01:00
const girara_mode_t all_modes[] = {
NORMAL,
INSERT,
INDEX,
FULLSCREEN,
PRESENTATION
};
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
/* Set default mode */
Update modes
2011-05-07 22:00:52 +02:00
girara_mode_set(gsession, zathura->modes.normal);
Update buffer in the statusbar
2010-11-13 12:40:48 +01:00
Experimental implementation of sc_zoom
2011-02-09 21:28:36 +01:00
/* zathura settings */
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "database", "plain", STRING, true, _("Database backend"), NULL, NULL);
Implemented sc_rotate
2011-03-06 14:49:44 +01:00
int_value = 10;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "zoom-step", &int_value, INT, false, _("Zoom step"), NULL, NULL);
Calculate page offset
2011-04-19 19:24:03 +02:00
int_value = 1;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "page-padding", &int_value, INT, false, _("Padding between pages"), cb_page_layout_value_changed, NULL);
Begin to draw sc_follow results
2012-01-19 00:49:08 +01:00
int_value = 1;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "pages-per-row", &int_value, INT, false, _("Number of pages per row"), cb_page_layout_value_changed, NULL);
Implement first-page-column. Thanks to J. Commelin for the patch.
2012-06-27 22:34:16 +02:00
int_value = 1;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "first-page-column", &int_value, INT, false, _("Column of the first page"), cb_page_layout_value_changed, NULL);
g_free return values of girara_setting_get
2011-10-21 15:32:50 +02:00
float_value = 40;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "scroll-step", &float_value, FLOAT, false, _("Scroll step"), NULL, NULL);
Set the horizontal scroll step Previously it was set to -1, which was essentially disabling the horizontal scrolling. This enables the scrolling by default by setting it to be the same as the vertical scrolling. Signed-off-by: Ignas Anikevicius (gns_ank) <anikevicius@gmail.com> Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-08 14:59:40 +01:00
float_value = 40;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "scroll-hstep", &float_value, FLOAT, false, _("Horizontal scroll step"), NULL, NULL);
Set scroll_full_overlap to zero by default
2012-09-19 21:31:52 +02:00
float_value = 0.0;
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "scroll-full-overlap", &float_value, FLOAT, false, _("Full page scroll overlap"), NULL, NULL);
Options for zoom_min/zoom_max
2012-02-09 18:30:36 +01:00
int_value = 10;
Remove invisible pages from the memory.
2012-03-24 16:15:34 +01:00
girara_setting_add(gsession, "zoom-min", &int_value, INT, false, _("Zoom minimum"), NULL, NULL);
Options for zoom_min/zoom_max
2012-02-09 18:30:36 +01:00
int_value = 1000;
Remove invisible pages from the memory.
2012-03-24 16:15:34 +01:00
girara_setting_add(gsession, "zoom-max", &int_value, INT, false, _("Zoom maximum"), NULL, NULL);
Replace the periodic page reclaiming code with a LRU caching algorithm. This patch implements a page cache that is invalidated in a LRU fashion. Pages are added to the cache as soon as they become visible. When the cache is full and a new page that isn't in the cache becomes visible, the least recently viewed page in the cache is evicted from memory and the new one takes it's place. The cache size is configurable using the page-cache-size configuration variable, with a default value of 15 pages. Very large values for the cache size are not recommended, though, as it will stress the system memory out. The old periodic page reclaiming code is no longer necessary with this patch, so I removed it. Special thanks to Ignas Anikevičius, and Sebastian Ramacher for the inspirations. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-03-26 04:50:22 +01:00
int_value = ZATHURA_PAGE_CACHE_DEFAULT_SIZE;
Update translations Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-03-26 12:55:28 +01:00
girara_setting_add(gsession, "page-cache-size", &int_value, INT, true, _("Maximum number of pages to keep in the cache"), NULL, NULL);
Make thumbnail maximum size configurable
2014-10-28 23:11:52 +01:00
int_value = ZATHURA_PAGE_THUMBNAIL_DEFAULT_SIZE;
girara_setting_add(gsession, "page-thumbnail-size", &int_value, INT, true, _("Maximum size in pixels of thumbnails to keep in the cache"), NULL, NULL);
Enhancements/Cleanups for the jumplist mechansim - Don't delete the elements on the right of the current one, when appending a new jump to the jumplist, because this makes no sense at all; the point of the jumplist in the first place is to remember previously jumped-to positions in the document, so there is no need to delete anythings except to trim the oldest entries from the beginning to maintain the maximum size. This also makes us compatible with the Vim way of doing things. - Make the jumplist mechanism functional on the same page; if we followed a link to a target on the same page, remember the adjustments before and after following the link. The same holds for navigating search results on the same page. - Implement position_set and use it instead of position_set_delayed when following links in order to give zathura_jumplist_save a chance to record the exact adjustments of the link target. Otherwise, it will always record the adjustments after going to the target page, but before going to the exact position within it. - Don't consider movements with ^i and ^o as jumps :) - Don't use page_set followed by setting the adjustments in sc_jumplist, because this is redundant and causes clutter when using ^i and ^o, as the adjustments is set twice this way (once in page_set and again in position_set_delayed). It's enough to only update the page number on the statusbar and then set the adjustments. - Hide implementation details (zathura_jumplist_save and zathura_jumplist_append), and make things more consistent by exporting and using only zathura_jumplist_add for adding new entries. The end result: A more slick jumping experience :-) Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-06-09 05:53:31 +02:00
int_value = 2000;
Implemented jumplist bound to ^o ^i zathura records jumps through searches, index, links, etc. and enables to go back and forth via ^o ^i. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-17 14:14:57 +02:00
girara_setting_add(gsession, "jumplist-size", &int_value, INT, false, _("Number of positions to remember in the jumplist"), cb_jumplist_change, NULL);
g_free return values of girara_setting_get
2011-10-21 15:32:50 +02:00
Move recolor state to the renderer Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-24 00:07:32 +02:00
girara_setting_add(gsession, "recolor-darkcolor", "#FFFFFF", STRING, false, _("Recoloring (dark color)"), cb_color_change, NULL);
girara_setting_add(gsession, "recolor-lightcolor", "#000000", STRING, false, _("Recoloring (light color)"), cb_color_change, NULL);
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "highlight-color", NULL, STRING, false, _("Color for highlighting"), cb_color_change, NULL);
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
girara_setting_set(gsession, "highlight-color", "#9FBC00");
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "highlight-active-color", NULL, STRING, false, _("Color for highlighting (active)"), cb_color_change, NULL);
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
girara_setting_set(gsession, "highlight-active-color", "#00BC00");
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "render-loading-bg", NULL, STRING, false, _("'Loading ...' background color"), cb_color_change, NULL);
Implement colors for 'Loading ...'. Thanks to oblique for the patch. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-23 17:33:03 +01:00
girara_setting_set(gsession, "render-loading-bg", "#FFFFFF");
CS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-30 03:29:45 +01:00
girara_setting_add(gsession, "render-loading-fg", NULL, STRING, false, _("'Loading ...' foreground color"), cb_color_change, NULL);
Implement colors for 'Loading ...'. Thanks to oblique for the patch. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-23 17:33:03 +01:00
girara_setting_set(gsession, "render-loading-fg", "#000000");
make highlight colors configurable during runtime
2012-02-14 14:46:19 +01:00
Style index mode with CSS Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-04-26 23:32:38 +02:00
girara_setting_add(gsession, "index-fg", "#DDDDDD", STRING, true, _("Index mode foreground color"), NULL, NULL);
girara_setting_add(gsession, "index-bg", "#232323", STRING, true, _("Index mode background color"), NULL, NULL);
girara_setting_add(gsession, "index-active-fg", "#232323", STRING, true, _("Index mode foreground color (active element)"), NULL, NULL);
girara_setting_add(gsession, "index-active-bg", "#9FBC00", STRING, true, _("Index mode background color (active element)"), NULL, NULL);
Add 'recolor' setting
2012-03-14 17:33:35 +01:00
bool_value = false;
girara_setting_add(gsession, "recolor", &bool_value, BOOLEAN, false, _("Recolor pages"), cb_setting_recolor_change, NULL);
Added 'scroll-wrap' for sc_navigate
2012-03-14 17:44:36 +01:00
bool_value = false;
Added option to recolor keeping hues of original color. If option recolor-keephue is true, the recoloring algorithm only adjusts the lightness of the original color, keeping the rest of the properties close to the original. When recolor-keephue is set to false, the recoloring is performed as it was before, interpolating linearly between recolor-lightcolor and recolor-darkcolor except for a different weighting for the lightness which is closer to perception. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-07-31 16:43:20 +02:00
girara_setting_add(gsession, "recolor-keephue", &bool_value, BOOLEAN, false, _("When recoloring keep original hue and adjust lightness only"), cb_setting_recolor_keep_hue_change, NULL);
bool_value = false;
Add option to ignore images while recoloring Ideally we would handle this differently. See the TODO entry in the render function. But the patch is a start. Thanks to carlos for the patch. Closes: #398 Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-09-30 19:45:07 +02:00
girara_setting_add(gsession, "recolor-reverse-video", &bool_value, BOOLEAN, false, _("When recoloring keep original image colors"), cb_setting_recolor_keep_reverse_video_change, NULL);
bool_value = false;
Added 'scroll-wrap' for sc_navigate
2012-03-14 17:44:36 +01:00
girara_setting_add(gsession, "scroll-wrap", &bool_value, BOOLEAN, false, _("Wrap scrolling"), NULL, NULL);
Add option to advance the number of pages per row. (Closes: #167)
2012-04-10 17:40:29 +02:00
bool_value = false;
Introduce page aware scrolling if scroll-page-aware is set, scrolling by full and half pages stops at page boundaries (as djview4 does it on <space> and <backspace>). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-09-15 18:00:15 +02:00
girara_setting_add(gsession, "scroll-page-aware", &bool_value, BOOLEAN, false, _("Page aware scrolling"), NULL, NULL);
Turn advance-pages-per-row on per default Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-06-24 12:08:00 +02:00
bool_value = true;
Add option to advance the number of pages per row. (Closes: #167)
2012-04-10 17:40:29 +02:00
girara_setting_add(gsession, "advance-pages-per-row", &bool_value, BOOLEAN, false, _("Advance number of pages per row"), NULL, NULL);
We added three options 1) zoom-center :: bool zoom-center = false If zoom-center = false nothing changes. If zoom-center = true zooming respects the horizontal center of the pageview. That is, the vertical line dividing the displayed part of the document doesn't move within the document. Reasoning: When viewing a pdf with a margin we usually want to hide the margin at both sides by zooming in. 2) scroll-hstep :: float scroll-hstep = -1 If scroll-hstep < 0 nothing changes. If scroll-hstep >= 0 then scroll-hstep defines the scroll step in the horizontal direction. Reasoning: This allows us to make finer adjustments in the horizontal direction without the mouse and without loosing the ablility to navigate quickly through the document. 3) search-hadjust :: bool search-hadjust = true If search-hadjust = true nothing changes. If search-hadjust = false searching does not adjust the horizontal center of the document when showing search results. Reasoning: When viewing a pdf with a margin we usually want to hide the margin at both sides by zooming in. The horizontal adjustment sometimes hides parts of the document by moving the horizontal center.
2012-05-29 14:22:04 +02:00
bool_value = false;
girara_setting_add(gsession, "zoom-center", &bool_value, BOOLEAN, false, _("Horizontally centered zoom"), NULL, NULL);
bool_value = true;
Option to keep horizontal position when following internal links Added config parameter "link-hadjust" with default value true. When set to false, following internal links do not change the horizontal position of the page, only the vertical position. Also updates page number when following links, now. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-08-16 18:41:31 +02:00
girara_setting_add(gsession, "link-hadjust", &bool_value, BOOLEAN, false, _("Align link target to the left"), NULL, NULL);
bool_value = true;
add a config setting to prevent link_evaluate from changing scale Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-10-21 18:01:04 +02:00
girara_setting_add(gsession, "link-zoom", &bool_value, BOOLEAN, false, _("Let zoom be changed when following links"), NULL, NULL);
bool_value = true;
We added three options 1) zoom-center :: bool zoom-center = false If zoom-center = false nothing changes. If zoom-center = true zooming respects the horizontal center of the pageview. That is, the vertical line dividing the displayed part of the document doesn't move within the document. Reasoning: When viewing a pdf with a margin we usually want to hide the margin at both sides by zooming in. 2) scroll-hstep :: float scroll-hstep = -1 If scroll-hstep < 0 nothing changes. If scroll-hstep >= 0 then scroll-hstep defines the scroll step in the horizontal direction. Reasoning: This allows us to make finer adjustments in the horizontal direction without the mouse and without loosing the ablility to navigate quickly through the document. 3) search-hadjust :: bool search-hadjust = true If search-hadjust = true nothing changes. If search-hadjust = false searching does not adjust the horizontal center of the document when showing search results. Reasoning: When viewing a pdf with a margin we usually want to hide the margin at both sides by zooming in. The horizontal adjustment sometimes hides parts of the document by moving the horizontal center.
2012-05-29 14:22:04 +02:00
girara_setting_add(gsession, "search-hadjust", &bool_value, BOOLEAN, false, _("Center result horizontally"), NULL, NULL);
Begin to draw sc_follow results
2012-01-19 00:49:08 +01:00
float_value = 0.5;
Make strings in confic.c translatable.
2012-03-05 12:39:53 +01:00
girara_setting_add(gsession, "highlight-transparency", &float_value, FLOAT, false, _("Transparency for highlighting"), NULL, NULL);
Add option to disable rendering of 'Loading ...'
2012-02-01 17:30:43 +01:00
bool_value = true;
Make strings in confic.c translatable.
2012-03-05 12:39:53 +01:00
girara_setting_add(gsession, "render-loading", &bool_value, BOOLEAN, false, _("Render 'Loading ...'"), NULL, NULL);
Apply adjust-open only to unknown files
2012-05-07 00:32:55 +02:00
girara_setting_add(gsession, "adjust-open", "best-fit", STRING, false, _("Adjust to when opening file"), NULL, NULL);
Hide hidden files/directories by default and make it configurable
2012-02-20 13:02:24 +01:00
bool_value = false;
Make strings in confic.c translatable.
2012-03-05 12:39:53 +01:00
girara_setting_add(gsession, "show-hidden", &bool_value, BOOLEAN, false, _("Show hidden files and directories"), NULL, NULL);
Add option to hide directories in cc_open.
2012-03-05 12:33:41 +01:00
bool_value = true;
Make strings in confic.c translatable.
2012-03-05 12:39:53 +01:00
girara_setting_add(gsession, "show-directories", &bool_value, BOOLEAN, false, _("Show directories"), NULL, NULL);
Add setting to ignore page number stored in file info. (Closes: #145) Thanks for the patch to Urchlay.
2012-03-12 22:31:40 +01:00
bool_value = false;
girara_setting_add(gsession, "open-first-page", &bool_value, BOOLEAN, false, _("Always open on first page"), NULL, NULL);
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
bool_value = false;
girara_setting_add(gsession, "nohlsearch", &bool_value, BOOLEAN, false, _("Highlight search results"), cb_nohlsearch_changed, NULL);
Some clean up Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-06 15:34:17 +01:00
#define INCREMENTAL_SEARCH false
bool_value = INCREMENTAL_SEARCH;
girara_setting_add(gsession, "incremental-search", &bool_value, BOOLEAN, false, _("Enable incremental search"), cb_incsearch_changed, NULL);
Add setting abort-clear-search and clear search results on abort if set.
2012-04-28 21:47:27 +02:00
bool_value = true;
girara_setting_add(gsession, "abort-clear-search", &bool_value, BOOLEAN, false, _("Clear search results on abort"), NULL, NULL);
Add option to use basename in window title (Closes: #229)
2012-07-02 14:13:13 +02:00
bool_value = false;
girara_setting_add(gsession, "window-title-basename", &bool_value, BOOLEAN, false, _("Use basename of the file in the window title"), NULL, NULL);
En/Disable syntex support
2012-08-13 18:17:20 +02:00
bool_value = false;
new window-title-page option When set to 'true', this option displays the page number in the title of a zathura window.
2013-07-22 15:01:05 +02:00
girara_setting_add(gsession, "window-title-page", &bool_value, BOOLEAN, false, _("Display the page number in the window title"), NULL, NULL);
bool_value = false;
Add statusbar-basename option Thanks to oblique for the patch. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-02-28 16:20:54 +01:00
girara_setting_add(gsession, "statusbar-basename", &bool_value, BOOLEAN, false, _("Use basename of the file in the statusbar"), NULL, NULL);
Add synctex-editor-command setting Also, turn on SyncTeX backward synchronization per default and remove -s option. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-07-26 16:14:29 +02:00
bool_value = true;
Update translations.
2012-08-30 19:49:15 +02:00
girara_setting_add(gsession, "synctex", &bool_value, BOOLEAN, false, _("Enable synctex support"), NULL, NULL);
Add synctex-editor-command setting Also, turn on SyncTeX backward synchronization per default and remove -s option. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-07-26 16:14:29 +02:00
string_value = "";
girara_setting_add(gsession, "synctex-editor-command", string_value, STRING, false, _("Synctex editor command"), NULL, NULL);
Add syntex-dbus-service setting to en/disable D-Bus service for synctex
2014-01-05 14:57:48 +01:00
bool_value = true;
Run D-Bus service all the time Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-11 22:03:36 +01:00
girara_setting_add(gsession, "dbus-service", &bool_value, BOOLEAN, false, _("Enable D-Bus service"), NULL, NULL);
Use primary selection as before Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-31 12:32:12 +02:00
string_value = "primary";
Make the X clipboard buffer configurable This patch adds a new configuration setting, selection-clipboard, which allows us to choose between the PRIMARY selection, and the CLIPBOARD selection, for determining which X clipboard to use for storing mouse-selected data. It has only two valid values: "primary" and "clipboard", with "clipboard" being set as the it's default value. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-08-31 06:18:31 +02:00
girara_setting_add(gsession, "selection-clipboard", string_value, STRING, false, _("The clipboard into which mouse-selected data will be written"), NULL, NULL);
Add setting to hide notifications after text selection
2014-08-07 20:50:58 +02:00
bool_value = true;
girara_setting_add(gsession, "selection-notification", &bool_value, BOOLEAN, false, _("Enable notification after selecting text"), NULL, NULL);
Begin to draw sc_follow results
2012-01-19 00:49:08 +01:00
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
#define DEFAULT_SHORTCUTS(mode) \
girara_shortcut_add(gsession, 0, GDK_KEY_a, NULL, sc_adjust_window, (mode), ZATHURA_ADJUST_BESTFIT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_s, NULL, sc_adjust_window, (mode), ZATHURA_ADJUST_WIDTH, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_F, NULL, sc_display_link, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_slash, NULL, sc_focus_inputbar, (mode), 0, &("/")); \
girara_shortcut_add(gsession, GDK_SHIFT_MASK, GDK_KEY_slash, NULL, sc_focus_inputbar, (mode), 0, &("/")); \
girara_shortcut_add(gsession, 0, GDK_KEY_question, NULL, sc_focus_inputbar, (mode), 0, &("?")); \
girara_shortcut_add(gsession, 0, GDK_KEY_colon, NULL, sc_focus_inputbar, (mode), 0, &(":")); \
girara_shortcut_add(gsession, 0, GDK_KEY_o, NULL, sc_focus_inputbar, (mode), 0, &(":open ")); \
girara_shortcut_add(gsession, 0, GDK_KEY_O, NULL, sc_focus_inputbar, (mode), APPEND_FILEPATH, &(":open ")); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_f, NULL, sc_follow, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, 0, "gg", sc_goto, (mode), TOP, NULL); \
girara_shortcut_add(gsession, 0, 0, "G", sc_goto, (mode), BOTTOM, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_m, NULL, sc_mark_add, (mode), 0, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_apostrophe, NULL, sc_mark_evaluate, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_J, NULL, sc_navigate, (mode), NEXT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_K, NULL, sc_navigate, (mode), PREVIOUS, NULL); \
girara_shortcut_add(gsession, GDK_MOD1_MASK, GDK_KEY_Right, NULL, sc_navigate, (mode), NEXT, NULL); \
girara_shortcut_add(gsession, GDK_MOD1_MASK, GDK_KEY_Left, NULL, sc_navigate, (mode), PREVIOUS, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_Page_Down, NULL, sc_navigate, (mode), NEXT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_Page_Up, NULL, sc_navigate, (mode), PREVIOUS, NULL); \
\
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_p, NULL, sc_print, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_r, NULL, sc_recolor, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_R, NULL, sc_reload, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_r, NULL, sc_rotate, (mode), ROTATE_CW, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_h, NULL, sc_scroll, (mode), LEFT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_j, NULL, sc_scroll, (mode), DOWN, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_k, NULL, sc_scroll, (mode), UP, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_l, NULL, sc_scroll, (mode), RIGHT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_Left, NULL, sc_scroll, (mode), LEFT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_Up, NULL, sc_scroll, (mode), UP, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_Down, NULL, sc_scroll, (mode), DOWN, NULL); \
Merge branch 'develop' into feature/presentation-mode Conflicts: config.c
2014-01-09 17:16:56 +01:00
girara_shortcut_add(gsession, 0, GDK_KEY_H, NULL, sc_scroll, (mode), PAGE_TOP, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_L, NULL, sc_scroll, (mode), PAGE_BOTTOM, NULL); \
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_scroll, (mode), RIGHT, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_t, NULL, sc_scroll, (mode), HALF_LEFT, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_d, NULL, sc_scroll, (mode), HALF_DOWN, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_u, NULL, sc_scroll, (mode), HALF_UP, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_y, NULL, sc_scroll, (mode), HALF_RIGHT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_t, NULL, sc_scroll, (mode), FULL_LEFT, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_f, NULL, sc_scroll, (mode), FULL_DOWN, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_b, NULL, sc_scroll, (mode), FULL_UP, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_y, NULL, sc_scroll, (mode), FULL_RIGHT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_scroll, (mode), FULL_DOWN, NULL); \
girara_shortcut_add(gsession, GDK_SHIFT_MASK, GDK_KEY_space, NULL, sc_scroll, (mode), FULL_UP, NULL); \
\
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_o, NULL, sc_jumplist, (mode), BACKWARD, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_i, NULL, sc_jumplist, (mode), FORWARD, NULL); \
\
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_j, NULL, sc_bisect, (mode), FORWARD, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_k, NULL, sc_bisect, (mode), BACKWARD, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_n, NULL, sc_search, (mode), FORWARD, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_N, NULL, sc_search, (mode), BACKWARD, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_Tab, NULL, sc_toggle_index, (mode), 0, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_n, NULL, girara_sc_toggle_statusbar, (mode), 0, NULL); \
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_m, NULL, girara_sc_toggle_inputbar, (mode), 0, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_d, NULL, sc_toggle_page_mode, (mode), 0, NULL); \
\
girara_shortcut_add(gsession, 0, GDK_KEY_q, NULL, sc_quit, (mode), 0, NULL); \
Add missing zoom key bindings
2014-01-09 21:39:16 +01:00
\
girara_shortcut_add(gsession, 0, GDK_KEY_plus, NULL, sc_zoom, (mode), ZOOM_IN, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_KP_Add, NULL, sc_zoom, (mode), ZOOM_IN, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_minus, NULL, sc_zoom, (mode), ZOOM_OUT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_KP_Subtract,NULL, sc_zoom, (mode), ZOOM_OUT, NULL); \
girara_shortcut_add(gsession, 0, GDK_KEY_equal, NULL, sc_zoom, (mode), ZOOM_SPECIFIC, NULL); \
girara_shortcut_add(gsession, 0, 0, "zi", sc_zoom, (mode), ZOOM_IN, NULL); \
girara_shortcut_add(gsession, 0, 0, "zI", sc_zoom, (mode), ZOOM_IN, NULL); \
girara_shortcut_add(gsession, 0, 0, "zo", sc_zoom, (mode), ZOOM_OUT, NULL); \
girara_shortcut_add(gsession, 0, 0, "zO", sc_zoom, (mode), ZOOM_OUT, NULL); \
girara_shortcut_add(gsession, 0, 0, "z0", sc_zoom, (mode), ZOOM_ORIGINAL, NULL); \
girara_shortcut_add(gsession, 0, 0, "zz", sc_zoom, (mode), ZOOM_SPECIFIC, NULL); \
girara_shortcut_add(gsession, 0, 0, "zZ", sc_zoom, (mode), ZOOM_SPECIFIC, NULL);
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
#define DEFAULT_MOUSE_EVENTS(mode) \
Implement smooth scroll and smooth zoom
2014-07-05 18:13:50 +02:00
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_UP, UP, NULL); \
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_DOWN, DOWN, NULL); \
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_LEFT, LEFT, NULL); \
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_RIGHT, RIGHT, NULL); \
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_BIDIRECTIONAL, BIDIRECTIONAL, NULL); \
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
\
girara_mouse_event_add(gsession, GDK_SHIFT_MASK, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_UP, LEFT, NULL); \
girara_mouse_event_add(gsession, GDK_SHIFT_MASK, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_SCROLL_DOWN, RIGHT, NULL); \
\
Implement smooth scroll and smooth zoom
2014-07-05 18:13:50 +02:00
girara_mouse_event_add(gsession, GDK_CONTROL_MASK, 0, sc_mouse_zoom, (mode), GIRARA_EVENT_SCROLL_UP, UP, NULL); \
girara_mouse_event_add(gsession, GDK_CONTROL_MASK, 0, sc_mouse_zoom, (mode), GIRARA_EVENT_SCROLL_DOWN, DOWN, NULL); \
girara_mouse_event_add(gsession, GDK_CONTROL_MASK, 0, sc_mouse_zoom, (mode), GIRARA_EVENT_SCROLL_BIDIRECTIONAL, BIDIRECTIONAL, NULL); \
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
girara_mouse_event_add(gsession, 0, GIRARA_MOUSE_BUTTON2, sc_mouse_scroll, (mode), GIRARA_EVENT_BUTTON_PRESS, 0, NULL); \
girara_mouse_event_add(gsession, GDK_BUTTON2_MASK, GIRARA_MOUSE_BUTTON2, sc_mouse_scroll, (mode), GIRARA_EVENT_BUTTON_RELEASE, 0, NULL); \
girara_mouse_event_add(gsession, GDK_BUTTON2_MASK, 0, sc_mouse_scroll, (mode), GIRARA_EVENT_MOTION_NOTIFY, 0, NULL); \
Add shortcuts for ^C and Esc in all modes This should fix #392 and hopefully doesn't break anything else. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-02-14 12:59:25 +01:00
/* Define mode-less shortcuts
* girara adds them only for normal mode, so passing 0 as mode is currently
* not enough. We need to add/override for every mode. */
for (size_t idx = 0; idx != LENGTH(all_modes); ++idx) {
girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_c, NULL, sc_abort, all_modes[idx], 0, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Escape, NULL, sc_abort, all_modes[idx], 0, NULL);
}
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
/* Normal mode */
girara_shortcut_add(gsession, 0, GDK_KEY_F5, NULL, sc_toggle_presentation, NORMAL, 0, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_F11, NULL, sc_toggle_fullscreen, NORMAL, 0, NULL);
DEFAULT_SHORTCUTS(NORMAL)
/* Normal mode - Mouse events */
DEFAULT_MOUSE_EVENTS(NORMAL)
/* Fullscreen mode */
girara_shortcut_add(gsession, 0, GDK_KEY_F11, NULL, sc_toggle_fullscreen, FULLSCREEN, 0, NULL);
DEFAULT_SHORTCUTS(FULLSCREEN)
/* Fullscreen mode - Mouse events */
DEFAULT_MOUSE_EVENTS(FULLSCREEN)
/* Index mode */
girara_shortcut_add(gsession, 0, GDK_KEY_Tab, NULL, sc_toggle_index, INDEX, 0, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_k, NULL, sc_navigate_index, INDEX, UP, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_j, NULL, sc_navigate_index, INDEX, DOWN, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_h, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_l, NULL, sc_navigate_index, INDEX, EXPAND, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_L, NULL, sc_navigate_index, INDEX, EXPAND_ALL, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_H, NULL, sc_navigate_index, INDEX, COLLAPSE_ALL, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Up, NULL, sc_navigate_index, INDEX, UP, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Down, NULL, sc_navigate_index, INDEX, DOWN, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Left, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_navigate_index, INDEX, EXPAND, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_navigate_index, INDEX, SELECT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Return, NULL, sc_navigate_index, INDEX, SELECT, NULL);
Implement G and gg for index mode Closes: #52 Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-10 17:45:36 +01:00
girara_shortcut_add(gsession, 0, 0, "gg", sc_navigate_index, INDEX, TOP, NULL);
girara_shortcut_add(gsession, 0, 0, "G", sc_navigate_index, INDEX, BOTTOM, NULL);
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
/* Presentation mode */
girara_shortcut_add(gsession, 0, GDK_KEY_J, NULL, sc_navigate, PRESENTATION, NEXT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Down, NULL, sc_navigate, PRESENTATION, NEXT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_navigate, PRESENTATION, NEXT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Page_Down, NULL, sc_navigate, PRESENTATION, NEXT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_navigate, PRESENTATION, NEXT, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_K, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Left, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Up, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_Page_Up, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, GDK_SHIFT_MASK, GDK_KEY_space, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_BackSpace, NULL, sc_navigate, PRESENTATION, PREVIOUS, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_F5, NULL, sc_toggle_presentation, PRESENTATION, 0, NULL);
girara_shortcut_add(gsession, 0, GDK_KEY_q, NULL, sc_quit, PRESENTATION, 0, NULL);
/* Presentation mode - Mouse events */
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_UP, UP, NULL);
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_DOWN, DOWN, NULL);
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_LEFT, LEFT, NULL);
girara_mouse_event_add(gsession, 0, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_RIGHT, RIGHT, NULL);
girara_mouse_event_add(gsession, 0, GIRARA_MOUSE_BUTTON1, sc_navigate, PRESENTATION, GIRARA_EVENT_BUTTON_PRESS, NEXT, NULL);
girara_mouse_event_add(gsession, 0, GIRARA_MOUSE_BUTTON3, sc_navigate, PRESENTATION, GIRARA_EVENT_BUTTON_PRESS, PREVIOUS, NULL);
girara_mouse_event_add(gsession, GDK_SHIFT_MASK, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_UP, LEFT, NULL);
girara_mouse_event_add(gsession, GDK_SHIFT_MASK, 0, sc_mouse_scroll, PRESENTATION, GIRARA_EVENT_SCROLL_DOWN, RIGHT, NULL);
girara_mouse_event_add(gsession, GDK_CONTROL_MASK, 0, sc_mouse_zoom, PRESENTATION, GIRARA_EVENT_SCROLL_UP, UP, NULL);
girara_mouse_event_add(gsession, GDK_CONTROL_MASK, 0, sc_mouse_zoom, PRESENTATION, GIRARA_EVENT_SCROLL_DOWN, DOWN, NULL);
Complete printer list and execute command
2010-11-29 14:58:56 +01:00
Overwrite abort inputbar bindings
2012-09-03 10:30:25 +02:00
/* inputbar shortcuts */
girara_inputbar_shortcut_add(gsession, 0, GDK_KEY_Escape, sc_abort, 0, NULL);
girara_inputbar_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_c, sc_abort, 0, NULL);
Complete printer list and execute command
2010-11-29 14:58:56 +01:00
/* define default inputbar commands */
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
girara_inputbar_command_add(gsession, "bmark", NULL, cmd_bookmark_create, NULL, _("Add a bookmark"));
girara_inputbar_command_add(gsession, "bdelete", NULL, cmd_bookmark_delete, cc_bookmarks, _("Delete a bookmark"));
girara_inputbar_command_add(gsession, "blist", NULL, cmd_bookmark_open, cc_bookmarks, _("List all bookmarks"));
girara_inputbar_command_add(gsession, "close", NULL, cmd_close, NULL, _("Close current file"));
girara_inputbar_command_add(gsession, "info", NULL, cmd_info, NULL, _("Show file information"));
Implement cmd_exec with
2012-08-14 11:45:11 +02:00
girara_inputbar_command_add(gsession, "exec", NULL, cmd_exec, NULL, _("Execute a command"));
Add vim style exec Thanks to bashseb for the patch. Closes: #423 Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-09-27 01:37:31 +02:00
girara_inputbar_command_add(gsession, "!", NULL, cmd_exec, NULL, _("Execute a command")); /* like vim */
Implement hlsearch/nohlsearch
2012-04-22 19:12:45 +02:00
girara_inputbar_command_add(gsession, "help", NULL, cmd_help, NULL, _("Show help"));
girara_inputbar_command_add(gsession, "open", "o", cmd_open, cc_open, _("Open document"));
girara_inputbar_command_add(gsession, "quit", "q", cmd_quit, NULL, _("Close zathura"));
girara_inputbar_command_add(gsession, "print", NULL, cmd_print, NULL, _("Print document"));
girara_inputbar_command_add(gsession, "write", NULL, cmd_save, cc_write, _("Save document"));
girara_inputbar_command_add(gsession, "write!", NULL, cmd_savef, cc_write, _("Save document (and force overwriting)"));
girara_inputbar_command_add(gsession, "export", NULL, cmd_export, cc_export, _("Save attachments"));
girara_inputbar_command_add(gsession, "offset", NULL, cmd_offset, NULL, _("Set page offset"));
girara_inputbar_command_add(gsession, "mark", NULL, cmd_marks_add, NULL, _("Mark current location within the document"));
girara_inputbar_command_add(gsession, "delmarks", "delm", cmd_marks_delete, NULL, _("Delete the specified marks"));
girara_inputbar_command_add(gsession, "nohlsearch", "nohl", cmd_nohlsearch, NULL, _("Don't highlight current search results"));
girara_inputbar_command_add(gsession, "hlsearch", NULL, cmd_hlsearch, NULL, _("Highlight current search results"));
Implement :version command
2012-06-13 16:08:33 +02:00
girara_inputbar_command_add(gsession, "version", NULL, cmd_version, NULL, _("Show version information"));
implement :export
2012-01-13 18:54:09 +01:00
Some clean up Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-06 15:34:17 +01:00
girara_special_command_add(gsession, '/', cmd_search, INCREMENTAL_SEARCH, FORWARD, NULL);
girara_special_command_add(gsession, '?', cmd_search, INCREMENTAL_SEARCH, BACKWARD, NULL);
Added cmd_search
2011-10-22 16:35:38 +02:00
Add shortcut mappings
2011-05-07 00:39:34 +02:00
/* add shortcut mappings */
girara_shortcut_mapping_add(gsession, "abort", sc_abort);
girara_shortcut_mapping_add(gsession, "adjust_window", sc_adjust_window);
girara_shortcut_mapping_add(gsession, "change_mode", sc_change_mode);
Add new shortcut function to display links This is useful when the text of the link doesn't match its target. The default key is set to 'F'. See issue 266 <http://bugs.pwmt.org/issue266>. Reported-by: Iron <o380770@rtrtr.com> Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-12-07 16:03:43 +01:00
girara_shortcut_mapping_add(gsession, "display_link", sc_display_link);
Declare missing shortcut functions and document them "focus_inputbar" and "toggle_page_mode" were defined in code but not declared as shortcut functions (and thus could not be mapped to different keys by the user using "map"). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-12-08 17:00:27 +01:00
girara_shortcut_mapping_add(gsession, "focus_inputbar", sc_focus_inputbar);
Add shortcut mappings
2011-05-07 00:39:34 +02:00
girara_shortcut_mapping_add(gsession, "follow", sc_follow);
girara_shortcut_mapping_add(gsession, "goto", sc_goto);
Update the shortcut functions list in documentation Also alphabetize the shortcut functions declarations in code, to make it easier to keep the documentation and code in sync. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-12-08 17:00:26 +01:00
girara_shortcut_mapping_add(gsession, "jumplist", sc_jumplist);
bisect functionality to navigate documents This uses the jumplist to implement a bisect functionality between the last two jump points. ^j and ^k are bound to bisect forward and backward respectively. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2013-03-31 13:10:48 +02:00
girara_shortcut_mapping_add(gsession, "bisect", sc_bisect);
Add shortcut mappings
2011-05-07 00:39:34 +02:00
girara_shortcut_mapping_add(gsession, "navigate", sc_navigate);
Update the shortcut functions list in documentation Also alphabetize the shortcut functions declarations in code, to make it easier to keep the documentation and code in sync. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-12-08 17:00:26 +01:00
girara_shortcut_mapping_add(gsession, "navigate_index", sc_navigate_index);
Implement sc_print
2012-05-08 16:47:34 +02:00
girara_shortcut_mapping_add(gsession, "print", sc_print);
Add shortcut mappings
2011-05-07 00:39:34 +02:00
girara_shortcut_mapping_add(gsession, "quit", sc_quit);
girara_shortcut_mapping_add(gsession, "recolor", sc_recolor);
girara_shortcut_mapping_add(gsession, "reload", sc_reload);
girara_shortcut_mapping_add(gsession, "rotate", sc_rotate);
girara_shortcut_mapping_add(gsession, "scroll", sc_scroll);
girara_shortcut_mapping_add(gsession, "search", sc_search);
girara_shortcut_mapping_add(gsession, "toggle_fullscreen", sc_toggle_fullscreen);
Replace fullscreen mode with presentation mode
2013-11-25 23:10:35 +01:00
girara_shortcut_mapping_add(gsession, "toggle_presentation", sc_toggle_presentation);
Add shortcut mappings
2011-05-07 00:39:34 +02:00
girara_shortcut_mapping_add(gsession, "toggle_index", sc_toggle_index);
Use giraras toggle functions
2011-06-23 14:31:41 +02:00
girara_shortcut_mapping_add(gsession, "toggle_inputbar", girara_sc_toggle_inputbar);
Declare missing shortcut functions and document them "focus_inputbar" and "toggle_page_mode" were defined in code but not declared as shortcut functions (and thus could not be mapped to different keys by the user using "map"). Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-12-08 17:00:27 +01:00
girara_shortcut_mapping_add(gsession, "toggle_page_mode", sc_toggle_page_mode);
Use giraras toggle functions
2011-06-23 14:31:41 +02:00
girara_shortcut_mapping_add(gsession, "toggle_statusbar", girara_sc_toggle_statusbar);
Add shortcut mappings
2011-05-07 00:39:34 +02:00
girara_shortcut_mapping_add(gsession, "zoom", sc_zoom);
Add some argument mappings
2011-12-06 11:21:48 +01:00
/* add argument mappings */
add shortcut mappings for jumplist to make it configurable thx From d93f241584263414a2938748369bc92152ce9f88 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch <coroa@online.de> Date: Sun, 16 Sep 2012 16:14:28 +0200 Subject: [PATCH] add shortcut mappings for jumplist to make it configurable Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-09-16 16:25:40 +02:00
girara_argument_mapping_add(gsession, "backward", BACKWARD);
Style changes and additional parseable arguments
2012-02-21 17:11:59 +01:00
girara_argument_mapping_add(gsession, "bottom", BOTTOM);
girara_argument_mapping_add(gsession, "default", DEFAULT);
girara_argument_mapping_add(gsession, "collapse", COLLAPSE);
girara_argument_mapping_add(gsession, "collapse-all", COLLAPSE_ALL);
girara_argument_mapping_add(gsession, "down", DOWN);
girara_argument_mapping_add(gsession, "expand", EXPAND);
girara_argument_mapping_add(gsession, "expand-all", EXPAND_ALL);
Add mapping for SELECT Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-10 14:52:07 +01:00
girara_argument_mapping_add(gsession, "select", SELECT);
Implement TOGGLE for sc_navigate_index Closes: #396 Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2014-01-10 14:52:51 +01:00
girara_argument_mapping_add(gsession, "toggle", TOGGLE);
add shortcut mappings for jumplist to make it configurable thx From d93f241584263414a2938748369bc92152ce9f88 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch <coroa@online.de> Date: Sun, 16 Sep 2012 16:14:28 +0200 Subject: [PATCH] add shortcut mappings for jumplist to make it configurable Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
2012-09-16 16:25:40 +02:00
girara_argument_mapping_add(gsession, "forward", FORWARD);
Style changes and additional parseable arguments
2012-02-21 17:11:59 +01:00
girara_argument_mapping_add(gsession, "full-down", FULL_DOWN);
girara_argument_mapping_add(gsession, "full-up", FULL_UP);
girara_argument_mapping_add(gsession, "half-down", HALF_DOWN);
girara_argument_mapping_add(gsession, "half-up", HALF_UP);
add the ability to horizontally scroll half or full screen
2012-02-25 14:31:35 +01:00
girara_argument_mapping_add(gsession, "full-right", FULL_RIGHT);
girara_argument_mapping_add(gsession, "full-left", FULL_LEFT);
girara_argument_mapping_add(gsession, "half-right", HALF_RIGHT);
girara_argument_mapping_add(gsession, "half-left", HALF_LEFT);
Style changes and additional parseable arguments
2012-02-21 17:11:59 +01:00
girara_argument_mapping_add(gsession, "in", ZOOM_IN);
girara_argument_mapping_add(gsession, "left", LEFT);
girara_argument_mapping_add(gsession, "next", NEXT);
girara_argument_mapping_add(gsession, "out", ZOOM_OUT);
Implement shortcuts for scrolling to page top/bottom
2013-12-17 15:34:40 +01:00
girara_argument_mapping_add(gsession, "page-top", PAGE_TOP);
girara_argument_mapping_add(gsession, "page-bottom", PAGE_BOTTOM);
Style changes and additional parseable arguments
2012-02-21 17:11:59 +01:00
girara_argument_mapping_add(gsession, "previous", PREVIOUS);
girara_argument_mapping_add(gsession, "right", RIGHT);
girara_argument_mapping_add(gsession, "specific", ZOOM_SPECIFIC);
girara_argument_mapping_add(gsession, "top", TOP);
girara_argument_mapping_add(gsession, "up", UP);
Introduce and use zathura_document wrapper functions
2012-03-27 21:59:35 +02:00
girara_argument_mapping_add(gsession, "best-fit", ZATHURA_ADJUST_BESTFIT);
girara_argument_mapping_add(gsession, "width", ZATHURA_ADJUST_WIDTH);
Add argument to rotate to support counter-clockwise rotation (Closes: #154)
2012-03-19 11:43:07 +01:00
girara_argument_mapping_add(gsession, "rotate-cw", ROTATE_CW);
girara_argument_mapping_add(gsession, "rotate-ccw", ROTATE_CCW);
Begin to test config structure
2010-11-12 13:48:18 +01:00
}
Load configuration files
2011-04-01 09:55:37 +02:00
void
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
config_load_files(zathura_t* zathura)
Load configuration files
2011-04-01 09:55:37 +02:00
{
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
/* load global configuration files */
char* config_path = girara_get_xdg_path(XDG_CONFIG_DIRS);
girara_list_t* config_dirs = girara_split_path_array(config_path);
ssize_t size = girara_list_size(config_dirs) - 1;
for (; size >= 0; --size) {
const char* dir = girara_list_nth(config_dirs, size);
char* file = g_build_filename(dir, ZATHURA_RC, NULL);
girara_config_parse(zathura->ui.session, file);
g_free(file);
Load configuration files
2011-04-01 09:55:37 +02:00
}
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
girara_list_free(config_dirs);
g_free(config_path);
girara_config_parse(zathura->ui.session, GLOBAL_RC);
Load configuration files
2011-04-01 09:55:37 +02:00
Move config file loading to config.c
2014-01-06 16:02:58 +01:00
/* load local configuration files */
char* configuration_file = g_build_filename(zathura->config.config_dir, ZATHURA_RC, NULL);
girara_config_parse(zathura->ui.session, configuration_file);
g_free(configuration_file);
Load configuration files
2011-04-01 09:55:37 +02:00
}
Reference in a new issue Copy permalink