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.

Sign up for GitHub

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

Make numbered bookmarks work with numlock on #1093

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make numbered bookmarks work with numlock on #1093

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0805f7
Work with numlock on
Davidy22 Jul 21, 2021
000a484
Use GDK bitmasks
Davidy22 Jul 21, 2021
5f59a76
Fix shift/ctrl check
Davidy22 Jul 22, 2021
8a28a13
Fix comments to match flow
Davidy22 Jul 24, 2021
a5e9029
Merge branch 'geany:master' into master
Davidy22 Aug 6, 2021
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
23 changes: 11 additions & 12 deletions geanynumberedbookmarks/src/geanynumberedbookmarks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,19 +1452,8 @@ static gboolean Key_Released_CallBack(GtkWidget *widget, GdkEventKey *ev, gpoint

if(ev->type!=GDK_KEY_RELEASE)
return FALSE;

/* control and number pressed */
if(ev->state==4)
{
i=((gint)(ev->keyval))-'0';
if(i<0 || i>9)
return FALSE;

GotoBookMark(doc, i);
return TRUE;
}
/* control+shift+number */
if(ev->state==5) {
if(ev->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
Copy link
Member

Choose a reason for hiding this comment

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

This tests for control or shift, not control and shift

Copy link
Author

Choose a reason for hiding this comment

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

Oh word, that wasn't the way I thought it'd work. Thought it was checking right too when I was checking ctrl+number.

/* could use hardware keycode instead of keyvals but if unable to get keyode then don't
* have logical default to fall back on
*/
Expand All @@ -1475,6 +1464,16 @@ static gboolean Key_Released_CallBack(GtkWidget *widget, GdkEventKey *ev, gpoint
}

}
/* control and number pressed */
if(ev->state & GDK_CONTROL_MASK)
{
i=((gint)(ev->keyval))-'0';
if(i<0 || i>9)
return FALSE;

GotoBookMark(doc, i);
return TRUE;
}

return FALSE;
}
Expand Down