Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When opening the choose splits dialog, open in the last used folder. #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

When opening the choose splits dialog, open in the last used folder. #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe395c
When opening the choose splits dialog, open in the last used folder.
Thue Jun 25, 2020
0dea7ca
Fix compiler warnings.
Thue Jun 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions bind.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ static GSList *bindings = NULL;
static guint32 last_event_time = 0;
static gboolean processing_event = FALSE;

static GdkKeymap *
getKeymap() {
GdkWindow *rootwin = gdk_get_default_root_window ();
GdkDisplay *display = gdk_window_get_display(rootwin);
GdkKeymap *keymap = gdk_keymap_get_for_display(display);

return keymap;
}

/* Return the modifier mask that needs to be pressed to produce key in the
* given group (keyboard layout) and level ("shift level").
*/
Expand Down Expand Up @@ -136,6 +145,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
{
guint i;
gboolean success = FALSE;
GdkDisplay *display = gdk_window_get_display(rootwin);

/* Ignorable modifiers */
guint mod_masks [] = {
Expand All @@ -145,7 +155,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
GDK_MOD2_MASK | GDK_LOCK_MASK,
};

gdk_error_trap_push ();
gdk_x11_display_error_trap_push (display);

for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
if (grab) {
Expand All @@ -163,8 +173,8 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
GDK_WINDOW_XID (rootwin));
}
}
gdk_flush();
if (gdk_error_trap_pop()) {
gdk_display_flush(display);
if (gdk_x11_display_error_trap_pop(display)) {
TRACE (g_warning ("Failed grab/ungrab"));
if (grab) {
/* On error, immediately release keys again */
Expand Down Expand Up @@ -201,7 +211,7 @@ grab_ungrab (GdkWindow *rootwin,
XkbAllClientInfoMask,
XkbUseCoreKbd);

map = gdk_keymap_get_default();
map = getKeymap();
gdk_keymap_get_entries_for_keyval(map, keyval, &keys, &n_keys);

if (n_keys == 0)
Expand Down Expand Up @@ -281,7 +291,7 @@ do_grab_key (struct Binding *binding)
{
gboolean success;
GdkWindow *rootwin = gdk_get_default_root_window ();
GdkKeymap *keymap = gdk_keymap_get_default ();
GdkKeymap *keymap = getKeymap ();


GdkModifierType modifiers;
Expand Down Expand Up @@ -321,7 +331,7 @@ do_grab_key (struct Binding *binding)
static gboolean
do_ungrab_key (struct Binding *binding)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
GdkKeymap *keymap = getKeymap ();
GdkWindow *rootwin = gdk_get_default_root_window ();
GdkModifierType modifiers;

Expand All @@ -343,7 +353,7 @@ static GdkFilterReturn
filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
{
XEvent *xevent = (XEvent *) gdk_xevent;
GdkKeymap *keymap = gdk_keymap_get_default();
GdkKeymap *keymap = getKeymap();
guint keyval;
GdkModifierType consumed, modifiers;
guint mod_mask = gtk_accelerator_get_default_mod_mask();
Expand Down Expand Up @@ -449,7 +459,7 @@ keymap_changed (GdkKeymap *map)
void
keybinder_init ()
{
GdkKeymap *keymap = gdk_keymap_get_default ();
GdkKeymap *keymap = getKeymap ();
GdkWindow *rootwin = gdk_get_default_root_window ();

gdk_window_add_filter (rootwin, filter_func, rootwin);
Expand Down
31 changes: 18 additions & 13 deletions urn-gtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,11 +550,10 @@ G_DEFINE_TYPE(UrnApp, urn_app, GTK_TYPE_APPLICATION);
static void open_activated(GSimpleAction *action,
GVariant *parameter,
gpointer app) {
char splits_path[256];
gchar *splits_folder;
GList *windows;
UrnAppWindow *win;
GtkWidget *dialog;
struct stat st = {0};
gint res;

windows = gtk_application_get_windows(GTK_APPLICATION(app));
Expand All @@ -568,22 +567,28 @@ static void open_activated(GSimpleAction *action,
"_Cancel", GTK_RESPONSE_CANCEL,
"_Open", GTK_RESPONSE_ACCEPT,
NULL);

strcpy(splits_path, win->data_path);
strcat(splits_path, "/splits");
if (stat(splits_path, &st) == -1) {
mkdir(splits_path, 0700);
}

GSettings *settings = g_settings_new("wildmouse.urn");
splits_folder = g_settings_get_string(settings, "splits-folder");
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
splits_path);
splits_folder);
g_free(splits_folder);

res = gtk_dialog_run(GTK_DIALOG(dialog));
if (res == GTK_RESPONSE_ACCEPT) {
char *filename;
gchar *filename;
GtkFileChooser *chooser = GTK_FILE_CHOOSER(dialog);
filename = gtk_file_chooser_get_filename(chooser);
urn_app_window_open(win, filename);
g_free(filename);
gchar *folder;

//open dialog in same folder next time
folder = gtk_file_chooser_get_current_folder(chooser);
gint res2 = g_settings_set_string(settings, "splits-folder", folder);
g_free(folder);
if (res2) {
filename = gtk_file_chooser_get_filename(chooser);
urn_app_window_open(win, filename);
g_free(filename);
}
}
gtk_widget_destroy(dialog);
}
Expand Down
5 changes: 5 additions & 0 deletions urn-gtk.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,10 @@
<summary>Toggle window decorations keybind</summary>
<description>Key for toggling window decorations.</description>
</key>
<key name="splits-folder" type="s">
<default>'~/.urn'</default>
<summary>Splits folder</summary>
<description>When choosing a splits file, file dialog starts in this folder (auto-updated to last folder you used)</description>
</key>
</schema>
</schemalist>