PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-25 13:55:34 -05:00
Code Releases Activity

Rename Dialogs -> Modes

Browse source 
Try to fix some of old syntax.
This commit is contained in:
Dave Davenport 2022-02-23 23:18:53 +01:00
parent 32d33ade16
commit 534aa6ad54
28 changed files with 215 additions and 248 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Makefile.am
View file

@ -80,15 +80,15 @@ SOURCES=\
source/xrmoptions.c\ source/xrmoptions.c\
source/xcb.c\ source/xcb.c\
source/css-colors.c\ source/css-colors.c\
source/dialogs/run.c\ source/modes/run.c\
source/dialogs/ssh.c\ source/modes/ssh.c\
source/dialogs/drun.c\ source/modes/drun.c\
source/dialogs/dmenu.c\ source/modes/dmenu.c\
source/dialogs/combi.c\ source/modes/combi.c\
source/dialogs/window.c\ source/modes/window.c\
source/dialogs/script.c\ source/modes/script.c\
source/dialogs/help-keys.c\ source/modes/help-keys.c\
source/dialogs/filebrowser.c\ source/modes/filebrowser.c\
include/display.h\ include/display.h\
include/xcb.h\ include/xcb.h\
include/xcb-internal.h\ include/xcb-internal.h\
@ -116,17 +116,17 @@ SOURCES=\
include/widgets/listview.h\ include/widgets/listview.h\
include/widgets/scrollbar.h\ include/widgets/scrollbar.h\
include/xrmoptions.h\ include/xrmoptions.h\
include/dialogs/ssh.h\ include/modes/ssh.h\
include/dialogs/run.h\ include/modes/run.h\
include/dialogs/drun.h\ include/modes/drun.h\
include/dialogs/dmenu.h\ include/modes/dmenu.h\
include/dialogs/combi.h\ include/modes/combi.h\
include/dialogs/script.h\ include/modes/script.h\
include/dialogs/window.h\ include/modes/window.h\
include/dialogs/dialogs.h\ include/modes/modes.h\
include/dialogs/help-keys.h\ include/modes/help-keys.h\
include/dialogs/filebrowser.h\ include/modes/filebrowser.h\
include/dialogs/dmenuscriptshared.h\ include/modes/dmenuscriptshared.h\
resources/resources.c\ resources/resources.c\
resources/resources.h resources/resources.h
@ -534,7 +534,7 @@ mode_test_LDADD=$(textbox_test_LDADD) $(check_LIBS)
mode_test_SOURCES=\ mode_test_SOURCES=\
config/config.c\ config/config.c\
test/mode-test.c\ test/mode-test.c\
source/dialogs/help-keys.c\ source/modes/help-keys.c\
source/helper.c\ source/helper.c\
source/theme.c\ source/theme.c\
source/css-colors.c\ source/css-colors.c\

14
doc/rofi.1
View file

