Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 27 additions & 12 deletions app-utils/kmscon/autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,35 @@ PKGDEP__LOONGSON2F="${PKGDEP__RETRO}"
PKGDEP__M68K="${PKGDEP__RETRO}"
PKGDEP__POWERPC="${PKGDEP__RETRO}"
PKGDEP__PPC64="${PKGDEP__RETRO}"
BUILDDEP="docbook-xsl"
BUILDDEP__RETRO=""
BUILDDEP__ARMV4="${BUILDDEP__RETRO}"
BUILDDEP__ARMV6HF="${BUILDDEP__RETRO}"
BUILDDEP__ARMV7HF="${BUILDDEP__RETRO}"
BUILDDEP__I486="${BUILDDEP__RETRO}"
BUILDDEP__LOONGSON2F="${BUILDDEP__RETRO}"
BUILDDEP__M68K="${BUILDDEP__RETRO}"
BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
BUILDDEP__PPC64="${BUILDDEP__RETRO}"
PKGDES="Terminal emulator based on Kernel Mode Setting (KMS)"

MESON_AFTER=(
'-Dextra_debug=false'
'-Dtests=false'
'-Ddocs=disabled'
'-Dmulti_seat=enabled'
'-Delogind=disabled'
'-Dvideo_fbdev=enabled'
'-Dvideo_drm2d=enabled'
'-Dvideo_drm3d=enabled'
'-Drenderer_gltex=enabled'
'-Dfont_unifont=enabled'
'-Dfont_pango=enabled'
)

MESON_AFTER__RETRO=(
'-Dextra_debug=false'
'-Dtests=false'
'-Ddocs=disabled'
'-Dmulti_seat=enabled'
'-Delogind=disabled'
'-Dvideo_fbdev=enabled'
'-Dvideo_drm2d=enabled'
'-Dvideo_drm3d=disabled'
'-Drenderer_gltex=disabled'
'-Dfont_unifont=enabled'
'-Dfont_pango=disabled'
)

PKGREP="kmscon-enablement"
PKGBREAK="kmscon-enablement"

MESON_AFTER="-D backspace_sends_delete=true"
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
From 7356f4429ce3c8c90eb37c8e1a7c404e3cf74a11 Mon Sep 17 00:00:00 2001
From 9babada7228fb3a8972791805376b822e80c0c20 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <jeffbai@aosc.io>
Date: Fri, 11 Oct 2024 16:04:31 +0800
Subject: [PATCH 10/12] AOSCOS: feat: default to <Control>equal for the zoom-in
grab
Subject: [PATCH] AOSCOS: feat: default to <Control>equal for the zoom-in grab

This saves the user from an extra Shift combo.
---
Expand All @@ -11,10 +10,10 @@ This saves the user from an extra Shift combo.
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/man/kmscon.1.xml.in b/docs/man/kmscon.1.xml.in
index 60b09aa..9d5295d 100644
index 65ce688..380885d 100644
--- a/docs/man/kmscon.1.xml.in
+++ b/docs/man/kmscon.1.xml.in
@@ -387,7 +387,7 @@
@@ -432,7 +432,7 @@
<term><option>--grab-zoom-in {grab}</option></term>
<listitem>
<para>Increase font size of the current terminal.
Expand All @@ -24,10 +23,10 @@ index 60b09aa..9d5295d 100644
</varlistentry>

diff --git a/src/kmscon_conf.c b/src/kmscon_conf.c
index 0dd0db3..212a2f7 100644
index d172f76..3596fb5 100644
--- a/src/kmscon_conf.c
+++ b/src/kmscon_conf.c
@@ -120,7 +120,7 @@ static void print_help()
@@ -129,7 +129,7 @@ static void print_help()
"\t Shortcut to scroll page up\n"
"\t --grab-page-down <grab> [<Shift>Next]\n"
"\t Shortcut to scroll page down\n"
Expand All @@ -36,15 +35,15 @@ index 0dd0db3..212a2f7 100644
"\t Shortcut to increase font size\n"
"\t --grab-zoom-out <grab> [<Ctrl>minus]\n"
"\t Shortcut to decrease font size\n"
@@ -627,7 +627,7 @@ static struct conf_grab def_grab_page_down =
CONF_SINGLE_GRAB(SHL_SHIFT_MASK, XKB_KEY_Next);
@@ -669,7 +669,7 @@ static struct conf_grab def_grab_page_up = CONF_SINGLE_GRAB(SHL_SHIFT_MASK, XKB_

static struct conf_grab def_grab_zoom_in =
- CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_plus);
+ CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_equal);
static struct conf_grab def_grab_page_down = CONF_SINGLE_GRAB(SHL_SHIFT_MASK, XKB_KEY_Next);

-static struct conf_grab def_grab_zoom_in = CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_plus);
+static struct conf_grab def_grab_zoom_in = CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_equal);

static struct conf_grab def_grab_zoom_out = CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_minus);

static struct conf_grab def_grab_zoom_out =
CONF_SINGLE_GRAB(SHL_CONTROL_MASK, XKB_KEY_minus);
--
2.47.0
2.52.0

This file was deleted.

This file was deleted.

Loading