Remove libs subdirectory, it doesn't make much sense in today's version

of spmenu anyway.
This commit is contained in:
Jacob 2024-06-06 02:13:58 +02:00
parent a575eabb09
commit e01290fd1f
56 changed files with 48 additions and 48 deletions

12
.gitignore vendored
View file

@ -10,9 +10,9 @@ build
./*.ebuild*
PKGBUILD
src/libs/wl/wlr-layer-shell-unstable-v1-client-protocol.h
src/libs/wl/wlr-layer-shell-unstable-v1-protocol.c
src/libs/wl/xdg-output-unstable-v1-protocol.c
src/libs/wl/xdg-output-unstable-v1-client-protocol.h
src/libs/wl/xdg-shell-client-protocol.h
src/libs/wl/xdg-shell-protocol.c
src/wl/wlr-layer-shell-unstable-v1-client-protocol.h
src/wl/wlr-layer-shell-unstable-v1-protocol.c
src/wl/xdg-output-unstable-v1-protocol.c
src/wl/xdg-output-unstable-v1-client-protocol.h
src/wl/xdg-shell-client-protocol.h
src/wl/xdg-shell-protocol.c

View file

@ -8,7 +8,7 @@ project(
cc = meson.get_compiler('c')
project_source_files = [
'src/libs/draw/draw.c',
'src/draw/draw.c',
'src/spmenu.c',
]
@ -40,12 +40,12 @@ if get_option('wayland')
run_command('protocols/generate.sh', check : true)
project_source_files += [ 'src/libs/wl/wlr-layer-shell-unstable-v1-client-protocol.h' ]
project_source_files += [ 'src/libs/wl/wlr-layer-shell-unstable-v1-protocol.c' ]
project_source_files += [ 'src/libs/wl/xdg-output-unstable-v1-client-protocol.h' ]
project_source_files += [ 'src/libs/wl/xdg-output-unstable-v1-protocol.c' ]
project_source_files += [ 'src/libs/wl/xdg-shell-client-protocol.h' ]
project_source_files += [ 'src/libs/wl/xdg-shell-protocol.c' ]
project_source_files += [ 'src/wl/wlr-layer-shell-unstable-v1-client-protocol.h' ]
project_source_files += [ 'src/wl/wlr-layer-shell-unstable-v1-protocol.c' ]
project_source_files += [ 'src/wl/xdg-output-unstable-v1-client-protocol.h' ]
project_source_files += [ 'src/wl/xdg-output-unstable-v1-protocol.c' ]
project_source_files += [ 'src/wl/xdg-shell-client-protocol.h' ]
project_source_files += [ 'src/wl/xdg-shell-protocol.c' ]
build_args += [ '-DWAYLAND' ]
endif

View file

@ -66,42 +66,42 @@ headers() {
wayland-scanner \
client-header \
protocols/wlr-layer-shell-unstable-v1.xml \
src/libs/wl/wlr-layer-shell-unstable-v1-client-protocol.h
src/wl/wlr-layer-shell-unstable-v1-client-protocol.h
wayland-scanner \
client-header \
protocols/xdg-shell.xml \
src/libs/wl/xdg-shell-client-protocol.h
src/wl/xdg-shell-client-protocol.h
wayland-scanner \
client-header \
protocols/xdg-output-unstable-v1.xml \
src/libs/wl/xdg-output-unstable-v1-client-protocol.h
src/wl/xdg-output-unstable-v1-client-protocol.h
wayland-scanner \
public-code \
protocols/wlr-layer-shell-unstable-v1.xml \
src/libs/wl/wlr-layer-shell-unstable-v1-protocol.c
src/wl/wlr-layer-shell-unstable-v1-protocol.c
wayland-scanner \
public-code \
protocols/xdg-shell.xml \
src/libs/wl/xdg-shell-protocol.c
src/wl/xdg-shell-protocol.c
wayland-scanner \
public-code \
protocols/xdg-output-unstable-v1.xml \
src/libs/wl/xdg-output-unstable-v1-protocol.c
src/wl/xdg-output-unstable-v1-protocol.c
}
clean_headers() {
rm -f \
src/libs/wl/xdg-output-unstable-v1-protocol.c \
src/libs/wl/xdg-shell-protocol.c \
src/libs/wl/wlr-layer-shell-unstable-v1-protocol.c \
src/libs/wl/xdg-output-unstable-v1-client-protocol.h \
src/libs/wl/xdg-shell-client-protocol.h \
src/libs/wl/wlr-layer-shell-unstable-v1-client-protocol.h
src/wl/xdg-output-unstable-v1-protocol.c \
src/wl/xdg-shell-protocol.c \
src/wl/wlr-layer-shell-unstable-v1-protocol.c \
src/wl/xdg-output-unstable-v1-client-protocol.h \
src/wl/xdg-shell-client-protocol.h \
src/wl/wlr-layer-shell-unstable-v1-client-protocol.h
}
gen_pkg() {

View file

@ -9,9 +9,9 @@
#include <locale.h>
#include <math.h>
#include <unistd.h>
#include "libs/main.c"
#include "main.c"
#include "libs/draw/draw.h"
#include "draw/draw.h"
#ifndef VERSION
#define VERSION "unknown"
@ -174,28 +174,28 @@ static char **list;
static size_t listsize;
// various headers
#include "libs/options.h"
#include "libs/draw.h"
#include "libs/arg.h"
#include "options.h"
#include "draw.h"
#include "arg.h"
#include "libs/x11/inc.h"
#include "libs/wl/inc.h"
#include "x11/inc.h"
#include "wl/inc.h"
static char *fonts[] = { font };
#include "libs/img.c"
#include "libs/icon.c"
#include "libs/rtl.c"
#include "libs/sort.c"
#include "libs/match.c"
#include "libs/schemes.c"
#include "libs/stream.c"
#include "libs/draw.c"
#include "libs/conf/config.c"
#include "libs/argv.c"
#include "libs/history.c"
#include "libs/arg.c"
#include "libs/fifo.c"
#include "img.c"
#include "icon.c"
#include "rtl.c"
#include "sort.c"
#include "match.c"
#include "schemes.c"
#include "stream.c"
#include "draw.c"
#include "conf/config.c"
#include "argv.c"
#include "history.c"
#include "arg.c"
#include "fifo.c"
#if X11
static Key keys[] = {
@ -273,8 +273,8 @@ static WlMouse wl_buttons[] = {
};
#endif
#include "libs/x11/inc.c"
#include "libs/wl/inc.c"
#include "x11/inc.c"
#include "wl/inc.c"
int is_selected(size_t index) {
for (int i = 0; i < sel_size; i++) {

View file

@ -20,7 +20,7 @@ void create_window_x11(int x, int y, int w, int h) {
ExposureMask | // mapping the drawing
KeyPressMask | // keypresses
VisibilityChangeMask | // whether or not client is visible
ButtonPressMask | // see buttonpress in libs/mouse.c for usage
ButtonPressMask | // see buttonpress in mouse.c for usage
PointerMotionMask; // we need pointer for selecting entries using the mouse
// create client