[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/cursing/Button.py common/src/cu...
|
From: |
Jason Cater |
|
Subject: |
gnue common/src/cursing/Button.py common/src/cu... |
|
Date: |
Fri, 15 Nov 2002 02:20:39 -0500 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/11/15 02:20:37
Modified files:
common/src/cursing: Button.py GraphicObject.py MenuItem.py
StatusBar.py TextArea.py sio.py
forms/src/uidrivers/curses: UIdriver.py
Added files:
common/src/cursing: ColorScheme.py
Log message:
more work on curses
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/ColorScheme.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/Button.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/GraphicObject.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/MenuItem.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/StatusBar.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/TextArea.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/cursing/sio.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: gnue/common/src/cursing/Button.py
diff -c gnue/common/src/cursing/Button.py:1.8
gnue/common/src/cursing/Button.py:1.9
*** gnue/common/src/cursing/Button.py:1.8 Thu Nov 14 20:44:28 2002
--- gnue/common/src/cursing/Button.py Fri Nov 15 02:20:36 2002
***************
*** 29,34 ****
--- 29,35 ----
from gnue.common import GDebug
from constants import *
from Control import Control
+ import curses
import sio
#
***************
*** 101,111 ****
if Container == None:
raise "No container!"
if HaveFocus:
! self.SetColor(sio.C_BUTTON_FOCUS)
! self.LoLight()
else:
! self.SetColor(sio.C_BUTTON)
! self.LoLight()
tROW, tCOL = self._ABSY, self._ABSX
tCaption = self.CAPTION
tW = self.W
--- 102,114 ----
if Container == None:
raise "No container!"
if HaveFocus:
! color = sio.C_BUTTON_FOCUS
! # self.SetColor(sio.C_BUTTON_FOCUS)
! # self.LoLight()
else:
! color = sio.C_BUTTON
! # self.SetColor(sio.C_BUTTON)
! # self.LoLight()
tROW, tCOL = self._ABSY, self._ABSX
tCaption = self.CAPTION
tW = self.W
***************
*** 124,130 ****
spaces += 1
tCaption = (" " * leadingSpaces) + tCaption + (" " * spaces)
! Container.PrintAt(tROW, tCOL, "<" + tCaption + ">")
def GotFocus(self, Arg1, Arg2, Arg3):
self.FOCUS = 1
--- 127,133 ----
spaces += 1
tCaption = (" " * leadingSpaces) + tCaption + (" " * spaces)
! Container.PrintAt(tROW, tCOL, "<" + tCaption + ">",
curses.color_pair(color))
def GotFocus(self, Arg1, Arg2, Arg3):
self.FOCUS = 1
Index: gnue/common/src/cursing/GraphicObject.py
diff -c gnue/common/src/cursing/GraphicObject.py:1.5
gnue/common/src/cursing/GraphicObject.py:1.6
*** gnue/common/src/cursing/GraphicObject.py:1.5 Mon Nov 11 00:59:59 2002
--- gnue/common/src/cursing/GraphicObject.py Fri Nov 15 02:20:37 2002
***************
*** 98,108 ****
--- 98,110 ----
def LoLight (self):
+ # return
Screen = self.SCREEN
self._SetLight("LOLIGHT_COLOR", Screen.SetColor, Screen.LoLight)
def HiLight(self):
+ return
Screen = self.SCREEN
self._SetLight("HILIGHT_COLOR", Screen.SetColor, Screen.HiLight)
Index: gnue/common/src/cursing/MenuItem.py
diff -c gnue/common/src/cursing/MenuItem.py:1.4
gnue/common/src/cursing/MenuItem.py:1.5
*** gnue/common/src/cursing/MenuItem.py:1.4 Thu Oct 17 19:35:01 2002
--- gnue/common/src/cursing/MenuItem.py Fri Nov 15 02:20:37 2002
***************
*** 71,90 ****
Container = self.PARENT.Screen()
if self.active:
if HasFocus :
! self.SetColor(2)
if self.STATUSBARLINK and self.STATUSBARLINK.STATUSBAR:
self.STATUSBARLINK.STATUSBAR.SetText(self.STATUSBARLINK.STATUSBAR_INDEX,
self.DESCRIPTION)
! else:
! self.SetColor(1)
! else:
! self.SetColor(4)
! self.LoLight()
Y = self.Y
X = self.X
caption = self.CAPTION
! Container.PrintAt(Y,X,caption)
! if self.active :
! self.SetColor(1)
! self.LoLight()
--- 71,90 ----
Container = self.PARENT.Screen()
if self.active:
if HasFocus :
! # self.SetColor(2)
if self.STATUSBARLINK and self.STATUSBARLINK.STATUSBAR:
self.STATUSBARLINK.STATUSBAR.SetText(self.STATUSBARLINK.STATUSBAR_INDEX,
self.DESCRIPTION)
! # else:
! # self.SetColor(1)
! # else:
! # self.SetColor(4)
! # self.LoLight()
Y = self.Y
X = self.X
caption = self.CAPTION
! Container.PrintAt(Y,X,caption, hasfocus and sio.C_MENUBAR_FOCUS or
sio.C_MENUBAR)
! # if self.active :
! # self.SetColor(1)
! # self.LoLight()
Index: gnue/common/src/cursing/StatusBar.py
diff -c gnue/common/src/cursing/StatusBar.py:1.3
gnue/common/src/cursing/StatusBar.py:1.4
*** gnue/common/src/cursing/StatusBar.py:1.3 Thu Nov 14 20:44:28 2002
--- gnue/common/src/cursing/StatusBar.py Fri Nov 15 02:20:37 2002
***************
*** 130,138 ****
GDebug.printMesg(1,'Visible, so adding %s' % caption)
Container = self.PARENT.Screen()
- Container.SetColor(sio.C_STATUSBAR_FIELD)
y,x = Container.GetYX()
! Container.PrintAt(self._ABSY,X,caption) #,
curses.color_pair(sio.C_STATUSBAR_FIELD))
Container.GotoYX(y,x)
--- 130,138 ----
GDebug.printMesg(1,'Visible, so adding %s' % caption)
Container = self.PARENT.Screen()
y,x = Container.GetYX()
! self.HiLight
! Container.PrintAt(self._ABSY,X,caption,
curses.color_pair(sio.C_STATUSBAR_FIELD))
Container.GotoYX(y,x)
***************
*** 145,155 ****
Container = self.PARENT.Screen()
if Container == None:
raise "No container--can't paint!"
! self.LoLight()
Y = self._ABSY
! Container.PrintAt(Y,self._ABSX,self._EmptyStatusBar)#,
! #curses.color_pair(sio.C_STATUSBAR))
for index in range(self.NUM_FIELDS):
--- 145,154 ----
Container = self.PARENT.Screen()
if Container == None:
raise "No container--can't paint!"
! # self.LoLight()
Y = self._ABSY
! Container.PrintAt(Y,self._ABSX,self._EmptyStatusBar,
curses.color_pair(sio.C_STATUSBAR))
for index in range(self.NUM_FIELDS):
***************
*** 158,164 ****
caption = string.ljust(self.TEXT[index][:size], size)
# Container.SetColor(sio.C_STATUSBAR_FIELD)
! Container.PrintAt(Y,X,caption)#,
# curses.color_pair(sio.C_STATUSBAR_FIELD))
self._visible = 1
--- 157,163 ----
caption = string.ljust(self.TEXT[index][:size], size)
# Container.SetColor(sio.C_STATUSBAR_FIELD)
! Container.PrintAt(Y,X,caption,
curses.color_pair(sio.C_STATUSBAR_FIELD))#,
# curses.color_pair(sio.C_STATUSBAR_FIELD))
self._visible = 1
Index: gnue/common/src/cursing/TextArea.py
diff -c gnue/common/src/cursing/TextArea.py:1.4
gnue/common/src/cursing/TextArea.py:1.5
*** gnue/common/src/cursing/TextArea.py:1.4 Thu Nov 7 11:37:03 2002
--- gnue/common/src/cursing/TextArea.py Fri Nov 15 02:20:37 2002
***************
*** 190,202 ****
def SetCursor(self, location):
self.DEPTH = location
curses.curs_set(1)
self.Paint(None, None, None)
def LostFocus(self, v1, v2, v3):
self.SetColor(sio.C_TEXTBOX)
Container = self.PARENT.Screen()
! self.Paint(None, None, None)
def GotFocus(self, v1, v2, v3):
self.SetColor(sio.C_TEXTBOX_FOCUS)
--- 190,206 ----
def SetCursor(self, location):
self.DEPTH = location
+ Container = self.PARENT.Screen()
curses.curs_set(1)
+ Container.GotoYX(self._ABSY, self._ABSX+ self.DEPTH)
self.Paint(None, None, None)
def LostFocus(self, v1, v2, v3):
+ curses.curs_set(0)
self.SetColor(sio.C_TEXTBOX)
Container = self.PARENT.Screen()
! if self.PARENT.VISIBLE:
! self.Paint(0,0,0)
def GotFocus(self, v1, v2, v3):
self.SetColor(sio.C_TEXTBOX_FOCUS)
***************
*** 204,212 ****
self.Paint(None, None, None)
Container.GotoYX(self._ABSY, self._ABSX+ self.DEPTH)
! def SetValue(self, newText):
self.TEXT = newText
! self.Paint(0,0,0)
def GetValue(self):
return self.TEXT
--- 208,217 ----
self.Paint(None, None, None)
Container.GotoYX(self._ABSY, self._ABSX+ self.DEPTH)
! def SetValue(self, newText, repaint=1):
self.TEXT = newText
! if self.PARENT.VISIBLE:
! self.Paint(0,0,0)
def GetValue(self):
return self.TEXT
Index: gnue/common/src/cursing/sio.py
diff -c gnue/common/src/cursing/sio.py:1.7 gnue/common/src/cursing/sio.py:1.8
*** gnue/common/src/cursing/sio.py:1.7 Thu Nov 14 20:44:28 2002
--- gnue/common/src/cursing/sio.py Fri Nov 15 02:20:37 2002
***************
*** 37,44 ****
from constants import *
import curses
! C_SCREEN = 1
!
C_TITLEBAR = 3
C_MENUBAR = 4
C_MENUBAR_FOCUS = 5
--- 37,43 ----
from constants import *
import curses
! C_SCREEN = 2
C_TITLEBAR = 3
C_MENUBAR = 4
C_MENUBAR_FOCUS = 5
***************
*** 54,69 ****
C_SCROLL_BACKGROUND = 15
C_SCROLL_SLIDER = 16
C_SCROLL_SLIDER_FOCUS = 17
! C_STATUSBAR = 18
! C_STATUSBAR_FIELD = 19
class sio:
"""
! This class basically acts as an interface to curses. To convert this
! class to NCurses or SLANG, you would only need to change this class.
!
! NOT TRUE ANYMORE, I´m sorry to say, but I use curses code in other
! places as well. (Says the original author)
"""
def __init__(self):
--- 53,64 ----
C_SCROLL_BACKGROUND = 15
C_SCROLL_SLIDER = 16
C_SCROLL_SLIDER_FOCUS = 17
! C_STATUSBAR = 10
! C_STATUSBAR_FIELD = 10 # 7
class sio:
"""
! This class basically acts as an interface to curses.
"""
def __init__(self):
***************
*** 120,153 ****
tiRTEE : curses.ACS_RTEE,
tiBULL : curses.ACS_PLUS}
try:
! # FIXME
! # should really only do this on configuration says yes, or on
! # some other test.
curses.start_color()
! # don't know why this is here.
! #self.SetColor(1)
if curses.has_colors ():
! curses.init_pair(C_SCREEN, curses.COLOR_WHITE,curses.COLOR_BLUE)
! curses.init_pair(C_TITLEBAR, curses.COLOR_WHITE,curses.COLOR_BLUE)
! curses.init_pair(C_MENUBAR, curses.COLOR_YELLOW,curses.COLOR_BLUE)
! curses.init_pair(C_MENUBAR_FOCUS,
curses.COLOR_BLUE,curses.COLOR_WHITE)
! curses.init_pair(C_LABEL, curses.COLOR_BLACK,curses.COLOR_WHITE)
! curses.init_pair(C_DIALOG, curses.COLOR_BLACK,curses.COLOR_WHITE)
! curses.init_pair(C_DIALOG_TITLE,
curses.COLOR_YELLOW,curses.COLOR_WHITE)
! curses.init_pair(C_TEXTBOX_FOCUS, curses.COLOR_BLACK,6)
! # curses.init_pair(C_TEXTBOX, curses.COLOR_WHITE,curses.COLOR_BLUE)
! curses.init_pair(C_TEXTBOX, curses.COLOR_BLUE,curses.COLOR_WHITE)
! curses.init_pair(C_BUTTON, curses.COLOR_BLUE,curses.COLOR_WHITE)
! curses.init_pair(C_BUTTON_FOCUS, curses.COLOR_WHITE,curses.COLOR_BLUE)
! curses.init_pair(C_SCROLL_BUTTON,
curses.COLOR_BLACK,curses.COLOR_WHITE)
! curses.init_pair(C_SCROLL_BUTTON_FOCUS, 6,curses.COLOR_WHITE)
! curses.init_pair(C_SCROLL_BACKGROUND,
curses.COLOR_BLUE,curses.COLOR_GRAY)
! curses.init_pair(C_SCROLL_SLIDER,
curses.COLOR_WHITE,curses.COLOR_BLUE)
! curses.init_pair(C_SCROLL_SLIDER_FOCUS, 0, 6)
! curses.init_pair(C_STATUSBAR, curses.COLOR_BLACK, curses.COLOR_WHITE)
! curses.init_pair(C_STATUSBAR_FIELD, curses.COLOR_BLUE,
curses.COLOR_WHITE)
except:
pass
--- 115,159 ----
tiRTEE : curses.ACS_RTEE,
tiBULL : curses.ACS_PLUS}
try:
! # TODO: should really only do this if configuration
! # TODO: says yes, or on some other test.
curses.start_color()
! import ColorScheme
if curses.has_colors ():
! ## self.colors = ColorScheme.StandardBlueOnWhite()
! ## f = open('test','w')
! ## f.write('Color: %s\n' % C_SCREEN)
! ## f.close()
! ## #sys.exit()
! pass
!
! # curses.init_pair(C_SCREEN, curses.COLOR_WHITE,curses.COLOR_BLUE)
! # curses.init_pair(C_TITLEBAR, curses.COLOR_WHITE,curses.COLOR_BLUE)
! # curses.init_pair(C_MENUBAR, curses.COLOR_YELLOW,curses.COLOR_BLUE)
! # curses.init_pair(C_MENUBAR_FOCUS,
curses.COLOR_BLUE,curses.COLOR_WHITE)
! # curses.init_pair(C_LABEL, curses.COLOR_BLACK,curses.COLOR_WHITE)
! # curses.init_pair(C_DIALOG, curses.COLOR_BLACK,curses.COLOR_WHITE)
! # curses.init_pair(C_DIALOG_TITLE,
curses.COLOR_YELLOW,curses.COLOR_WHITE)
! # curses.init_pair(C_TEXTBOX_FOCUS,
curses.COLOR_BLACK,curses.COLOR_CYAN)
! ## curses.init_pair(C_TEXTBOX, curses.COLOR_WHITE,curses.COLOR_BLUE)
! # curses.init_pair(C_TEXTBOX, curses.COLOR_BLUE,curses.COLOR_WHITE)
! # curses.init_pair(C_BUTTON, curses.COLOR_BLUE,curses.COLOR_WHITE)
! ## curses.init_pair(C_BUTTON_FOCUS,
curses.COLOR_WHITE,curses.COLOR_CYAN)
! # curses.init_pair(C_SCROLL_BUTTON,
curses.COLOR_BLACK,curses.COLOR_WHITE)
! # curses.init_pair(C_SCROLL_BUTTON_FOCUS,
curses.COLOR_CYAN,curses.COLOR_WHITE)
! # curses.init_pair(C_SCROLL_BACKGROUND,
curses.COLOR_BLUE,curses.COLOR_GRAY)
! # curses.init_pair(C_SCROLL_SLIDER,
curses.COLOR_WHITE,curses.COLOR_BLUE)
! # curses.init_pair(C_SCROLL_SLIDER_FOCUS, 0, curses.COLOR_CYAN)
! ## curses.init_pair(C_STATUSBAR, curses.COLOR_BLACK,
curses.COLOR_WHITE)
! ## curses.init_pair(C_STATUSBAR_FIELD, curses.COLOR_BLUE,
curses.COLOR_WHITE)
! else:
! f = open('test','w')
! f.write('NO COLORS!')
! f.close()
! self.colors = ColorScheme.Monochrome()
!
except:
pass
***************
*** 309,317 ****
def HiLight(self):
"""
"""
if curses.has_colors():
# TODO: should this be curses.color_pair(colorHi)?
! ## self.PrintMods = curses.color_pair(colorHi)
self.PrintMods = curses.A_BOLD
else:
self.PrintMods = curses.A_NORMAL
--- 315,324 ----
def HiLight(self):
"""
"""
+ return
if curses.has_colors():
# TODO: should this be curses.color_pair(colorHi)?
! #self.PrintMods = curses.color_pair(colorHi)
self.PrintMods = curses.A_BOLD
else:
self.PrintMods = curses.A_NORMAL
***************
*** 320,338 ****
def LoLight(self):
"""
"""
if curses.has_colors():
self.PrintMods = curses.color_pair(colorLow)
else:
self.PrintMods = curses.A_DIM
! def SetColor(self, n):
"""
"""
! self.COLOR = n
try:
if curses.has_colors():
! self.PrintMods = curses.color_pair(n)
except AttributeError:
pass
--- 327,350 ----
def LoLight(self):
"""
"""
+ return
if curses.has_colors():
self.PrintMods = curses.color_pair(colorLow)
else:
self.PrintMods = curses.A_DIM
! def SetColor(self, ll, hl=None):
"""
"""
! ## if type(ll) == type( (0,) ):
! ## ll, hl = ll
!
! ## self.COLOR = (ll,hl)
! self.COLOR = ll
try:
if curses.has_colors():
! self.PrintMods = curses.color_pair(ll)
except AttributeError:
pass
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.20
gnue/forms/src/uidrivers/curses/UIdriver.py:1.21
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.20 Thu Nov 14 20:44:28 2002
--- gnue/forms/src/uidrivers/curses/UIdriver.py Fri Nov 15 02:20:37 2002
***************
*** 343,349 ****
def gotoPage(self, event):
self.visiblePage.Hide()
self.visiblePage = self._objectMapping[event.data]
- sys.stderr.write('\n\ngotoPage\n')
self.visiblePage.Show()
## if not _NOTEBOOK:
--- 343,348 ----
***************
*** 453,459 ****
pass # self.Destroy()
def indexedFocus(self, index):
- sys.stderr.write('IndexedFocus %s\n' % self.widgets[index])
widget = self.widgets[index]
widget.PARENT.SetFocus(widget,run=0)
--- 452,457 ----