Skip to content

Commit

Permalink
Merge pull request #91 from regolith-linux/feat-source-formatting
Browse files Browse the repository at this point in the history 
feat: specify a source format standard
  • Loading branch information
@kgilmer
kgilmer authored Sep 7, 2024
2 parents a5d642c + 5e05ea3 commit 33d8a51
Show file tree
Hide file tree
Showing 20 changed files with 1,033 additions and 1,071 deletions.
20 changes: 14 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,21 @@ This page uses the comment format specified by [Remontoire](https://github.com/r

Ilia uses `meson` and `ninja` to build. Example:

```shell
git clone https://github.com/regolith-linux/ilia.git
mkdir ilia/build
cd ilia/build
meson ..
ninja
src/ilia
```
$ git clone https://github.com/regolith-linux/ilia.git
$ mkdir ilia/build
$ cd ilia/build
$ meson ..
$ ninja
$ src/ilia

## Lint

### Uncrustify

```shell
ninja fixstyle
```

## Package
Expand Down
9 changes: 9 additions & 0 deletions meson.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,12 @@ meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','
install_data('data/org.regolith-linux.ilia.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
meson.add_install_script('meson_scripts/install_schemas.sh')
subdir('src')

uncrustify = find_program('uncrustify', required : false)
if uncrustify.found()
run_target('fixstyle',
command : [
'meson_scripts/uncrustify.sh',
],
)
endif # uncrustify
3 changes: 3 additions & 0 deletions meson_scripts/uncrustify.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

uncrustify -c $MESON_SOURCE_ROOT/uncrustify.cfg --no-backup --replace $(find $MESON_SOURCE_ROOT/src/ -name \*.vala)
168 changes: 80 additions & 88 deletions src/Application.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,110 +2,107 @@ using Gtk;

namespace Ilia {
class Application : Gtk.Application {
private GLib.HashTable<string, string?> arg_map;
private GLib.HashTable<string, string ?> arg_map;

public Application () {
Object (
application_id: "org.regolith.launcher",
flags: ApplicationFlags.REPLACE | ApplicationFlags.ALLOW_REPLACEMENT
Object(
application_id: "org.regolith.launcher",
flags: ApplicationFlags.REPLACE | ApplicationFlags.ALLOW_REPLACEMENT
);
}

protected override bool local_command_line (ref unowned string[] args, out int exit_status) {
this.arg_map = parse_args (args);
if (arg_map.contains ("-h") || arg_map.contains ("--help")) print_help_and_exit ();
if (arg_map.contains ("-v") || arg_map.contains ("--version")) print_version_and_exit ();
protected override bool local_command_line(ref unowned string[] args, out int exit_status) {
this.arg_map = parse_args(args);
if (arg_map.contains("-h") || arg_map.contains("--help"))print_help_and_exit ();
if (arg_map.contains("-v") || arg_map.contains("--version"))print_version_and_exit ();
args[0] = null;
return base.local_command_line (ref args, out exit_status);
return base.local_command_line(ref args, out exit_status);
}

protected override void activate () {
protected override void activate() {
// Get session type (wayland or x11) and set the flag
string session_type = Environment.get_variable ("XDG_SESSION_TYPE");
string gdk_backend = Environment.get_variable ("GDK_BACKEND");
string session_type = Environment.get_variable("XDG_SESSION_TYPE");
string gdk_backend = Environment.get_variable("GDK_BACKEND");
var is_wayland_session = session_type == "wayland" && gdk_backend != "x11";

// Set window manager
string sway_sock = Environment.get_variable ("SWAYSOCK");
string i3_sock = Environment.get_variable ("I3SOCK");
string sway_sock = Environment.get_variable("SWAYSOCK");
string i3_sock = Environment.get_variable("I3SOCK");

string wm_name = "Unknown";
if (sway_sock != null) {
if (sway_sock != null)
wm_name = "sway";
} else if (i3_sock != null) {
else if (i3_sock != null)
wm_name = "i3";
}

var window = new Ilia.DialogWindow (this.arg_map, is_wayland_session, wm_name);
window.set_application (this);
var window = new Ilia.DialogWindow(this.arg_map, is_wayland_session, wm_name);
window.set_application(this);

// Grab inputs from wayland backend before showing window
if (is_wayland_session) {
bool is_layer_shell_supported = GtkLayerShell.is_supported ();
if (!is_layer_shell_supported) {
stderr.printf ("The wayland compositor does not support the layer-shell protocol, aborting.");
Process.exit (1);
stderr.printf("The wayland compositor does not support the layer-shell protocol, aborting.");
Process.exit(1);
}
GtkLayerShell.init_for_window (window);
GtkLayerShell.init_for_window(window);
GtkLayerShell.set_layer(window, GtkLayerShell.Layer.OVERLAY);
GtkLayerShell.set_keyboard_mode (window, GtkLayerShell.KeyboardMode.EXCLUSIVE);
GtkLayerShell.set_keyboard_mode(window, GtkLayerShell.KeyboardMode.EXCLUSIVE);
}

initialize_style (window, arg_map);
initialize_style(window, arg_map);
window.show_all ();

// Grab inputs from X11 backend after showing window
if (!is_wayland_session) {
Gdk.Window gdkwin = window.get_window ();
var seat = grab_inputs (gdkwin);
var seat = grab_inputs(gdkwin);
if (seat == null) {
stderr.printf ("Failed to aquire access to input devices, aborting.");
Process.exit (1);
stderr.printf("Failed to aquire access to input devices, aborting.");
Process.exit(1);
}
window.set_seat (seat);
window.set_seat(seat);
}

// Handle mouse clicks by determining if a click is in or out of bounds
// If we get a mouse click out of bounds of the window, exit.
window.button_press_event.connect ((event) => {
window.button_press_event.connect((event) => {
int window_width = 0, window_height = 0;
window.get_size (out window_width, out window_height);
window.get_size(out window_width, out window_height);

int mouse_x = (int) event.x;
int mouse_y = (int) event.y;

var click_out_bounds = ((mouse_x < 0 || mouse_y < 0) || (mouse_x > window_width || mouse_y > window_height));

if (click_out_bounds) {
if (click_out_bounds)
window.quit ();
}

return !click_out_bounds;
});

}

private void initialize_style (Gtk.Window window, HashTable<string, string ? > arg_map) {
private void initialize_style(Gtk.Window window, HashTable<string, string ?> arg_map) {
try {
if (arg_map.contains ("-t") && arg_map.get ("-t") != null) {
var file = File.new_for_path (arg_map.get ("-t"));
if (arg_map.contains("-t") && arg_map.get("-t") != null) {
var file = File.new_for_path(arg_map.get("-t"));

if (!file.query_exists ()) {
printerr ("File '%s' does not exist.\n", file.get_path ());
Process.exit (1);
printerr("File '%s' does not exist.\n", file.get_path ());
Process.exit(1);
}
Gtk.CssProvider css_provider = new Gtk.CssProvider ();
css_provider.load_from_file (file);
css_provider.load_from_file(file);

Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
} else if (!arg_map.contains ("-n")) {
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
} else if (!arg_map.contains("-n")) {
Gtk.CssProvider css_provider = new Gtk.CssProvider ();
css_provider.load_from_data ((string) default_css);
css_provider.load_from_data((string) default_css);

Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
}
} catch (GLib.Error ex) {
error ("Failed to initalize style: " + ex.message);
error("Failed to initalize style: " + ex.message);
}
}

Expand All @@ -114,16 +111,16 @@ namespace Ilia {
// As a workaround, this function will continue to attempt to grab these resources over an
// increasing time window and eventually give up and exit if ultimately unable to aquire
// the keyboard and mouse resources.
Gdk.Seat ? grab_inputs (Gdk.Window gdkwin) {
Gdk.Seat ? grab_inputs(Gdk.Window gdkwin) {
var display = gdkwin.get_display (); // Gdk.Display.get_default();
if (display == null) {
stderr.printf ("Failed to get Display\n");
stderr.printf("Failed to get Display\n");
return null;
}

var seat = display.get_default_seat ();
if (seat == null) {
stdout.printf ("Failed to get Seat from Display\n");
stdout.printf("Failed to get Seat from Display\n");
return null;
}

Expand All @@ -132,78 +129,75 @@ namespace Ilia {
int wait_time = 1000;

do {
grabStatus = seat.grab (gdkwin, Gdk.SeatCapabilities.KEYBOARD | Gdk.SeatCapabilities.POINTER, true, null, null, null);
grabStatus = seat.grab(gdkwin, Gdk.SeatCapabilities.KEYBOARD | Gdk.SeatCapabilities.POINTER, true, null, null, null);
if (grabStatus != Gdk.GrabStatus.SUCCESS) {
attempt++;
wait_time = wait_time * 2;
GLib.Thread.usleep (wait_time);
GLib.Thread.usleep(wait_time);
}
} while (grabStatus != Gdk.GrabStatus.SUCCESS && attempt < 8);

if (grabStatus != Gdk.GrabStatus.SUCCESS) {
stderr.printf ("Aborting, failed to grab input: %d\n", grabStatus);
stderr.printf("Aborting, failed to grab input: %d\n", grabStatus);
return null;
} else {
return seat;
}
}

void print_help_and_exit () {
stdout.printf ("Usage: ilia [-t stylesheet] [-n] [-a] [-p page]\n");
stdout.printf ("\n\t-t: specify path to custom stylesheet.\n");
stdout.printf ("\n\t-n: no custom styles\n");
stdout.printf ("\n\t-a: load all pages\n");
stdout.printf ("\npages:\n");
stdout.printf ("\t'apps' - launch desktop applications (default)\n");
stdout.printf ("\t'terminal' - launch a terminal command\n");
stdout.printf ("\t'notifications' - launch notifications manager\n");
stdout.printf ("\t'keybindings' - launch keybindings viewer\n");
stdout.printf ("\t'textlist' - select an item from a specified list\n");
stdout.printf ("\t\t-l: page label\n");
stdout.printf ("\t\t-i: page/item icon\n");
stdout.printf ("\t\t-n: no icon\n");
stdout.printf ("\t'windows' - navigate to a window\n");
stdout.printf ("\t'tracker' - search for files by content\n");
Process.exit (0);
void print_help_and_exit() {
stdout.printf("Usage: ilia [-t stylesheet] [-n] [-a] [-p page]\n");
stdout.printf("\n\t-t: specify path to custom stylesheet.\n");
stdout.printf("\n\t-n: no custom styles\n");
stdout.printf("\n\t-a: load all pages\n");
stdout.printf("\npages:\n");
stdout.printf("\t'apps' - launch desktop applications (default)\n");
stdout.printf("\t'terminal' - launch a terminal command\n");
stdout.printf("\t'notifications' - launch notifications manager\n");
stdout.printf("\t'keybindings' - launch keybindings viewer\n");
stdout.printf("\t'textlist' - select an item from a specified list\n");
stdout.printf("\t\t-l: page label\n");
stdout.printf("\t\t-i: page/item icon\n");
stdout.printf("\t\t-n: no icon\n");
stdout.printf("\t'windows' - navigate to a window\n");
stdout.printf("\t'tracker' - search for files by content\n");
Process.exit(0);
}

void print_version_and_exit () {
stdout.printf ("ilia version 0.12\n");
Process.exit (0);
void print_version_and_exit() {
stdout.printf("ilia version 0.12\n");
Process.exit(0);
}

/**
* Convert ["-v", "-s", "asdf", "-f", "qwe"] => {("-v", null), ("-s", "adsf"), ("-f", "qwe")}
* Populates key of "cmd" with first arg.
* NOTE: Currently does not support quoted parameter values.
*/
HashTable<string, string ? > parse_args (string[] args) {
var arg_hashtable = new HashTable<string, string ? >(str_hash, str_equal);
HashTable<string, string ?> parse_args(string[] args) {
var arg_hashtable = new HashTable<string, string ?>(str_hash, str_equal);

if (args == null || args.length == 0) {
if (args == null || args.length == 0)
return arg_hashtable;
}

string last_key = null;
foreach (string token in args) {
if (!arg_hashtable.contains ("cmd")) {
arg_hashtable.set ("cmd", token);
} else if (is_key (token)) {
if (last_key != null) {
arg_hashtable.set (last_key, null);
}
if (!arg_hashtable.contains("cmd")) {
arg_hashtable.set("cmd", token);
} else if (is_key(token)) {
if (last_key != null)
arg_hashtable.set(last_key, null);
last_key = token;
} else if (last_key != null) {
arg_hashtable.set (last_key, token);
arg_hashtable.set(last_key, token);
last_key = null;
} else {
// ignore
}
}

if (last_key != null) { // Trailing single param
arg_hashtable.set (last_key, null);
}
if (last_key != null) // Trailing single param
arg_hashtable.set(last_key, null);
/*
foreach (var key in arg_hashtable.get_keys ()) {
stdout.printf ("%s => %s\n", key, arg_hashtable.lookup(key));
Expand All @@ -213,11 +207,9 @@ namespace Ilia {
return arg_hashtable;
}


bool is_key (string inval) {
return inval.has_prefix ("-");
bool is_key(string inval) {
return inval.has_prefix("-");
}
}

}

Loading

0 comments on commit 33d8a51

Please sign in to comment.