author | zecke <zecke> | 2004-07-23 18:18:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-23 18:18:15 (UTC) |
commit | f9499e14b777050f0bdb3821ca8421dd4c7231fd (patch) (unidiff) | |
tree | 7d96a449aa3b211bd7c5bc9f4d5a7908005cd287 /qt/qt-2.3.7.patch/qte237-keyboard.patch | |
parent | 984ab6b8bccf667a89062d959defed4a5d86bfb1 (diff) | |
download | opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.zip opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.tar.gz opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.tar.bz2 |
Split up the patches for Qt2.3.7 and Qt2.3.8 and add comments
on what they do
Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-keyboard.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-keyboard.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-keyboard.patch b/qt/qt-2.3.7.patch/qte237-keyboard.patch new file mode 100644 index 0000000..b644fd7 --- a/dev/null +++ b/qt/qt-2.3.7.patch/qte237-keyboard.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Free the Virtual Terminal and Keyboard on a segfault in all cases... | ||
2 | |||
3 | |||
4 | --- qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:22:56.000000000 +0200 | ||
5 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:33:47.000000000 +0200 | ||
6 | @@ -844,6 +844,18 @@ | ||
7 | { | ||
8 | } | ||
9 | |||
10 | +static void catchSegvSignal( int ) | ||
11 | +{ | ||
12 | +#ifndef QT_NO_QWS_KEYBOARD | ||
13 | + if ( qwsServer ) | ||
14 | +qwsServer->closeKeyboard(); | ||
15 | +#endif | ||
16 | + QWSServer::closedown(); | ||
17 | + fprintf(stderr, "Segmentation fault.\n"); | ||
18 | + exit(1); | ||
19 | +} | ||
20 | + | ||
21 | + | ||
22 | /*! | ||
23 | \class QWSServer qwindowsystem_qws.h | ||
24 | \brief Server-specific functionality in Qt/Embedded | ||
25 | @@ -936,6 +948,7 @@ | ||
26 | } | ||
27 | |||
28 | signal(SIGPIPE, ignoreSignal); //we get it when we read | ||
29 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | ||
30 | #endif | ||
31 | focusw = 0; | ||
32 | mouseGrabber = 0; | ||
33 | --- qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp2004-07-23 15:22:56.000000000 +0200 | ||
34 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-07-23 15:33:46.000000000 +0200 | ||
35 | @@ -238,7 +238,7 @@ | ||
36 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 | ||
37 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 | ||
38 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 | ||
39 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 | ||
40 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 | ||
41 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 | ||
42 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 | ||
43 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 | ||