cleanup to hud window creation, menu creation, deal properly with calls to the timeout function when we're not ready for it yet, simplify the "topify" methods, hopefully fix some focus problems

This commit is contained in:
Eric Blade 2009-09-03 09:35:59 -05:00
parent b7495395e8
commit 844a01318a
2 changed files with 97 additions and 124 deletions

View File

@ -81,6 +81,10 @@ class Hud:
(font, font_size) = config.get_default_font(self.table.site) (font, font_size) = config.get_default_font(self.table.site)
self.colors = config.get_default_colors(self.table.site) self.colors = config.get_default_colors(self.table.site)
self.backgroundcolor = gtk.gdk.color_parse(self.colors['hudbgcolor'])
self.foregroundcolor = gtk.gdk.color_parse(self.colors['hudfgcolor'])
if font == None: if font == None:
font = "Sans" font = "Sans"
if font_size == None: if font_size == None:
@ -102,84 +106,65 @@ class Hud:
def create_mw(self): def create_mw(self):
# Set up a main window for this this instance of the HUD # Set up a main window for this this instance of the HUD
self.main_window = gtk.Window() win = gtk.Window()
self.main_window.set_gravity(gtk.gdk.GRAVITY_STATIC) win.set_gravity(gtk.gdk.GRAVITY_STATIC)
self.main_window.set_title("%s FPDBHUD" % (self.table.name)) win.set_title("%s FPDBHUD" % (self.table.name))
self.main_window.set_decorated(False) win.set_decorated(False)
self.main_window.set_opacity(self.colors["hudopacity"]) win.set_opacity(self.colors["hudopacity"])
self.main_window.set_focus_on_map(False)
self.ebox = gtk.EventBox() eventbox = gtk.EventBox()
self.label = gtk.Label("FPDB Menu (Right Click)\nLeft-drag to move") label = gtk.Label("FPDB Menu - Right click\nLeft-Drag to Move")
self.backgroundcolor = gtk.gdk.color_parse(self.colors['hudbgcolor']) win.add(eventbox)
self.foregroundcolor = gtk.gdk.color_parse(self.colors['hudfgcolor']) eventbox.add(label)
self.label.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor) label.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor)
self.label.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor) label.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor)
self.main_window.add(self.ebox) eventbox.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor)
self.ebox.add(self.label) eventbox.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor)
self.ebox.modify_bg(gtk.STATE_NORMAL, self.backgroundcolor)
self.ebox.modify_fg(gtk.STATE_NORMAL, self.foregroundcolor)
self.main_window = win
self.main_window.move(self.table.x, self.table.y) self.main_window.move(self.table.x, self.table.y)
# A popup menu for the main window # A popup menu for the main window
self.menu = gtk.Menu() menu = gtk.Menu()
self.item1 = gtk.MenuItem('Kill this HUD')
self.menu.append(self.item1) killitem = gtk.MenuItem('Kill This HUD')
menu.append(killitem)
if self.parent != None: if self.parent != None:
self.item1.connect("activate", self.parent.kill_hud, self.table_name) killitem.connect("activate", self.parent.kill_hud, self.table_name)
self.item1.show()
self.item2 = gtk.MenuItem('Save Layout') saveitem = gtk.MenuItem('Save HUD Layout')
self.menu.append(self.item2) menu.append(saveitem)
self.item2.connect("activate", self.save_layout) saveitem.connect("activate", self.save_layout)
self.item2.show()
self.item3 = gtk.MenuItem('Reposition Stats') repositem = gtk.MenuItem('Reposition StatWindows')
self.menu.append(self.item3) menu.append(repositem)
self.item3.connect("activate", self.reposition_windows) repositem.connect("activate", self.reposition_windows)
self.item3.show()
self.item4 = gtk.MenuItem('Debug Stat Windows') debugitem = gtk.MenuItem('Debug StatWindows')
self.menu.append(self.item4) menu.append(debugitem)
self.item4.connect("activate", self.debug_stat_windows) debugitem.connect("activate", self.debug_stat_windows)
self.item4.show()
self.item5 = gtk.MenuItem('Set max seats') item5 = gtk.MenuItem('Set max seats')
self.menu.append(self.item5) menu.append(item5)
self.item5.show() maxSeatsMenu = gtk.Menu()
self.maxSeatsMenu = gtk.Menu() item5.set_submenu(maxSeatsMenu)
self.item5.set_submenu(self.maxSeatsMenu)
for i in range(2, 11, 1): for i in range(2, 11, 1):
item = gtk.MenuItem('%d-max' % i) item = gtk.MenuItem('%d-max' % i)
item.ms = i item.ms = i
self.maxSeatsMenu.append(item) maxSeatsMenu.append(item)
item.connect("activate", self.change_max_seats) item.connect("activate", self.change_max_seats)
item.show()
setattr(self, 'maxSeatsMenuItem%d' % (i-1), item) setattr(self, 'maxSeatsMenuItem%d' % (i-1), item)
eventbox.connect_object("button-press-event", self.on_button_press, menu)
self.ebox.connect_object("button-press-event", self.on_button_press, self.menu)
self.main_window.show_all()
self.mw_created = True self.mw_created = True
self.label = label
# TODO: fold all uses of this type of 'topify' code into a single function, if the differences between the versions don't menu.show_all()
# create adverse effects? self.main_window.show_all()
if os.name == 'nt':
self.topify_window(self.main_window) self.topify_window(self.main_window)
else:
self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gets a gdk handle for poker client
self.main_window.gdkhandle = gtk.gdk.window_foreign_new(self.main_window.window.xid) # gets a gdk handle for the hud table window
self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) #
self.update_table_position()
def change_max_seats(self, widget): def change_max_seats(self, widget):
if self.max != widget.ms: if self.max != widget.ms:
@ -199,8 +184,8 @@ class Hud:
self.parent.kill_hud(self, self.table.name) self.parent.kill_hud(self, self.table.name)
return False return False
# anyone know how to do this in unix, or better yet, trap the X11 error that is triggered when executing the get_origin() for a closed window? # anyone know how to do this in unix, or better yet, trap the X11 error that is triggered when executing the get_origin() for a closed window?
if self.table.gdkhandle is not None:
(x, y) = self.main_window.parentgdkhandle.get_origin() (x, y) = self.table.gdkhandle.get_origin()
if self.table.x != x or self.table.y != y: if self.table.x != x or self.table.y != y:
self.table.x = x self.table.x = x
self.table.y = y self.table.y = y
@ -374,30 +359,15 @@ class Hud:
Stats.do_tip(window.e_box[r][c], tip) Stats.do_tip(window.e_box[r][c], tip)
def topify_window(self, window): def topify_window(self, window):
# """Set the specified gtk window to stayontop in MS Windows.""" window.set_focus_on_map(False)
# window.set_accept_focus(False)
# def windowEnumerationHandler(hwnd, resultList):
# '''Callback for win32gui.EnumWindows() to generate list of window handles.'''
# resultList.append((hwnd, win32gui.GetWindowText(hwnd)))
# unique_name = 'unique name for finding this window'
# real_name = window.get_title()
# window.set_title(unique_name)
# tl_windows = []
# win32gui.EnumWindows(windowEnumerationHandler, tl_windows)
#
# for w in tl_windows:
# if w[1] == unique_name:
self.main_window.parentgdkhandle = gtk.gdk.window_foreign_new(long(self.table.number))
# self.main_window.gdkhandle = gtk.gdk.window_foreign_new(w[0])
self.main_window.gdkhandle = self.main_window.window
self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle)
style = win32gui.GetWindowLong(self.table.number, win32con.GWL_EXSTYLE) if not self.table.gdkhandle:
style |= win32con.WS_CLIPCHILDREN self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
win32gui.SetWindowLong(self.table.number, win32con.GWL_EXSTYLE, style) # window.window.reparent(self.table.gdkhandle, 0, 0)
# break window.window.set_transient_for(self.table.gdkhandle)
# window.present()
# window.set_title(real_name)
class Stat_Window: class Stat_Window:
@ -419,6 +389,7 @@ class Stat_Window:
if event.button == 1: # left button event if event.button == 1: # left button event
# TODO: make position saving save sizes as well? # TODO: make position saving save sizes as well?
self.window.show_all()
if event.state & gtk.gdk.SHIFT_MASK: if event.state & gtk.gdk.SHIFT_MASK:
self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time) self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time)
else: else:
@ -462,7 +433,6 @@ class Stat_Window:
self.window.set_title("%s" % seat) self.window.set_title("%s" % seat)
self.window.set_property("skip-taskbar-hint", True) self.window.set_property("skip-taskbar-hint", True)
self.window.set_transient_for(parent.main_window)
self.window.set_focus_on_map(False) self.window.set_focus_on_map(False)
grid = gtk.Table(rows = game.rows, columns = game.cols, homogeneous = False) grid = gtk.Table(rows = game.rows, columns = game.cols, homogeneous = False)
@ -514,11 +484,26 @@ class Stat_Window:
self.window.connect("focus-in-event", self.noop) self.window.connect("focus-in-event", self.noop)
self.window.connect("focus-out-event", self.noop) self.window.connect("focus-out-event", self.noop)
self.window.connect("button_press_event", self.button_press_cb) self.window.connect("button_press_event", self.button_press_cb)
self.window.set_focus_on_map(False)
self.window.set_accept_focus(False)
self.window.move(self.x, self.y) self.window.move(self.x, self.y)
self.window.show_all() # window must be mapped before it has a gdkwindow so we can attach it to the table window.. i hate gtk.
self.topify_window(self.window)
self.window.hide() self.window.hide()
def topify_window(self, window):
window.set_focus_on_map(False)
window.set_accept_focus(False)
if not self.table.gdkhandle:
self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
# window.window.reparent(self.table.gdkhandle, 0, 0)
window.window.set_transient_for(self.table.gdkhandle)
# window.present()
def destroy(*args): # call back for terminating the main eventloop def destroy(*args): # call back for terminating the main eventloop
gtk.main_quit() gtk.main_quit()
@ -534,6 +519,8 @@ class Popup_window:
self.window.set_gravity(gtk.gdk.GRAVITY_STATIC) self.window.set_gravity(gtk.gdk.GRAVITY_STATIC)
self.window.set_title("popup") self.window.set_title("popup")
self.window.set_property("skip-taskbar-hint", True) self.window.set_property("skip-taskbar-hint", True)
self.window.set_focus_on_map(False)
self.window.set_accept_focus(False)
self.window.set_transient_for(parent.get_toplevel()) self.window.set_transient_for(parent.get_toplevel())
self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
@ -599,9 +586,6 @@ class Popup_window:
self.window.set_transient_for(stat_window.window) self.window.set_transient_for(stat_window.window)
# if os.name == 'nt':
# self.topify_window(self.window)
def button_press_cb(self, widget, event, *args): def button_press_cb(self, widget, event, *args):
# This handles all callbacks from button presses on the event boxes in # This handles all callbacks from button presses on the event boxes in
# the popup windows. There is a bit of an ugly kludge to separate single- # the popup windows. There is a bit of an ugly kludge to separate single-
@ -630,27 +614,15 @@ class Popup_window:
top.move(x, y) top.move(x, y)
def topify_window(self, window): def topify_window(self, window):
"""Set the specified gtk window to stayontop in MS Windows.""" window.set_focus_on_map(False)
window.set_accept_focus(False)
# def windowEnumerationHandler(hwnd, resultList): if not self.table.gdkhandle:
# '''Callback for win32gui.EnumWindows() to generate list of window handles.''' self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
# resultList.append((hwnd, win32gui.GetWindowText(hwnd))) # window.window.reparent(self.table.gdkhandle, 0, 0)
window.window.set_transient_for(self.table.gdkhandle)
# window.present()
# unique_name = 'unique name for finding this window'
# real_name = window.get_title()
# window.set_title(unique_name)
# tl_windows = []
# win32gui.EnumWindows(windowEnumerationHandler, tl_windows)
# for w in tl_windows:
# if w[1] == unique_name:
# window.set_transient_for(self.parent.window)
style = win32gui.GetWindowLong(self.parent.table.number, win32con.GWL_EXSTYLE)
style |= win32con.WS_CLIPCHILDREN
win32gui.SetWindowLong(self.parent.table.number, win32con.GWL_EXSTYLE, style)
# break
# window.set_title(real_name)
if __name__== "__main__": if __name__== "__main__":
main_window = gtk.Window() main_window = gtk.Window()
@ -661,7 +633,7 @@ if __name__== "__main__":
c = Configuration.Config() c = Configuration.Config()
#tables = Tables.discover(c) #tables = Tables.discover(c)
t = Tables.discover_table_by_name(c, "Patriot Dr") t = Tables.discover_table_by_name(c, "Motorway")
if t is None: if t is None:
print "Table not found." print "Table not found."
db = Database.Database(c, 'fpdb', 'holdem') db = Database.Database(c, 'fpdb', 'holdem')

View File

@ -69,6 +69,7 @@ class Table_Window:
if 'site' in info: self.site = info['site'] if 'site' in info: self.site = info['site']
if 'title' in info: self.title = info['title'] if 'title' in info: self.title = info['title']
if 'name' in info: self.name = info['name'] if 'name' in info: self.name = info['name']
self.gdkhandle = None
def __str__(self): def __str__(self):
# __str__ method for testing # __str__ method for testing