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.

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

openSUSE upstreaming, part 1 #111

Closed
wants to merge 2 commits into from

Conversation

stanislav-brabec
Copy link

Here is a first set of openSUSE patches. Feel free to cherry pick.

Copy link
Owner

@legionus legionus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dmage what do you think ?

contrib/font2psf Outdated Show resolved Hide resolved
contrib/font2psf Outdated Show resolved Hide resolved
data/keymaps/i386/include/euro.map Outdated Show resolved Hide resolved
docs/doc/kbd.FAQ-15.html Outdated Show resolved Hide resolved
data/keymaps/i386/qwertz/de_alt_UTF-8.map Outdated Show resolved Hide resolved
@stanislav-brabec
Copy link
Author

I removed the questionable commits and drop or rework them.

data/keymaps/i386/azerty/fr-latin9.map Outdated Show resolved Hide resolved
@@ -42,6 +42,7 @@ keycode 9 = eight parenleft bracketleft
alt keycode 9 = Meta_eight
keycode 10 = nine parenright bracketright
alt keycode 10 = Meta_nine
control altgr keycode 10 = Control_bracketright
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's impossible to press [CTRL]+[]] with sv keyboard. Fix that.It's impossible to press [CTRL]+[]] with sv keyboard. Fix that.

It's not true.

$ git grep -w Control_bracketright data/keymaps/i386/qwerty/sv-latin1.map 
data/keymaps/i386/qwerty/sv-latin1.map:32:      control keycode   6 = Control_bracketright
data/keymaps/i386/qwerty/sv-latin1.map:61:      control keycode  27 = Control_bracketright

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still have this question. You add Control_bracketright and say that it is impossible to press it. But Control_bracketright is already in this keymap.

What does this patch fix?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Swedish layout, both mapping are weird.

Key code 6 — 5, %
Key code 27 — ◌̈, ^, ~

Key code 27 seems to be chosen because the ISO layout (the UK, for example) has ] at this place. The reason for key code 6 is a mystery to me.

But none of them use the actual key ].

Control_bracketright should be mapped to Ctrl+], and for the Swedish layout ] is AltGr+9, so Control_bracketright should be mapped to Ctrl+AltGr+9. Therefore this change is valid, but it adds the 3rd way to press Control_bracketright.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Swedish layout, both mapping are weird.

I used this to see the keyboard layout: http://kbdlayout.info/kbdsg and for Swiss German the ] is on key code 27 and only for German it is on key code 10.

Therefore this change is valid, but it adds the 3rd way to press Control_bracketright.

Ok. I'm going to take this commit, but it seems to me that the commit message does not correspond to the changes. Can we describe the changes more clearly?

Copy link
Contributor

@dmage dmage Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sv-latin1.map: make Ctrl+AltGr+9 act as Ctrl+]

As ] (bracketright) is emitted by AltGr+9, we should assign Ctrl+] (Control_bracketright) to Ctrl+AltGr+9.

@@ -89,5 +89,4 @@ The \fI\-w\fR idea is from "sam".

.SH "SEE ALSO"
.BR chvt (1),
.BR doshell (8),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like out of all the remaining commits this is the only one that makes sense.

Jürgen Weigert and others added 2 commits March 20, 2024 19:26
It's impossible to press [CTRL]+[]] with sv keyboard. Fix that.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
openvt(1) refers to doshell(8) man page that does not exist anywhere.
Remove it.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
legionus added a commit that referenced this pull request Mar 26, 2024
These are a number of changes from openSUSE that Stanislav Brabec sent
to the upstream.

Link: #111
Signed-off-by: Alexey Gladkov <legion@kernel.org>
@legionus
Copy link
Owner

Applied. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants