summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-28 05:29:49 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2009-09-28 05:29:49 (GMT)
commit29cb904e4de2411a9b6dbe68694954788f0525f7 (patch) (side-by-side diff)
tree908730f79c7498be31fe3d9582354e8ac44416b6
parentde6cee11e1c335a0e5f708e7641e81d3cfe52529 (diff)
downloadxserver-29cb904e4de2411a9b6dbe68694954788f0525f7.zip
xserver-29cb904e4de2411a9b6dbe68694954788f0525f7.tar.gz
XQuartz: Nuke TSM
It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/X11Application.m16
1 files changed, 0 insertions, 16 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 3cf7a77..ad022c9 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -184,9 +184,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
}
- (void) activateX:(OSX_BOOL)state {
- /* Create a TSM document that supports full Unicode input, and
- have it activated while X is active */
- static TSMDocumentID x11_document;
size_t i;
DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
if (state) {
@@ -195,16 +192,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
bgMouseLocationUpdated = FALSE;
}
DarwinSendDDXEvent(kXquartzActivate, 0);
-
- if (!_x_active) {
- if (x11_document == 0) {
- OSType types[1];
- types[0] = kUnicodeDocument;
- NewTSMDocument (1, types, &x11_document, 0);
- }
-
- if (x11_document != 0) ActivateTSMDocument (x11_document);
- }
} else {
if(darwin_all_modifier_flags)
@@ -217,9 +204,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
}
DarwinSendDDXEvent(kXquartzDeactivate, 0);
-
- if (_x_active && x11_document != 0)
- DeactivateTSMDocument (x11_document);
}
_x_active = state;