Commit 7a583365 authored by Jack Jansen's avatar Jack Jansen

Various fixes: missing imports, missing calls to

MacOS.HandleEvent. Also, prints are now inside 'if DEBUG'.
parent 01c2309f
"A sort of application framework for the Mac" "A sort of application framework for the Mac"
DEBUG=0
import MacOS import MacOS
import traceback import traceback
...@@ -8,27 +9,27 @@ from addpack import addpack ...@@ -8,27 +9,27 @@ from addpack import addpack
addpack('Tools') addpack('Tools')
addpack('bgen') addpack('bgen')
addpack('ae') addpack('ae')
#addpack('ctl') addpack('ctl')
addpack('dlg') addpack('dlg')
addpack('evt') addpack('evt')
addpack('menu') addpack('menu')
#addpack('qd') addpack('qd')
#addpack('res') #addpack('res')
#addpack('snd') #addpack('snd')
addpack('win') addpack('win')
from AE import * from AE import *
from AppleEvents import * from AppleEvents import *
#from Ctl import * from Ctl import *
#from Controls import * from Controls import *
from Dlg import * from Dlg import *
from Dialogs import * from Dialogs import *
from Evt import * from Evt import *
from Events import * from Events import *
from Menu import * from Menu import *
from Menus import * from Menus import *
#from Qd import * from Qd import *
#from QuickDraw import * from QuickDraw import *
#from Res import * #from Res import *
#from Resources import * #from Resources import *
#from Snd import * #from Snd import *
...@@ -144,21 +145,23 @@ class Application: ...@@ -144,21 +145,23 @@ class Application:
name = "do_%d" % partcode name = "do_%d" % partcode
try: try:
handler = getattr(self, name) handler = getattr(self, name)
except AttrinuteError: except AttributeError:
handler = self.do_unknownpartcode handler = self.do_unknownpartcode
handler(partcode, window, event) handler(partcode, window, event)
def do_inDrag(self, partcode, window, event): def do_inDrag(self, partcode, window, event):
where = event[3]
window.DragWindow(where, self.draglimit) window.DragWindow(where, self.draglimit)
draglimit = everywhere draglimit = everywhere
def do_inGoAway(self, partcode, window, event): def do_inGoAway(self, partcode, window, event):
where = event[3]
if window.TrackGoAway(where): if window.TrackGoAway(where):
self.do_close(window) self.do_close(window)
def do_close(self, window): def do_close(self, window):
print "Should close window:", window if DEBUG: print "Should close window:", window
def do_inZoom(self, partcode, window, event): def do_inZoom(self, partcode, window, event):
(what, message, when, where, modifiers) = event (what, message, when, where, modifiers) = event
...@@ -174,12 +177,14 @@ class Application: ...@@ -174,12 +177,14 @@ class Application:
self.do_inZoom(partcode, window, event) self.do_inZoom(partcode, window, event)
def do_inSysWindow(self, partcode, window, event): def do_inSysWindow(self, partcode, window, event):
print "SystemClick", event, window MacOS.HandleEvent(event)
# print "SystemClick", event, window
# SystemClick(event, window) # XXX useless, window is None # SystemClick(event, window) # XXX useless, window is None
def do_inDesk(self, partcode, window, event): def do_inDesk(self, partcode, window, event):
print "inDesk" # print "inDesk"
# XXX what to do with it? # XXX what to do with it?
MacOS.HandleEvent(event)
def do_inMenuBar(self, partcode, window, event): def do_inMenuBar(self, partcode, window, event):
(what, message, when, where, modifiers) = event (what, message, when, where, modifiers) = event
...@@ -224,16 +229,17 @@ class Application: ...@@ -224,16 +229,17 @@ class Application:
if pcode: if pcode:
self.do_controlhit(window, control, pcode, event) self.do_controlhit(window, control, pcode, event)
else: else:
print "FindControl(%s, %s) -> (%s, %s)" % \ if DEBUG: print "FindControl(%s, %s) -> (%s, %s)" % \
(local, window, ctltype, control) (local, window, ctltype, control)
def do_controlhit(self, window, control, pcode, event): def do_controlhit(self, window, control, pcode, event):
print "control hit in", window, "on", control, "; pcode =", pcode if DEBUG: print "control hit in", window, "on", control, "; pcode =", pcode
def do_unknownpartcode(self, partcode, window, event): def do_unknownpartcode(self, partcode, window, event):
(what, message, when, where, modifiers) = event (what, message, when, where, modifiers) = event
print "Mouse down at global:", where if DEBUG: print "Mouse down at global:", where
print "\tUnknown part code:", partcode if DEBUG: print "\tUnknown part code:", partcode
MacOS.HandleEvent(event)
def do_keyDown(self, event): def do_keyDown(self, event):
self.do_key(event) self.do_key(event)
...@@ -259,26 +265,27 @@ class Application: ...@@ -259,26 +265,27 @@ class Application:
if w: if w:
self.do_close(w) self.do_close(w)
else: else:
print 'Command-W without front window' if DEBUG: print 'Command-W without front window'
else: else:
print "Command-" +`c` if DEBUG: print "Command-" +`c`
else: else:
self.do_char(c, event) self.do_char(c, event)
def do_char(self, c, event): def do_char(self, c, event):
print "Character", `c` if DEBUG: print "Character", `c`
def do_updateEvt(self, event): def do_updateEvt(self, event):
if DEBUG:
print "do_update", print "do_update",
self.printevent(event) self.printevent(event)
window = FrontWindow() # XXX This is wrong! window = FrontWindow() # XXX This is wrong!
if window: if window:
self.do_rawupdate(window, event) self.do_rawupdate(window, event)
else: else:
print "no window for do_updateEvt" MacOS.HandleEvent(event)
def do_rawupdate(self, window, event): def do_rawupdate(self, window, event):
print "raw update for", window if DEBUG: print "raw update for", window
window.BeginUpdate() window.BeginUpdate()
self.do_update(window, event) self.do_update(window, event)
DrawControls(window) DrawControls(window)
...@@ -290,6 +297,7 @@ class Application: ...@@ -290,6 +297,7 @@ class Application:
def do_kHighLevelEvent(self, event): def do_kHighLevelEvent(self, event):
(what, message, when, where, modifiers) = event (what, message, when, where, modifiers) = event
if DEBUG:
print "High Level Event:", print "High Level Event:",
self.printevent(event) self.printevent(event)
try: try:
...@@ -358,7 +366,7 @@ class MenuBar: ...@@ -358,7 +366,7 @@ class MenuBar:
if self.menus.has_key(id): if self.menus.has_key(id):
self.menus[id].dispatch(id, item, window, event) self.menus[id].dispatch(id, item, window, event)
else: else:
print "MenuBar.dispatch(%d, %d, %s, %s)" % \ if DEBUG: print "MenuBar.dispatch(%d, %d, %s, %s)" % \
(id, item, window, event) (id, item, window, event)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment