Changeset 1a31baf for waflib/ansiterm.py

Timestamp:

Mar 12, 2014, 2:02:47 AM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

46b00690

Parents:

db21ca4

Message:

waf, waflib: update to 1.7.15

File:

• waflib/ansiterm.py (modified) (5 diffs)

waflib/ansiterm.py

@@ -7 +7 @@
         if not(sys.stderr.isatty()and sys.stdout.isatty()):
                 raise ValueError('not a tty')
-        from ctypes import*
+        from ctypes import Structure,windll,c_short,c_ushort,c_ulong,c_int,byref,POINTER,c_long,c_char
         class COORD(Structure):
                 _fields_=[("X",c_short),("Y",c_short)]
@@ -16 +16 @@
         class CONSOLE_CURSOR_INFO(Structure):
                 _fields_=[('dwSize',c_ulong),('bVisible',c_int)]
+        windll.kernel32.GetStdHandle.argtypes=[c_ulong]
+        windll.kernel32.GetStdHandle.restype=c_ulong
+        windll.kernel32.GetConsoleScreenBufferInfo.argtypes=[c_ulong,POINTER(CONSOLE_SCREEN_BUFFER_INFO)]
+        windll.kernel32.GetConsoleScreenBufferInfo.restype=c_long
+        windll.kernel32.SetConsoleTextAttribute.argtypes=[c_ulong,c_ushort]
+        windll.kernel32.SetConsoleTextAttribute.restype=c_long
+        windll.kernel32.FillConsoleOutputCharacterA.argtypes=[c_ulong,c_char,c_ulong,POINTER(COORD),POINTER(c_ulong)]
+        windll.kernel32.FillConsoleOutputCharacterA.restype=c_long
+        windll.kernel32.FillConsoleOutputAttribute.argtypes=[c_ulong,c_ushort,c_ulong,POINTER(COORD),POINTER(c_ulong)]
+        windll.kernel32.FillConsoleOutputAttribute.restype=c_long
+        windll.kernel32.SetConsoleCursorPosition.argtypes=[c_ulong,POINTER(COORD)]
+        windll.kernel32.SetConsoleCursorPosition.restype=c_long
+        windll.kernel32.SetConsoleCursorInfo.argtypes=[c_ulong,POINTER(CONSOLE_CURSOR_INFO)]
+        windll.kernel32.SetConsoleCursorInfo.restype=c_long
         sbinfo=CONSOLE_SCREEN_BUFFER_INFO()
         csinfo=CONSOLE_CURSOR_INFO()
@@ -60 +74 @@
                                 line_start=sbinfo.CursorPosition
                                 line_length=sbinfo.Size.X-sbinfo.CursorPosition.X
-                        chars_written=c_int()
-                        windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_wchar(' '),line_length,line_start,byref(chars_written))
+                        chars_written=c_ulong()
+                        windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),line_length,line_start,byref(chars_written))
                         windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,line_length,line_start,byref(chars_written))
                 def clear_screen(self,param):
@@ -76 +90 @@
                                 clear_start=sbinfo.CursorPosition
                                 clear_length=((sbinfo.Size.X-sbinfo.CursorPosition.X)+sbinfo.Size.X*(sbinfo.Size.Y-sbinfo.CursorPosition.Y))
-                        chars_written=c_int()
-                        windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_wchar(' '),clear_length,clear_start,byref(chars_written))
+                        chars_written=c_ulong()
+                        windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),clear_length,clear_start,byref(chars_written))
                         windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,clear_length,clear_start,byref(chars_written))
                 def push_cursor(self,param):
@@ -128 +142 @@
                                 else:
                                         c=to_int(c,0)
-                                if c in range(30,38):
+                                if 29<c<38:
                                         attr=(attr&0xfff0)|self.rgb2bgr(c-30)
-                                elif c in range(40,48):
+                                elif 39<c<48:
                                         attr=(attr&0xff0f)|(self.rgb2bgr(c-40)<<4)
                                 elif c==0: