diff options
author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-10 12:20:26 (GMT) |
---|---|---|
committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-10 12:20:26 (GMT) |
commit | 9bb2d0a7c84e436a757776b5c336cef61d71cda9 (patch) | |
tree | 5eb0b4caefdd9dbc80e9ba897eb00d188a37a3d2 | |
parent | 42c606df19acec46041dde207004d1c0fc6d5e77 (diff) | |
parent | 3835b6555c9d2f6648f0ef2acc25efdd867e38b7 (diff) | |
download | tk-9bb2d0a7c84e436a757776b5c336cef61d71cda9.zip tk-9bb2d0a7c84e436a757776b5c336cef61d71cda9.tar.gz tk-9bb2d0a7c84e436a757776b5c336cef61d71cda9.tar.bz2 |
merge trunk
FossilOrigin-Name: 751a1f451c6b716ddf7d40e3692cc4c939a34b83
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | doc/ttk_notebook.n | 2 | ||||
-rw-r--r-- | generic/tkEvent.c | 6 | ||||
-rw-r--r-- | library/listbox.tcl | 4 | ||||
-rw-r--r-- | library/tk.tcl | 42 | ||||
-rw-r--r-- | library/ttk/notebook.tcl | 4 | ||||
-rw-r--r-- | unix/tkUnixEvent.c | 2 | ||||
-rw-r--r-- | unix/tkUnixKey.c | 4 | ||||
-rw-r--r-- | unix/tkUnixRFont.c | 2 |
9 files changed, 44 insertions, 29 deletions
@@ -4,6 +4,13 @@ Pre-define 10 new Virtual events, and correct various bindings according to the Mac OSX documentation. +2012-08-09 Stuart Cassoff <stwo@users.sourceforge.net> + + * generic/tkEvent.c: Remove useless (void *) casts + * unix/tkUnixEvent.c: introduced in checkin [81e50c85ed]. + * unix/tkUnixKey.c: The warnings were false flags from a + * unix/tkUnixRFont.c: faulty OpenBSD C compiler. + 2012-07-31 Donal K. Fellows <dkf@users.sf.net> * unix/tkUnixKey.c (TkpSetKeycodeAndState, TkpInitKeymapInfo) diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n index 6b4b2bc..fe89994 100644 --- a/doc/ttk_notebook.n +++ b/doc/ttk_notebook.n @@ -184,7 +184,7 @@ containing the notebook as follows: .IP \(bu \fBControl-Tab\fR selects the tab following the currently selected one. .IP \(bu -\fBShift-Control-Tab\fR selects the tab preceding the currently selected one. +\fBControl-Shift-Tab\fR selects the tab preceding the currently selected one. .IP \(bu \fBAlt-\fIK\fR, where \fIK\fR is the mnemonic (underlined) character of any tab, will select that tab. diff --git a/generic/tkEvent.c b/generic/tkEvent.c index dfa46ff..1fbf1dd 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -337,7 +337,7 @@ CreateXIC( preedit_attlist = XVaCreateNestedList(0, XNSpotLocation, &spot, XNFontSet, dispPtr->inputXfs, - (void *) NULL); + NULL); } winPtr->inputContext = XCreateIC(dispPtr->inputMethod, @@ -345,7 +345,7 @@ CreateXIC( XNClientWindow, winPtr->window, XNFocusWindow, winPtr->window, preedit_attname, preedit_attlist, - (void *) NULL); + NULL); if (preedit_attlist) { XFree(preedit_attlist); @@ -360,7 +360,7 @@ CreateXIC( /* * Adjust the window's event mask if the IM requires it. */ - XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL); + XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL); if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) { winPtr->atts.event_mask |= im_event_mask; XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask); diff --git a/library/listbox.tcl b/library/listbox.tcl index 31d0fbb..01fb03d 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -120,7 +120,7 @@ bind Listbox <Control-Home> { %W selection set 0 event generate %W <<ListboxSelect>> } -bind Listbox <Shift-Control-Home> { +bind Listbox <Control-Shift-Home> { tk::ListboxDataExtend %W 0 } bind Listbox <Control-End> { @@ -130,7 +130,7 @@ bind Listbox <Control-End> { %W selection set end event generate %W <<ListboxSelect>> } -bind Listbox <Shift-Control-End> { +bind Listbox <Control-Shift-End> { tk::ListboxDataExtend %W [%W index end] } bind Listbox <<Copy>> { diff --git a/library/tk.tcl b/library/tk.tcl index 8a0e3ff..fb16418 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -307,14 +307,22 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { set op add } - event $op <<Cut>> <Control-Key-w> - event $op <<Copy>> <Meta-Key-w> - event $op <<Paste>> <Control-Key-y> + event $op <<Cut>> <Control-Key-w> <Shift-Key-Delete> + event $op <<Copy>> <Meta-Key-w> <Control-Key-Insert> + event $op <<Paste>> <Control-Key-y> <Shift-Key-Insert> event $op <<Undo>> <Control-underscore> - event $op <<PrevChar>> <Control-Key-b> - event $op <<NextChar>> <Control-Key-f> - event $op <<PrevLine>> <Control-Key-p> - event $op <<NextLine>> <Control-Key-n> + event $op <<PrevChar>> <Control-Key-b> <Control-Lock-Key-B> + event $op <<NextChar>> <Control-Key-f> <Control-Lock-Key-F> + event $op <<PrevLine>> <Control-Key-p> <Control-Lock-Key-P> + event $op <<NextLine>> <Control-Key-n> <Control-Lock-Key-N> + event $op <<LineStart>> <Control-Key-a> <Control-Lock-Key-A> + event $op <<LineEnd>> <Control-Key-e> <Control-Lock-Key-E> + event $op <<SelectPrevChar>> <Control-Key-B> <Control-Lock-Key-b> + event $op <<SelectNextChar>> <Control-Key-F> <Control-Lock-Key-f> + event $op <<SelectPrevLine>> <Control-Key-P> <Control-Lock-Key-p> + event $op <<SelectNextLine>> <Control-Key-N> <Control-Lock-Key-n> + event $op <<SelectLineStart>> <Control-Key-A> <Control-Lock-Key-a> + event $op <<SelectLineEnd>> <Control-Key-E> <Control-Lock-Key-e> } #---------------------------------------------------------------------- @@ -380,12 +388,12 @@ switch -exact -- [tk windowingsystem] { event add <<PrevChar>> <Left> event add <<SelectPrevChar>> <Shift-Left> event add <<NextWord>> <Control-Right> - event add <<SelectNextWord>> <Shift-Control-Right> + event add <<SelectNextWord>> <Control-Shift-Right> event add <<PrevWord>> <Control-Left> - event add <<SelectPrevWord>> <Shift-Control-Left> - event add <<LineStart>> <Home> <Control-Key-a> <Control-Lock-Key-A> + event add <<SelectPrevWord>> <Control-Shift-Left> + event add <<LineStart>> <Home> event add <<SelectLineStart>> <Shift-Home> - event add <<LineEnd>> <End> <Control-Key-e> <Control-Lock-Key-E> + event add <<LineEnd>> <End> event add <<SelectLineEnd>> <Shift-End> event add <<PrevLine>> <Up> event add <<NextLine>> <Down> @@ -393,8 +401,8 @@ switch -exact -- [tk windowingsystem] { event add <<SelectNextLine>> <Shift-Down> event add <<PrevPara>> <Control-Up> event add <<NextPara>> <Control-Down> - event add <<SelectPrevPara>> <Shift-Control-Up> - event add <<SelectPrevPara>> <Shift-Control-Down> + event add <<SelectPrevPara>> <Control-Shift-Up> + event add <<SelectPrevPara>> <Control-Shift-Down> # Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is # returned when the user presses <Shift-Tab>. In order for tab @@ -428,9 +436,9 @@ switch -exact -- [tk windowingsystem] { event add <<PrevChar>> <Left> event add <<SelectPrevChar>> <Shift-Left> event add <<NextWord>> <Control-Right> - event add <<SelectNextWord>> <Shift-Control-Right> + event add <<SelectNextWord>> <Control-Shift-Right> event add <<PrevWord>> <Control-Left> - event add <<SelectPrevWord>> <Shift-Control-Left> + event add <<SelectPrevWord>> <Control-Shift-Left> event add <<LineStart>> <Home> <Control-Key-a> <Control-Lock-Key-A> event add <<SelectLineStart>> <Shift-Home> event add <<LineEnd>> <End> <Control-Key-e> <Control-Lock-Key-E> @@ -441,8 +449,8 @@ switch -exact -- [tk windowingsystem] { event add <<SelectNextLine>> <Shift-Down> event add <<PrevPara>> <Control-Up> event add <<NextPara>> <Control-Down> - event add <<SelectPrevPara>> <Shift-Control-Up> - event add <<SelectPrevPara>> <Shift-Control-Down> + event add <<SelectPrevPara>> <Control-Shift-Up> + event add <<SelectPrevPara>> <Control-Shift-Down> } "aqua" { event add <<Cut>> <Command-Key-x> <Key-F2> <Control-Lock-Key-X> diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl index d424b6c..72b85e6 100644 --- a/library/ttk/notebook.tcl +++ b/library/ttk/notebook.tcl @@ -108,7 +108,7 @@ proc ttk::notebook::enableTraversal {nb} { bind $top <Control-Key-Next> {+ttk::notebook::TLCycleTab %W 1} bind $top <Control-Key-Prior> {+ttk::notebook::TLCycleTab %W -1} bind $top <Control-Key-Tab> {+ttk::notebook::TLCycleTab %W 1} - bind $top <Shift-Control-Key-Tab> {+ttk::notebook::TLCycleTab %W -1} + bind $top <Control-Shift-Key-Tab> {+ttk::notebook::TLCycleTab %W -1} catch { bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1} } @@ -170,7 +170,7 @@ proc ttk::notebook::EnclosingNotebook {w} { } # TLCycleTab -- -# toplevel binding procedure for Control-Tab / Shift-Control-Tab +# toplevel binding procedure for Control-Tab / Control-Shift-Tab # Select the next/previous tab in the nearest ancestor notebook. # proc ttk::notebook::TLCycleTab {w dir} { diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 0987129..4d0ccfa 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -646,7 +646,7 @@ OpenIM( } if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr, - (void *) NULL) != NULL) || (stylePtr == NULL)) { + NULL) != NULL) || (stylePtr == NULL)) { goto error; } diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index f13adf7..d07f13a 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -64,9 +64,9 @@ Tk_SetCaretPos( spot.x = dispPtr->caret.x; spot.y = dispPtr->caret.y + dispPtr->caret.height; - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL); + preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); XSetICValues(winPtr->inputContext, XNPreeditAttributes, preedit_attr, - (void *) NULL); + NULL); XFree(preedit_attr); } #endif diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 50642ad..ab2ed4a 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -123,7 +123,7 @@ GetFont( FC_FAMILY, FcTypeString, "sans", FC_SIZE, FcTypeDouble, 12.0, FC_MATRIX, FcTypeMatrix, &mat, - (void *) NULL); + NULL); } if (!ftFont) { /* |