@ -1452,19 +1452,19 @@ View: The main window view functions.
.IP \(bu 2 .IP \(bu 2
Widgets.Box: The Box widget. Widgets.Box: The Box widget.
.IP \(bu 2 .IP \(bu 2
Dialogs.DMenu: The dmenu mode. Modes.DMenu: The dmenu mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.Run: The run mode. Modes.Run: The run mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.DRun: The desktop file run mode. Modes.DRun: The desktop file run mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.Window: The window mode. Modes.Window: The window mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.Script: The script mode. Modes.Script: The script mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.Combi: The script mode. Modes.Combi: The script mode.
.IP \(bu 2 .IP \(bu 2
Dialogs.Ssh: The ssh mode. Modes.Ssh: The ssh mode.
.IP \(bu 2 .IP \(bu 2
Rofi: The main application. Rofi: The main application.
.IP \(bu 2 .IP \(bu 2

14
doc/rofi.1.markdown
View file

@ -919,13 +919,13 @@ environment variable. At the time of creation of this page, the following debug
* X11Helper: The X11 Helper functions. * X11Helper: The X11 Helper functions.
* View: The main window view functions. * View: The main window view functions.
* Widgets.Box: The Box widget. * Widgets.Box: The Box widget.
* Dialogs.DMenu: The dmenu mode. * Modes.DMenu: The dmenu mode.
* Dialogs.Run: The run mode. * Modes.Run: The run mode.
* Dialogs.DRun: The desktop file run mode. * Modes.DRun: The desktop file run mode.
* Dialogs.Window: The window mode. * Modes.Window: The window mode.
* Dialogs.Script: The script mode. * Modes.Script: The script mode.
* Dialogs.Combi: The script mode. * Modes.Combi: The script mode.
* Dialogs.Ssh: The ssh mode. * Modes.Ssh: The ssh mode.
* Rofi: The main application. * Rofi: The main application.
* Timings: Get timing output. * Timings: Get timing output.
* Theme: Theme engine debug output. (warning lots of output). * Theme: Theme engine debug output. (warning lots of output).

0
include/dialogs/combi.h → include/modes/combi.h
View file

0
include/dialogs/dmenu.h → include/modes/dmenu.h
View file

0
include/dialogs/dmenuscriptshared.h → include/modes/dmenuscriptshared.h
View file

0
include/dialogs/drun.h → include/modes/drun.h
View file

0
include/dialogs/filebrowser.h → include/modes/filebrowser.h
View file

0
include/dialogs/help-keys.h → include/modes/help-keys.h
View file

26
include/dialogs/dialogs.h → include/modes/modes.h
View file

@ -25,23 +25,23 @@
* *
*/ */
#ifndef ROFI_DIALOGS_DIALOGS_H #ifndef ROFI_MODES_MODES_H
#define ROFI_DIALOGS_DIALOGS_H #define ROFI_MODES_MODES_H
/** /**
* @defgroup MODES Modes * @defgroup MODES Modes
*/ */
/** /**
* List of available dialogs. * List of available modes.
*/ */
#include "dialogs/combi.h" #include "modes/combi.h"
#include "dialogs/dmenu.h" #include "modes/dmenu.h"
#include "dialogs/drun.h" #include "modes/drun.h"
#include "dialogs/filebrowser.h" #include "modes/filebrowser.h"
#include "dialogs/help-keys.h" #include "modes/help-keys.h"
#include "dialogs/run.h" #include "modes/run.h"
#include "dialogs/script.h" #include "modes/script.h"
#include "dialogs/ssh.h" #include "modes/ssh.h"
#include "dialogs/window.h" #include "modes/window.h"
#endif // ROFI_DIALOGS_DIALOGS_H #endif // ROFI_MODES_MODES_H

0
include/dialogs/run.h → include/modes/run.h
View file

0
include/dialogs/script.h → include/modes/script.h
View file

0
include/dialogs/ssh.h → include/modes/ssh.h
View file

0
include/dialogs/window.h → include/modes/window.h
View file

42
meson.build
View file

@ -159,15 +159,15 @@ rofi_sources = files(
'source/xrmoptions.c', 'source/xrmoptions.c',
'source/rofi-types.c', 'source/rofi-types.c',
'source/xcb.c', 'source/xcb.c',
'source/dialogs/run.c', 'source/modes/run.c',
'source/dialogs/ssh.c', 'source/modes/ssh.c',
'source/dialogs/drun.c', 'source/modes/drun.c',
'source/dialogs/dmenu.c', 'source/modes/dmenu.c',
'source/dialogs/combi.c', 'source/modes/combi.c',
'source/dialogs/window.c', 'source/modes/window.c',
'source/dialogs/script.c', 'source/modes/script.c',
'source/dialogs/help-keys.c', 'source/modes/help-keys.c',
'source/dialogs/filebrowser.c', 'source/modes/filebrowser.c',
'include/display.h', 'include/display.h',
'include/xcb.h', 'include/xcb.h',
'include/xcb-internal.h', 'include/xcb-internal.h',
@ -195,17 +195,17 @@ rofi_sources = files(
'include/widgets/listview.h', 'include/widgets/listview.h',
'include/widgets/scrollbar.h', 'include/widgets/scrollbar.h',
'include/xrmoptions.h', 'include/xrmoptions.h',
'include/dialogs/ssh.h', 'include/modes/ssh.h',
'include/dialogs/run.h', 'include/modes/run.h',
'include/dialogs/drun.h', 'include/modes/drun.h',
'include/dialogs/dmenu.h', 'include/modes/dmenu.h',
'include/dialogs/combi.h', 'include/modes/combi.h',
'include/dialogs/script.h', 'include/modes/script.h',
'include/dialogs/window.h', 'include/modes/window.h',
'include/dialogs/dialogs.h', 'include/modes/modes.h',
'include/dialogs/help-keys.h', 'include/modes/help-keys.h',
'include/dialogs/filebrowser.h', 'include/modes/filebrowser.h',
'include/dialogs/dmenuscriptshared.h', 'include/modes/dmenuscriptshared.h',
) )
theme_lexer_sources = files('lexer/theme-lexer.l') theme_lexer_sources = files('lexer/theme-lexer.l')
theme_parser_sources = files('lexer/theme-parser.y') theme_parser_sources = files('lexer/theme-parser.y')
@ -452,7 +452,7 @@ if check.found()
], ],
objects: rofi.extract_objects([ objects: rofi.extract_objects([
'config/config.c', 'config/config.c',
'source/dialogs/help-keys.c', 'source/modes/help-keys.c',
'source/helper.c', 'source/helper.c',
'source/theme.c', 'source/theme.c',
'source/css-colors.c', 'source/css-colors.c',

4
source/dialogs/combi.c → source/modes/combi.c
View file

@ -26,7 +26,7 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.Combi" #define G_LOG_DOMAIN "Modes.Combi"
#include "helper.h" #include "helper.h"
#include "settings.h" #include "settings.h"
@ -36,7 +36,7 @@
#include "mode-private.h" #include "mode-private.h"
#include "widgets/textbox.h" #include "widgets/textbox.h"
#include <dialogs/dialogs.h> #include <modes/modes.h>
#include <pango/pango.h> #include <pango/pango.h>
#include <theme.h> #include <theme.h>

6
source/dialogs/dmenu.c → source/modes/dmenu.c
View file

@ -26,9 +26,9 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.DMenu" #define G_LOG_DOMAIN "Modes.DMenu"
#include "dialogs/dmenu.h" #include "modes/dmenu.h"
#include "helper.h" #include "helper.h"
#include "rofi-icon-fetcher.h" #include "rofi-icon-fetcher.h"
#include "rofi.h" #include "rofi.h"
@ -50,7 +50,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "dialogs/dmenuscriptshared.h" #include "modes/dmenuscriptshared.h"
static int dmenu_mode_init(Mode *sw); static int dmenu_mode_init(Mode *sw);
static int dmenu_token_match(const Mode *sw, rofi_int_matcher **tokens, static int dmenu_token_match(const Mode *sw, rofi_int_matcher **tokens,

6
source/dialogs/drun.c → source/modes/drun.c
View file

@ -26,7 +26,7 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.DRun" #define G_LOG_DOMAIN "Modes.DRun"
#include <config.h> #include <config.h>
#ifdef ENABLE_DRUN #ifdef ENABLE_DRUN
@ -44,8 +44,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "dialogs/drun.h" #include "modes/drun.h"
#include "dialogs/filebrowser.h" #include "modes/filebrowser.h"
#include "helper.h" #include "helper.h"
#include "history.h" #include "history.h"
#include "mode-private.h" #include "mode-private.h"

2
source/dialogs/filebrowser.c → source/modes/filebrowser.c
View file

@ -36,7 +36,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include "dialogs/filebrowser.h" #include "modes/filebrowser.h"
#include "helper.h" #include "helper.h"
#include "history.h" #include "history.h"
#include "mode-private.h" #include "mode-private.h"

2
source/dialogs/help-keys.c → source/modes/help-keys.c
View file

@ -38,7 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "dialogs/help-keys.h" #include "modes/help-keys.h"
#include "helper.h" #include "helper.h"
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"

6
source/dialogs/run.c → source/modes/run.c
View file

@ -31,7 +31,7 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.Run" #define G_LOG_DOMAIN "Modes.Run"
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
@ -46,8 +46,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "dialogs/filebrowser.h" #include "modes/filebrowser.h"
#include "dialogs/run.h" #include "modes/run.h"
#include "helper.h" #include "helper.h"
#include "history.h" #include "history.h"
#include "rofi.h" #include "rofi.h"

6
source/dialogs/script.c → source/modes/script.c
View file

@ -26,9 +26,9 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.Script" #define G_LOG_DOMAIN "Modes.Script"
#include "dialogs/script.h" #include "modes/script.h"
#include "helper.h" #include "helper.h"
#include "rofi.h" #include "rofi.h"
#include <assert.h> #include <assert.h>
@ -46,7 +46,7 @@
#include "rofi-icon-fetcher.h" #include "rofi-icon-fetcher.h"
#include "dialogs/dmenuscriptshared.h" #include "modes/dmenuscriptshared.h"
typedef struct { typedef struct {
/** ID of the current script. */ /** ID of the current script. */

4
source/dialogs/ssh.c → source/modes/ssh.c
View file

@ -33,7 +33,7 @@
/** /**
* Log domain for the ssh mode. * Log domain for the ssh mode.
*/ */
#define G_LOG_DOMAIN "Dialogs.Ssh" #define G_LOG_DOMAIN "Modes.Ssh"
#include <config.h> #include <config.h>
#include <glib.h> #include <glib.h>
@ -51,7 +51,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "dialogs/ssh.h" #include "modes/ssh.h"
#include "history.h" #include "history.h"
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"

4
source/dialogs/window.c → source/modes/window.c
View file

@ -26,7 +26,7 @@
*/ */
/** The log domain of this dialog. */ /** The log domain of this dialog. */
#define G_LOG_DOMAIN "Dialogs.Window" #define G_LOG_DOMAIN "Modes.Window"
#include <config.h> #include <config.h>
@ -49,8 +49,8 @@
#include "xcb-internal.h" #include "xcb-internal.h"
#include "xcb.h" #include "xcb.h"
#include "dialogs/window.h"
#include "helper.h" #include "helper.h"
#include "modes/window.h"
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"
#include "widgets/textbox.h" #include "widgets/textbox.h"

2
source/rofi.c
View file

@ -59,9 +59,9 @@
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"
#include "dialogs/dialogs.h"
#include "helper.h" #include "helper.h"
#include "mode.h" #include "mode.h"
#include "modes/modes.h"
#include "widgets/textbox.h" #include "widgets/textbox.h"
#include "xrmoptions.h" #include "xrmoptions.h"

2
source/view.c
View file

@ -54,11 +54,11 @@
#include "settings.h" #include "settings.h"
#include "timings.h" #include "timings.h"
#include "dialogs/dialogs.h"
#include "display.h" #include "display.h"
#include "helper-theme.h" #include "helper-theme.h"
#include "helper.h" #include "helper.h"
#include "mode.h" #include "mode.h"
#include "modes/modes.h"
#include "xcb-internal.h" #include "xcb-internal.h"
#include "xrmoptions.h" #include "xrmoptions.h"

2
source/xcb.c
View file

@ -63,7 +63,7 @@
#include "xcb.h" #include "xcb.h"
#include <libsn/sn.h> #include <libsn/sn.h>
#include "dialogs/window.h" #include "modes/window.h"
#include "mode.h" #include "mode.h"
#include <rofi.h> #include <rofi.h>

147
test/mode-test.c
View file

@ -25,129 +25,97 @@
* *
*/ */
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <assert.h> #include <assert.h>
#include <glib.h> #include <glib.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <mode.h>
#include <mode-private.h>
#include <dialogs/help-keys.h>
#include <xkbcommon/xkbcommon.h>
#include "theme.h"
#include "rofi.h"
#include "display.h" #include "display.h"
#include "xcb.h" #include "rofi.h"
#include "theme.h"
#include "widgets/textbox.h" #include "widgets/textbox.h"
#include <keyb.h> #include "xcb.h"
#include <helper.h> #include <helper.h>
#include <keyb.h>
#include <mode-private.h>
#include <mode.h>
#include <modes/help-keys.h>
#include <xkbcommon/xkbcommon.h>
#include <check.h>
#include "rofi-icon-fetcher.h" #include "rofi-icon-fetcher.h"
#include <check.h>
ThemeWidget *rofi_theme = NULL; ThemeWidget *rofi_theme = NULL;
uint32_t rofi_icon_fetcher_query ( const char *name, const int size ) uint32_t rofi_icon_fetcher_query(const char *name, const int size) { return 0; }
{ uint32_t rofi_icon_fetcher_query_advanced(const char *name, const int wsize,
return 0; const int hsize) {
}
uint32_t rofi_icon_fetcher_query_advanced ( const char *name, const int wsize, const int hsize )
{
return 0; return 0;
} }
void rofi_clear_error_messages(void) {} void rofi_clear_error_messages(void) {}
cairo_surface_t * rofi_icon_fetcher_get ( const uint32_t uid ) cairo_surface_t *rofi_icon_fetcher_get(const uint32_t uid) { return NULL; }
{
return NULL;
}
gboolean rofi_theme_parse_string ( const char *string ) gboolean rofi_theme_parse_string(const char *string) { return FALSE; }
{
return FALSE;
}
double textbox_get_estimated_char_height ( void ) double textbox_get_estimated_char_height(void) { return 16.0; }
{ double textbox_get_estimated_ch(void) { return 9.0; }
return 16.0; void rofi_add_error_message(G_GNUC_UNUSED GString *msg) {}
} int monitor_active(G_GNUC_UNUSED workarea *d) { return 0; }
double textbox_get_estimated_ch ( void ) int rofi_view_error_dialog(const char *msg, G_GNUC_UNUSED int markup) {
{
return 9.0;
}
void rofi_add_error_message ( G_GNUC_UNUSED GString *msg )
{
}
int monitor_active ( G_GNUC_UNUSED workarea *d )
{
return 0;
}
int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
{
fputs(msg, stderr); fputs(msg, stderr);
return TRUE; return TRUE;
} }
void rofi_view_get_current_monitor ( G_GNUC_UNUSED int *width, G_GNUC_UNUSED int *height ) void rofi_view_get_current_monitor(G_GNUC_UNUSED int *width,
{ G_GNUC_UNUSED int *height) {}
RofiViewState *rofi_view_get_active(void) { return NULL; }
} gboolean rofi_view_check_action(G_GNUC_UNUSED RofiViewState *state,
RofiViewState * rofi_view_get_active ( void ) G_GNUC_UNUSED BindingsScope scope,
{ G_GNUC_UNUSED guint action) {
return NULL;
}
gboolean rofi_view_check_action ( G_GNUC_UNUSED RofiViewState *state, G_GNUC_UNUSED BindingsScope scope, G_GNUC_UNUSED guint action )
{
return FALSE; return FALSE;
} }
void rofi_view_trigger_action ( G_GNUC_UNUSED RofiViewState *state, G_GNUC_UNUSED BindingsScope scope, G_GNUC_UNUSED guint action ) void rofi_view_trigger_action(G_GNUC_UNUSED RofiViewState *state,
{ G_GNUC_UNUSED BindingsScope scope,
} G_GNUC_UNUSED guint action) {}
void display_startup_notification ( G_GNUC_UNUSED RofiHelperExecuteContext *context, G_GNUC_UNUSED GSpawnChildSetupFunc *child_setup, G_GNUC_UNUSED gpointer *user_data ) void display_startup_notification(
{ G_GNUC_UNUSED RofiHelperExecuteContext *context,
} G_GNUC_UNUSED GSpawnChildSetupFunc *child_setup,
G_GNUC_UNUSED gpointer *user_data) {}
#ifndef _ck_assert_ptr_null #ifndef _ck_assert_ptr_null
/* Pointer against NULL comparison macros with improved output /* Pointer against NULL comparison macros with improved output
* compared to ck_assert(). */ * compared to ck_assert(). */
/* OP may only be == or != */ /* OP may only be == or != */
#define _ck_assert_ptr_null(X, OP) do { \ #define _ck_assert_ptr_null(X, OP) \
do { \
const void *_ck_x = (X); \ const void *_ck_x = (X); \
ck_assert_msg(_ck_x OP NULL, \ ck_assert_msg(_ck_x OP NULL, "Assertion '%s' failed: %s == %#x", \
"Assertion '%s' failed: %s == %#x", \ #X " " #OP " NULL", #X, _ck_x); \
#X" "#OP" NULL", \
#X, _ck_x); \
} while (0) } while (0)
#define ck_assert_ptr_null(X) _ck_assert_ptr_null(X, ==) #define ck_assert_ptr_null(X) _ck_assert_ptr_null(X, ==)
#define ck_assert_ptr_nonnull(X) _ck_assert_ptr_null(X, !=) #define ck_assert_ptr_nonnull(X) _ck_assert_ptr_null(X, !=)
#endif #endif
static void test_mode_setup ( void ) static void test_mode_setup(void) {
{
ck_assert_int_eq(mode_init(&help_keys_mode), TRUE); ck_assert_int_eq(mode_init(&help_keys_mode), TRUE);
} }
static void test_mode_teardown ( void ) static void test_mode_teardown(void) { mode_destroy(&help_keys_mode); }
{
mode_destroy ( &help_keys_mode );
}
START_TEST(test_mode_create) START_TEST(test_mode_create) {
{
ck_assert_ptr_nonnull(help_keys_mode.private_data); ck_assert_ptr_nonnull(help_keys_mode.private_data);
} }
END_TEST END_TEST
START_TEST(test_mode_destroy) START_TEST(test_mode_destroy) {
{
mode_destroy(&help_keys_mode); mode_destroy(&help_keys_mode);
ck_assert_ptr_null(help_keys_mode.private_data); ck_assert_ptr_null(help_keys_mode.private_data);
} }
END_TEST END_TEST
START_TEST(test_mode_num_items) START_TEST(test_mode_num_items) {
{
unsigned int rows = mode_get_num_entries(&help_keys_mode); unsigned int rows = mode_get_num_entries(&help_keys_mode);
ck_assert_int_eq(rows, 74); ck_assert_int_eq(rows, 74);
for (unsigned int i = 0; i < rows; i++) { for (unsigned int i = 0; i < rows; i++) {
@ -163,30 +131,32 @@ START_TEST(test_mode_num_items)
} }
END_TEST END_TEST
START_TEST(test_mode_result) START_TEST(test_mode_result) {
{
char *res; char *res;
res = NULL; res = NULL;
ck_assert_int_eq ( mode_result ( &help_keys_mode, MENU_NEXT, &res,0), NEXT_DIALOG); ck_assert_int_eq(mode_result(&help_keys_mode, MENU_NEXT, &res, 0),
NEXT_DIALOG);
g_free(res); g_free(res);
res = NULL; res = NULL;
ck_assert_int_eq ( mode_result ( &help_keys_mode, MENU_PREVIOUS, &res,0), PREVIOUS_DIALOG); ck_assert_int_eq(mode_result(&help_keys_mode, MENU_PREVIOUS, &res, 0),
PREVIOUS_DIALOG);
g_free(res); g_free(res);
res = NULL; res = NULL;
ck_assert_int_eq ( mode_result ( &help_keys_mode, MENU_QUICK_SWITCH|1, &res,0), 1); ck_assert_int_eq(mode_result(&help_keys_mode, MENU_QUICK_SWITCH | 1, &res, 0),
1);
g_free(res); g_free(res);
res = NULL; res = NULL;
ck_assert_int_eq ( mode_result ( &help_keys_mode, MENU_QUICK_SWITCH|2, &res,0), 2); ck_assert_int_eq(mode_result(&help_keys_mode, MENU_QUICK_SWITCH | 2, &res, 0),
2);
g_free(res); g_free(res);
} }
END_TEST END_TEST
START_TEST(test_mode_match_entry) START_TEST(test_mode_match_entry) {
{
rofi_int_matcher **t = helper_tokenize("primary-paste", FALSE); rofi_int_matcher **t = helper_tokenize("primary-paste", FALSE);
ck_assert_ptr_nonnull(t); ck_assert_ptr_nonnull(t);
@ -200,12 +170,10 @@ START_TEST(test_mode_match_entry)
ck_assert_int_eq(mode_token_match(&help_keys_mode, t, 1), TRUE); ck_assert_int_eq(mode_token_match(&help_keys_mode, t, 1), TRUE);
ck_assert_int_eq(mode_token_match(&help_keys_mode, t, 2), FALSE); ck_assert_int_eq(mode_token_match(&help_keys_mode, t, 2), FALSE);
helper_tokenize_free(t); helper_tokenize_free(t);
} }
END_TEST END_TEST
static Suite * mode_suite (void) static Suite *mode_suite(void) {
{
Suite *s; Suite *s;
TCase *tc_core; TCase *tc_core;
@ -224,8 +192,7 @@ static Suite * mode_suite (void)
return s; return s;
} }
int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv ) int main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv) {
{
setup_abe(); setup_abe();
int number_failed = 0; int number_failed = 0;
Suite *s; Suite *s;