diff --git a/argparse.vp b/argparse.vp index 8820b06..120110b 100644 --- a/argparse.vp +++ b/argparse.vp @@ -90,14 +90,14 @@ class ParsedArgs: if self._ht.__contains__(name) == 0: return 0 ptr: t.CPtr = self._ht[name] - return c.Deref(t.CInt(t.CUInt64T(ptr), t.CPtr)) + return c.Deref(int(uint64(ptr), t.CPtr)) def get_bool(self, name: str) -> bool: """Fetch boolean value. Returns false if key not found.""" if self._ht.__contains__(name) == 0: return False ptr: t.CPtr = self._ht[name] - return c.Deref(t.CInt(t.CUInt64T(ptr), t.CPtr)) != 0 + return c.Deref(int(uint64(ptr), t.CPtr)) != 0 def has(self, name: str) -> bool: """Check whether specified key exists.""" @@ -123,7 +123,7 @@ class ParsedArgs: class ArgumentParser: _prog: str _description: str - _args: Argument | t.CPtr + _args: Argument* _arg_count: int __mbuddy__: memhub.MemBuddy* @@ -165,7 +165,7 @@ class ArgumentParser: if self._arg_count >= MAX_ARGS: return idx: int = self._arg_count - arg: Argument | t.CPtr = t.CPtr(t.CUInt64T(self._args) + idx * Argument.__sizeof__()) + arg: Argument* = t.CPtr(uint64(self._args) + idx * Argument.__sizeof__()) arg.name = name arg.short_name = short arg.help_text = help @@ -186,14 +186,14 @@ class ArgumentParser: arg.dest = name + 1 self._arg_count = idx + 1 - def _get_arg(self, idx: int) -> Argument | t.CPtr: - return t.CPtr(t.CUInt64T(self._args) + idx * Argument.__sizeof__()) + def _get_arg(self, idx: int) -> Argument*: + return t.CPtr(uint64(self._args) + idx * Argument.__sizeof__()) def _find_long(self, token: str) -> int: """Exact match for long option name""" i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) if string.strcmp(arg.name, token) == 0: return i i += 1 @@ -203,7 +203,7 @@ class ArgumentParser: """Match prefix for --name=value syntax""" i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) name_len: int = string.strlen(arg.name) if string.strncmp(token, arg.name, name_len) == 0: if token[name_len] == '=': @@ -214,7 +214,7 @@ class ArgumentParser: def _find_short(self, token: str) -> int: i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) if arg.short_name is not None: if string.strcmp(arg.short_name, token) == 0: return i @@ -225,7 +225,7 @@ class ArgumentParser: count: int = 0 i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) if arg.is_positional: if count == pos_idx: return i @@ -233,8 +233,8 @@ class ArgumentParser: i += 1 return -1 - def _store_value(self, args: ParsedArgs | t.CPtr, - arg: Argument | t.CPtr, value: str): + def _store_value(self, args: ParsedArgs*, + arg: Argument*, value: str): if arg.arg_type == INT: args._set_int(arg.dest, string.atoi(value)) elif arg.arg_type == STRING: @@ -243,7 +243,7 @@ class ArgumentParser: v: int = string.atoi(value) args._set_bool(arg.dest, v != 0) - def _apply_action(self, args: ParsedArgs | t.CPtr, arg: Argument | t.CPtr): + def _apply_action(self, args: ParsedArgs*, arg: Argument*): if arg.action == STORE_TRUE: args._set_bool(arg.dest, True) elif arg.action == STORE_FALSE: @@ -252,7 +252,7 @@ class ArgumentParser: cur: int = args.get_int(arg.dest) args._set_int(arg.dest, cur + 1) - def parse_args(self, argc: int, argv: str | t.CPtr) -> ParsedArgs | t.CPtr: + def parse_args(self, argc: int, argv: str*) -> ParsedArgs*: """Parse command line arguments. Args: @@ -264,13 +264,13 @@ class ArgumentParser: if self.__mbuddy__ is None: return None - args: ParsedArgs | t.CPtr = ParsedArgs(self.__mbuddy__) + args: ParsedArgs* = ParsedArgs(self.__mbuddy__) if args is None: return None # Initialize default values i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) if arg.action == STORE: if arg.arg_type == INT: args._set_int(arg.dest, arg.default_int) @@ -289,7 +289,7 @@ class ArgumentParser: pos_idx: int = 0 token: str = None found: int = 0 - arg: Argument | t.CPtr = None + arg: Argument* = None value: str = None # argv 是 char**（`str | t.CPtr`），argv[idx] 直接给出该位置的 char*。 @@ -411,7 +411,7 @@ class ArgumentParser: stdio.printf("\npositional arguments:\n") i: int = 0 while i < self._arg_count: - arg: Argument | t.CPtr = self._get_arg(i) + arg: Argument* = self._get_arg(i) if arg.is_positional: ht: str = arg.help_text if ht is None: diff --git a/ast/base.vp b/ast/base.vp index a6f4ec0..380c918 100644 --- a/ast/base.vp +++ b/ast/base.vp @@ -141,7 +141,7 @@ def _init_ast(node: rawptr[AST], pool: rawptr[memhub.MemManager], lineno: int, c node.children = None -def _set_parent_list(lst: list[rawptr[AST]] | t.CPtr, parent: rawptr[AST]): +def _set_parent_list(lst: list[rawptr[AST]]*, parent: rawptr[AST]): """Set list children parent pointers.""" if lst is None: return for i in range(lst.__len__()): @@ -149,7 +149,7 @@ def _set_parent_list(lst: list[rawptr[AST]] | t.CPtr, parent: rawptr[AST]): if child is not None: child.parent = parent -def _append_child(lst: list[rawptr[AST]] | t.CPtr, node: rawptr[AST], +def _append_child(lst: list[rawptr[AST]]*, node: rawptr[AST], pool: rawptr[memhub.MemManager]): """Append child nodes to a list (module-level function, to avoid conflicts with the AST.append method name). @@ -276,7 +276,7 @@ def _op_name(op: int) -> str: return "NoneOp" -def _dump_list(lst: list[rawptr[AST]] | t.CPtr, buf: str, size: sizet, pos: sizet) -> sizet: +def _dump_list(lst: list[rawptr[AST]]*, buf: str, size: sizet, pos: sizet) -> sizet: """Traverse a list[AST | CPtr] container, polymorphically dump each element.""" if lst is None: pos = _emit(buf, size, pos, "[]") @@ -328,7 +328,7 @@ virtual class AST: col_offset: int end_lineno: int end_col_offset: int - children: list[rawptr[AST]] | t.CPtr + children: list[rawptr[AST]]* def kind(self) -> int: """Returns the node type (ASTKind value), overridden by subclasses""" diff --git a/ast/tokens.vp b/ast/tokens.vp index 251639c..af06d4b 100644 --- a/ast/tokens.vp +++ b/ast/tokens.vp @@ -25,21 +25,21 @@ def _ast_pool_fatal(what: str, need: sizet): # Organized as a type-safe enum using t.CEnum; old names XXX retained as compatible aliases # ============================================================ -class TokenType(t.CEnum): - EndMarker: t.State - NewLine: t.State - Indent: t.State - Dedent: t.State - Name: t.State - Number: t.State - String: t.State - FStringStart: t.State - FStringMiddle: t.State - FStringEnd: t.State - Op: t.State - Nl: t.State - Comment: t.State - Encoding: t.State +enum TokenType: + EndMarker + NewLine + Indent + Dedent + Name + Number + String + FStringStart + FStringMiddle + FStringEnd + Op + Nl + Comment + Encoding # ============================================================ @@ -48,108 +48,108 @@ class TokenType(t.CEnum): # NotKeyword(0) represents a non-keyword (sentinel to avoid conflict between False_=0 and kw_subtype=0) # ============================================================ -class Keyword(t.CEnum): - NotKeyword: t.State - False_: t.State - None_: t.State - True_: t.State - And: t.State - As: t.State - Assert: t.State - Async: t.State - Await: t.State - Break: t.State - Class: t.State - Continue: t.State - Def: t.State - Del: t.State - Elif: t.State - Else: t.State - Except: t.State - Finally: t.State - For: t.State - From: t.State - Global: t.State - If: t.State - Import: t.State - In: t.State - Is: t.State - Lambda: t.State - Nonlocal: t.State - Not: t.State - Or: t.State - Pass: t.State - Raise: t.State - Return: t.State - Try: t.State - While: t.State - With: t.State - Yield: t.State - Match: t.State - Case: t.State - Type: t.State +enum Keyword: + NotKeyword + False_ + None_ + True_ + And + As + Assert + Async + Await + Break + Class + Continue + Def + Del + Elif + Else + Except + Finally + For + From + Global + If + Import + In + Is + Lambda + Nonlocal + Not + Or + Pass + Raise + Return + Try + While + With + Yield + Match + Case + Type # def 的别名关键字（fn/fun/func/function，语义与 def 完全相同） - Fn: t.State - Fun: t.State - Func: t.State - Function: t.State + Fn + Fun + Func + Function # extern 函数声明关键字（FFI，等价 t.State 标记；软判定见 _is_funcdef_kw） - Extern: t.State + Extern # export 函数声明关键字（等价 t.CExport，裸名导出不加 SHA1 头；软判定见 _is_funcdef_kw） - Export: t.State + Export # define 宏函数关键字（与 def 语义一致，返回注解自动追加 t.CDefine 标记 # 为宏函数；软判定见 _is_funcdef_kw） - Define: t.State + Define # enum 枚举定义关键字（语法糖：`enum X:` 与 `class X(t.CEnum):` 等价， # 见 parser.vp 的 _parse_enumdef）。追加在**表尾**而非插在 Class 之后： # 本枚举成员的值按声明序递增，插在中间会平移 Class 之后所有关键字的编号 # （kw_subtype 数值），追加则既有编号逐字不变。 - Enum: t.State - # typedef 类型别名关键字（语法糖：`typedef T1 = T2` 与 - # `T1: t.CTypedef = T2` 等价，见 parser.vp 的 _parse_typedef）。同样追加在 - # **表尾**：既有关键字编号（kw_subtype）逐字不变。 - Typedef: t.State - # 类型描述符关键字 const / volatile（语法糖：描述符写在类型前， - # `a: const int` 与 `a: t.CConst | int` 等价，见 parser.vp 的 _parse_type_ann）。 - # 同样追加在**表尾**：既有关键字编号（kw_subtype）逐字不变。 - # 二者是**软关键字**——只在注解位置（`:` 后 / `->` 后）生效；作标识符的写法 - # （t.attr.const()，TransPyV/Test/App/attr_test.vp:142）不受影响： - # 该处 token 类型仍是 Name，属性名解析只看 TokenType.Name，不看 kw_subtype。 - Const: t.State - Volatile: t.State - # virtual / novirtual 修饰符关键字（语法糖：`virtual class C:` / - # `novirtual class C:` / `virtual def m(...)` / `novirtual def m(...)`， - # 与手写类/方法装饰器 `@t.CVTable` / `@t.NoVTable` **同一套表示**， - # 见 parser.vp 的 _ParseVirtualModified）。同样追加在**表尾**：既有关键字 - # 编号（kw_subtype）逐字不变。 - # 二者是**软关键字**——只在"语句起始 + 紧跟 class/def"时生效；作标识符的写法 - # （`x = d.virtual` / 形参名 / for 目标 / 字典键）不受影响：那些位置按 - # TokenType.Name 解析，不看 kw_subtype。 - Virtual: t.State - Novirtual: t.State - # union 类型定义关键字（语法糖：`union X:` 与 `class X(t.CUnion):` 等价， - # 见 parser.vp 的 _parse_uniondef）。同样追加在**表尾**：既有关键字编号 - # （kw_subtype）逐字不变；全仓 .vp 源码中 `union` 不作标识符使用。 - Union: t.State - # renum 变体类型定义关键字（语法糖：`renum X:` 与 `class X(t.REnum):` 等价， - # 见 parser.vp 的 _parse_renumdef）。同样追加在**表尾**：既有关键字编号 - # （kw_subtype）逐字不变；全仓 .vp 源码中 `renum` 不作标识符使用。 - Renum: t.State - # struct 纯数据类型定义关键字（语法糖：`struct X:` 与 - # `class X(t.CStruct):` + `@t.NoVTable` 等价，见 parser.vp 的 _parse_structdef）： - # 与 class 同形，但**只能表示数据类型**——禁止 virtual/novirtual 修饰、禁止类体内 - # 定义 def。同样追加在**表尾**：既有关键字编号（kw_subtype）逐字不变； - # 全仓 .vp 源码中 `struct` 不作标识符使用（仅出现在注释/字符串与 - # build_gep_struct 之类复合标识符里）。 - Struct: t.State + Enum + # typedef 类型别名关键字（语法糖：`typedef T1 = T2` 与 + # `T1: t.CTypedef = T2` 等价，见 parser.vp 的 _parse_typedef）。同样追加在 + # **表尾**：既有关键字编号（kw_subtype）逐字不变。 + Typedef + # 类型描述符关键字 const / volatile（语法糖：描述符写在类型前， + # `a: const int` 与 `a: t.CConst | int` 等价，见 parser.vp 的 _parse_type_ann）。 + # 同样追加在**表尾**：既有关键字编号（kw_subtype）逐字不变。 + # 二者是**软关键字**——只在注解位置（`:` 后 / `->` 后）生效；作标识符的写法 + # （t.attr.const()，TransPyV/Test/App/attr_test.vp:142）不受影响： + # 该处 token 类型仍是 Name，属性名解析只看 TokenType.Name，不看 kw_subtype。 + Const + Volatile + # virtual / novirtual 修饰符关键字（语法糖：`virtual class C:` / + # `novirtual class C:` / `virtual def m(...)` / `novirtual def m(...)`， + # 与手写类/方法装饰器 `@t.CVTable` / `@t.NoVTable` **同一套表示**， + # 见 parser.vp 的 _ParseVirtualModified）。同样追加在**表尾**：既有关键字 + # 编号（kw_subtype）逐字不变。 + # 二者是**软关键字**——只在"语句起始 + 紧跟 class/def"时生效；作标识符的写法 + # （`x = d.virtual` / 形参名 / for 目标 / 字典键）不受影响：那些位置按 + # TokenType.Name 解析，不看 kw_subtype。 + Virtual + Novirtual + # union 类型定义关键字（语法糖：`union X:` 与 `class X(t.CUnion):` 等价， + # 见 parser.vp 的 _parse_uniondef）。同样追加在**表尾**：既有关键字编号 + # （kw_subtype）逐字不变；全仓 .vp 源码中 `union` 不作标识符使用。 + Union + # renum 变体类型定义关键字（语法糖：`renum X:` 与 `class X(t.REnum):` 等价， + # 见 parser.vp 的 _parse_renumdef）。同样追加在**表尾**：既有关键字编号 + # （kw_subtype）逐字不变；全仓 .vp 源码中 `renum` 不作标识符使用。 + Renum + # struct 纯数据类型定义关键字（语法糖：`struct X:` 与 + # `class X(t.CStruct):` + `@t.NoVTable` 等价，见 parser.vp 的 _parse_structdef）： + # 与 class 同形，但**只能表示数据类型**——禁止 virtual/novirtual 修饰、禁止类体内 + # 定义 def。同样追加在**表尾**：既有关键字编号（kw_subtype）逐字不变； + # 全仓 .vp 源码中 `struct` 不作标识符使用（仅出现在注释/字符串与 + # build_gep_struct 之类复合标识符里）。 + Struct # switch 多分支语句关键字（`switch :` + `case <常量>: ` / `default:`， # 见 parser.vp 的 _parse_switch）。C switch 语义：默认**不穿透**，case 体内 # 写 `fallthrough` 才落到下一个 case。同样追加在**表尾**：既有关键字编号 # （kw_subtype）逐字不变；全仓 .vp 源码中 `switch` 不作标识符使用。 - Switch: t.State + Switch # fallthrough 语句关键字（仅在 switch 的 case 体内合法；match 内使用报错）。 # 追加在**表尾**：既有关键字编号（kw_subtype）逐字不变。 - FallThrough: t.State + FallThrough # ============================================================ @@ -158,55 +158,55 @@ class Keyword(t.CEnum): # Stored in the token.op_subtype field # ============================================================ -class TokOp(t.CEnum): - LPar: t.State # ( - RPar: t.State # ) - Lsqb: t.State # [ - Rsqb: t.State # ] - LBrace: t.State # { - RBrace: t.State # } - Comma: t.State # , - Colon: t.State # : - Dot: t.State # . - Semi: t.State # ; - At: t.State # @ - Equal: t.State # = - RArrow: t.State # -> - PlusEq: t.State # += - MinusEq: t.State # -= - StarEq: t.State # *= - SlashEq: t.State # /= - DSlashEq: t.State # //= - PercentEq: t.State # %= - AtEq: t.State # @= - AmpEq: t.State # &= - VBarEq: t.State # |= - CaretEq: t.State # ^= - GtGtEq: t.State # >>= - LtLtEq: t.State # <<= - StarEqEq: t.State # **= - DSlash: t.State # // - StarStar: t.State # ** - LtLt: t.State # << - GtGt: t.State # >> - LessEq: t.State # <= - GreaterEq: t.State # >= - EqEq: t.State # == - ExclaimEq: t.State # != - Less: t.State # < - Greater: t.State # > - Plus: t.State # + - Minus: t.State # - - Star: t.State # * - Slash: t.State # / - Percent: t.State # % - Amp: t.State # & - VBar: t.State # | - Caret: t.State # ^ - Tilde: t.State # ~ - ColonEq: t.State # := - Ellipsis: t.State # ... - Bang: t.State # !(Non-standard, used for parsing tolerance) +enum TokOp: + LPar # ( + RPar # ) + Lsqb # [ + Rsqb # ] + LBrace # { + RBrace # } + Comma # , + Colon # : + Dot # . + Semi # ; + At # @ + Equal # = + RArrow # -> + PlusEq # += + MinusEq # -= + StarEq # *= + SlashEq # /= + DSlashEq # //= + PercentEq # %= + AtEq # @= + AmpEq # &= + VBarEq # |= + CaretEq # ^= + GtGtEq # >>= + LtLtEq # <<= + StarEqEq # **= + DSlash # // + StarStar # ** + LtLt # << + GtGt # >> + LessEq # <= + GreaterEq # >= + EqEq # == + ExclaimEq # != + Less # < + Greater # > + Plus # + + Minus # - + Star # * + Slash # / + Percent # % + Amp # & + VBar # | + Caret # ^ + Tilde # ~ + ColonEq # := + Ellipsis # ... + Bang # !(Non-standard, used for parsing tolerance) # ============================================================ @@ -264,18 +264,18 @@ _kw_pool: rawptr[memhub.MemManager] = None # 返回 0（无需回退链表扫描）；回退仅用于索引未建成（分配失败）时，保证正确性。 _kw_index: sizet* = None # 索引槽数（2 的幂且 > 2*46，负载 < 0.5，探测必然终止） -_KW_IDX_CAP: t.CDefine = 128 +define _KW_IDX_CAP = 128 # FNV-1a 64 位常量（与 hashtable.vp 同款） -_KW_FNV_OFFSET: t.CUInt64T = 0xcbf29ce484222325 -_KW_FNV_PRIME: t.CUInt64T = 0x100000001b3 +_KW_FNV_OFFSET: uint64 = 0xcbf29ce484222325 +_KW_FNV_PRIME: uint64 = 0x100000001b3 def _kw_hash_str(key: str) -> uint64: """关键字名 FNV-1a 64 位哈希（同一键必得同一值；仅用于槽定位）""" - h: t.CUInt64T = _KW_FNV_OFFSET + h: uint64 = _KW_FNV_OFFSET k: str = key while k[0] != 0: - h = h ^ t.CUInt64T(k[0]) + h = h ^ uint64(k[0]) h = h * _KW_FNV_PRIME k += 1 return uint64(h) @@ -298,7 +298,7 @@ def _kw_index_put(entry: rawptr[KwEntry]): if cur_s == 0: slot[0] = sizet(entry) return - cur: KwEntry | t.CPtr = (KwEntry | t.CPtr)(t.CPtr(uint64(cur_s))) + cur: KwEntry* = (KwEntry*)(t.CPtr(uint64(cur_s))) if string.strcmp(cur.name, entry.name) == 0: return idx = (idx + 1) & mask @@ -343,7 +343,7 @@ def _kw_lookup(name: str) -> int: cur_s: sizet = slot[0] if cur_s == 0: return 0 - cur: KwEntry | t.CPtr = (KwEntry | t.CPtr)(t.CPtr(uint64(cur_s))) + cur: KwEntry* = (KwEntry*)(t.CPtr(uint64(cur_s))) if string.strcmp(cur.name, name) == 0: return cur.kw_id idx = (idx + 1) & mask @@ -421,15 +421,15 @@ def _init_keywords(pool: rawptr[memhub.MemManager]): # virtual / novirtual 修饰符软关键字（仅"语句起始 + 紧跟 class/def"生效， # 见 parser.vp 的 _ParseVirtualModified） _kw_intern(pool, "virtual", Keyword.Virtual) - _kw_intern(pool, "novirtual", Keyword.Novirtual) - _kw_intern(pool, "union", Keyword.Union) - # renum 变体类型定义关键字（语法糖，同 enum/union，见 parser.vp 的 _parse_renumdef） - _kw_intern(pool, "renum", Keyword.Renum) - # struct 纯数据类型定义关键字（语法糖，同 enum/union/renum，见 parser.vp 的 - # _parse_structdef：基类 t.CStruct + 伪装饰器 @t.NoVTable，禁 virtual/novirtual、禁 def） - _kw_intern(pool, "struct", Keyword.Struct) - # switch / fallthrough 关键字（见 parser.vp 的 _parse_switch 与 _parse_small_stmt） - _kw_intern(pool, "switch", Keyword.Switch) + _kw_intern(pool, "novirtual", Keyword.Novirtual) + _kw_intern(pool, "union", Keyword.Union) + # renum 变体类型定义关键字（语法糖，同 enum/union，见 parser.vp 的 _parse_renumdef） + _kw_intern(pool, "renum", Keyword.Renum) + # struct 纯数据类型定义关键字（语法糖，同 enum/union/renum，见 parser.vp 的 + # _parse_structdef：基类 t.CStruct + 伪装饰器 @t.NoVTable，禁 virtual/novirtual、禁 def） + _kw_intern(pool, "struct", Keyword.Struct) + # switch / fallthrough 关键字（见 parser.vp 的 _parse_switch 与 _parse_small_stmt） + _kw_intern(pool, "switch", Keyword.Switch) _kw_intern(pool, "fallthrough", Keyword.FallThrough) diff --git a/atom.vp b/atom.vp index 364d365..3ace8ad 100644 --- a/atom.vp +++ b/atom.vp @@ -14,19 +14,19 @@ def __atomic_test_and_set(ptr: uint64*, order: int) -> bool: c.Asm(f"""mov al, 1 xchg byte ptr [{c.AsmInp(ptr, t.ASM_DESCR.REG_ANY)}], al mov $0, al""", - out = [c.AsmOut(result, t.ASM_DESCR.OUTPUT_REG)], - op = [t.ASM_DESCR.CLOBBER_MEMORY, t.ASM_DESCR.CLOBBER_RAX]) - return t.CBool(result) + out = [asmout(result, ASM_DESCR.OUTPUT_REG)], + op = [ASM_DESCR.CLOBBER_MEMORY, ASM_DESCR.CLOBBER_RAX]) + return bool(result) def __atomic_clear(ptr: uint64*, order: int): - c.Asm(f"""mov byte ptr [{c.AsmInp(ptr, t.ASM_DESCR.REG_ANY)}], 0""", - inp = [c.AsmInp(ptr, t.ASM_DESCR.REG_ANY)], - op = [t.ASM_DESCR.CLOBBER_MEMORY]) + __asm__(f"""mov byte ptr [{c.AsmInp(ptr, t.ASM_DESCR.REG_ANY)}], 0""", + inp = [asminp(ptr, ASM_DESCR.REG_ANY)], + op = [ASM_DESCR.CLOBBER_MEMORY]) def __atomic_thread_fence(order: int): - c.Asm("mfence", op=[t.ASM_DESCR.CLOBBER_MEMORY]) + __asm__("mfence", op=[ASM_DESCR.CLOBBER_MEMORY]) def __atomic_signal_fence(order: int): diff --git a/base64.vp b/base64.vp index 3ad8508..33ff535 100644 --- a/base64.vp +++ b/base64.vp @@ -46,12 +46,12 @@ def b64encode(s: str, out: str) -> sizet: # * @param s: Base64 encoded string # * @param out: Output binary buffer # * @retval Length of decoded binary data -def b64decode(s: str, out: uint8 | t.CPtr) -> sizet: +def b64decode(s: str, out: uint8*) -> sizet: length: sizet = len(s) i: sizet = 0 j: sizet = 0 val: uint32 = 0 - c: t.CInt + c: int # Restore 3 bytes from every 4 Base64 characters for i in range(0, length, 4): if s[i] == '=': diff --git a/builtins.vp b/builtins.vp index 6c20e84..702bb5a 100644 --- a/builtins.vp +++ b/builtins.vp @@ -38,10 +38,10 @@ typedef uintleast32 = t.CUIntLeast32T typedef uintleast64 = t.CUIntLeast64T typedef uchar = t.CUnsignedChar -typedef short = t.CShort -typedef ushort = t.CUnsignedShort +typedef short = int16 +typedef ushort = uint16 typedef uint = t.CUnsignedInt -typedef long = t.CLong -typedef ulong = t.CUnsignedLong -typedef longlong = t.CLongLong -typedef ulonglong = t.CUnsignedLongLong +typedef long = int32 +typedef ulong = uint32 +typedef longlong = int64 +typedef ulonglong = uint64 diff --git a/condition.vp b/condition.vp index 03f6848..8f061f5 100644 --- a/condition.vp +++ b/condition.vp @@ -24,23 +24,23 @@ class Condition: cs: CRITICAL_SECTION def __init__(self): - InitializeCriticalSection(c.Addr(self.cs)) - InitializeConditionVariable(c.Addr(self.cond_var)) + InitializeCriticalSection(&self.cs) + InitializeConditionVariable(&self.cond_var) def wait(self, timeout_ms: ULONG = INFINITE) -> BOOL: - return SleepConditionVariableCS(c.Addr(self.cond_var), c.Addr(self.cs), timeout_ms) + return SleepConditionVariableCS(&self.cond_var, &self.cs, timeout_ms) def notify(self): - WakeConditionVariable(c.Addr(self.cond_var)) + WakeConditionVariable(&self.cond_var) def notify_all(self): - WakeAllConditionVariable(c.Addr(self.cond_var)) + WakeAllConditionVariable(&self.cond_var) def acquire(self): - EnterCriticalSection(c.Addr(self.cs)) + EnterCriticalSection(&self.cs) def release(self): - LeaveCriticalSection(c.Addr(self.cs)) + LeaveCriticalSection(&self.cs) def __enter__(self) -> 'Condition' | t.CPtr: self.acquire() @@ -50,4 +50,4 @@ class Condition: self.release() def delete(self): - DeleteCriticalSection(c.Addr(self.cs)) + DeleteCriticalSection(&self.cs) diff --git a/fltk/__init__.vp b/fltk/__init__.vp index 776c60a..428622a 100644 --- a/fltk/__init__.vp +++ b/fltk/__init__.vp @@ -72,7 +72,7 @@ novirtual class Fl: return Fl_wait() @staticmethod - def wait_for(timeout: t.CDouble) -> t.CDouble: + def wait_for(timeout: double) -> double: return Fl_wait_for(timeout) @staticmethod @@ -145,11 +145,11 @@ novirtual class Fl: Fl_set_visible_focus(v) @staticmethod - def get_rgb_color(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -> t.CUInt32T: + def get_rgb_color(r: uint8, g: uint8, b: uint8) -> uint32: return Fl_get_rgb_color(r, g, b) @staticmethod - def set_color(c: t.CUInt32T, r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T): + def set_color(c: uint32, r: uint8, g: uint8, b: uint8): Fl_set_color(c, r, g, b) @staticmethod @@ -233,12 +233,12 @@ novirtual class Fl: # ----- 定时器 / 线程唤醒 ----- @staticmethod - def add_timeout(seconds: t.CDouble, cb: bytes, data: bytes = 0): + def add_timeout(seconds: double, cb: bytes, data: bytes = 0): """注册一次性定时回调（seconds 秒后触发）。回调签名: def cb(w: bytes, data: bytes)""" Fl_add_timeout(seconds, cb, data) @staticmethod - def repeat_timeout(seconds: t.CDouble, cb: bytes, data: bytes = 0): + def repeat_timeout(seconds: double, cb: bytes, data: bytes = 0): """注册重复定时回调（每 seconds 秒触发，回调内需再调 repeat_timeout 保持）。""" Fl_repeat_timeout(seconds, cb, data) @@ -332,10 +332,10 @@ novirtual class Fl_Widget: def resize(self, x: int, y: int, w: int, h: int): Fl_Widget_resize(self._ptr, x, y, w, h) - def set_color(self, color: t.CUInt32T): + def set_color(self, color: uint32): Fl_Widget_set_color(self._ptr, color) - def color(self) -> t.CUInt32T: + def color(self) -> uint32: return Fl_Widget_color(self._ptr) def set_box(self, box: int): @@ -422,10 +422,10 @@ novirtual class Fl_Window(Fl_Widget): def end(self): Fl_Window_end(self._ptr) - def set_modal(self, flag: t.CUInt32T): + def set_modal(self, flag: uint32): Fl_Window_make_modal(self._ptr, flag) - def fullscreen(self, flag: t.CUInt32T): + def fullscreen(self, flag: uint32): Fl_Window_fullscreen(self._ptr, flag) def make_current(self): @@ -667,7 +667,7 @@ novirtual class Fl_Text_Display(Fl_Widget): def set_text_size(self, size: int): Fl_Text_Display_set_text_size(self._ptr, size) - def set_text_color(self, color: t.CUInt32T): + def set_text_color(self, color: uint32): Fl_Text_Display_set_text_color(self._ptr, color) def set_scrollbar_size(self, size: int): @@ -752,31 +752,31 @@ novirtual class Fl_Slider(Fl_Widget): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Slider_new(x, y, w, h, label) - def value(self) -> t.CDouble: + def value(self) -> double: return Fl_Slider_value(self._ptr) - def set_value(self, v: t.CDouble): + def set_value(self, v: double): Fl_Slider_set_value(self._ptr, v) - def minimum(self) -> t.CDouble: + def minimum(self) -> double: return Fl_Slider_minimum(self._ptr) - def set_minimum(self, v: t.CDouble): + def set_minimum(self, v: double): Fl_Slider_set_minimum(self._ptr, v) - def maximum(self) -> t.CDouble: + def maximum(self) -> double: return Fl_Slider_maximum(self._ptr) - def set_maximum(self, v: t.CDouble): + def set_maximum(self, v: double): Fl_Slider_set_maximum(self._ptr, v) - def step(self) -> t.CDouble: + def step(self) -> double: return Fl_Slider_step(self._ptr) - def set_step(self, v: t.CDouble): + def set_step(self, v: double): Fl_Slider_set_step(self._ptr, v) - def set_bounds(self, a: t.CDouble, b: t.CDouble): + def set_bounds(self, a: double, b: double): Fl_Slider_set_bounds(self._ptr, a, b) @@ -786,13 +786,13 @@ novirtual class Fl_Value_Input(Fl_Widget): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Value_Input_new(x, y, w, h, label) - def value(self) -> t.CDouble: + def value(self) -> double: return Fl_Value_Input_value(self._ptr) - def set_value(self, v: t.CDouble): + def set_value(self, v: double): Fl_Value_Input_set_value(self._ptr, v) - def set_bounds(self, a: t.CDouble, b: t.CDouble): + def set_bounds(self, a: double, b: double): Fl_Value_Input_set_bounds(self._ptr, a, b) @@ -802,10 +802,10 @@ novirtual class Fl_Value_Output(Fl_Widget): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Value_Output_new(x, y, w, h, label) - def value(self) -> t.CDouble: + def value(self) -> double: return Fl_Value_Output_value(self._ptr) - def set_value(self, v: t.CDouble): + def set_value(self, v: double): Fl_Value_Output_set_value(self._ptr, v) @@ -815,16 +815,16 @@ novirtual class Fl_Progress(Fl_Widget): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Progress_new(x, y, w, h, label) - def value(self) -> t.CDouble: + def value(self) -> double: return Fl_Progress_value(self._ptr) - def set_value(self, v: t.CDouble): + def set_value(self, v: double): Fl_Progress_set_value(self._ptr, v) - def set_minimum(self, v: t.CDouble): + def set_minimum(self, v: double): Fl_Progress_set_minimum(self._ptr, v) - def set_maximum(self, v: t.CDouble): + def set_maximum(self, v: double): Fl_Progress_set_maximum(self._ptr, v) @@ -1026,28 +1026,28 @@ novirtual class Fl_Spinner(Fl_Widget): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Spinner_new(x, y, w, h, label) - def value(self) -> t.CDouble: + def value(self) -> double: return Fl_Spinner_value(self._ptr) - def set_value(self, v: t.CDouble): + def set_value(self, v: double): Fl_Spinner_set_value(self._ptr, v) - def minimum(self) -> t.CDouble: + def minimum(self) -> double: return Fl_Spinner_minimum(self._ptr) - def set_minimum(self, v: t.CDouble): + def set_minimum(self, v: double): Fl_Spinner_set_minimum(self._ptr, v) - def maximum(self) -> t.CDouble: + def maximum(self) -> double: return Fl_Spinner_maximum(self._ptr) - def set_maximum(self, v: t.CDouble): + def set_maximum(self, v: double): Fl_Spinner_set_maximum(self._ptr, v) - def step(self) -> t.CDouble: + def step(self) -> double: return Fl_Spinner_step(self._ptr) - def set_step(self, v: t.CDouble): + def set_step(self, v: double): Fl_Spinner_set_step(self._ptr, v) @@ -1291,7 +1291,7 @@ novirtual class Fl_Color_Chooser(Fl_Group): def __init__(self, x: int, y: int, w: int, h: int, label: str = ""): self._ptr = Fl_Color_Chooser_new(x, y, w, h, label) - def set_rgb(self, r: t.CDouble, g: t.CDouble, b: t.CDouble) -> int: + def set_rgb(self, r: double, g: double, b: double) -> int: """设置 RGB 值（0.0~1.0），返回 1=值变更""" return Fl_Color_Chooser_set_rgb(self._ptr, r, g, b) diff --git a/fltk/_cfl.vp b/fltk/_cfl.vp index ec2afcc..cc58afd 100644 --- a/fltk/_cfl.vp +++ b/fltk/_cfl.vp @@ -60,9 +60,9 @@ extern def Fl_box_shadow_width() -> int extern def Fl_set_box_shadow_width(W: int) extern def Fl_box_border_radius_max() -> int extern def Fl_set_box_border_radius_max(R: int) -extern def Fl_get_rgb_color(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -> t.CUInt32T -extern def Fl_set_color(c: t.CUInt32T, r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_set_color_with_alpha(c: t.CUInt32T, r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T, a: t.CUInt8T) +extern def Fl_get_rgb_color(r: uint8, g: uint8, b: uint8) -> uint32 +extern def Fl_set_color(c: uint32, r: uint8, g: uint8, b: uint8) +extern def Fl_set_color_with_alpha(c: uint32, r: uint8, g: uint8, b: uint8, a: uint8) extern def Fl_get_font(idx: int) -> str extern def Fl_get_font_name(idx: int) -> str extern def Fl_get_font_name_with_attr(idx: int, attributes: bytes) -> str @@ -74,9 +74,9 @@ extern def Fl_set_font_size(a0: int) extern def Fl_font_size() -> int extern def Fl_add_handler(cb0: bytes) extern def Fl_wait() -> int -extern def Fl_wait_for(a0: t.CDouble) -> t.CDouble -extern def Fl_add_timeout(t: t.CDouble, cb1: bytes, a2: bytes) -extern def Fl_repeat_timeout(t: t.CDouble, cb1: bytes, a2: bytes) +extern def Fl_wait_for(a0: double) -> double +extern def Fl_add_timeout(t: double, cb1: bytes, a2: bytes) +extern def Fl_repeat_timeout(t: double, cb1: bytes, a2: bytes) extern def Fl_remove_timeout(cb0: bytes, a1: bytes) extern def Fl_has_timeout(cb0: bytes, a1: bytes) -> int extern def Fl_dnd() -> int @@ -107,16 +107,16 @@ extern def Fl_own_colormap() extern def Fl_pushed() -> Fl_WidgetPtr extern def Fl_focus() -> Fl_WidgetPtr extern def Fl_set_focus(a0: bytes) -extern def Fl_version() -> t.CDouble +extern def Fl_version() -> double extern def Fl_api_version() -> int extern def Fl_abi_version() -> int extern def Fl_load_font(path: str) -> int extern def Fl_unload_font(path: str) -extern def Fl_foreground(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_background(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_background2(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_selection_color(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_inactive_color(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) +extern def Fl_foreground(r: uint8, g: uint8, b: uint8) +extern def Fl_background(r: uint8, g: uint8, b: uint8) +extern def Fl_background2(r: uint8, g: uint8, b: uint8) +extern def Fl_selection_color(r: uint8, g: uint8, b: uint8) +extern def Fl_inactive_color(r: uint8, g: uint8, b: uint8) extern def Fl_get_system_colors() extern def Fl_handle(a0: int, a1: bytes) -> int extern def Fl_handle_(a0: int, a1: bytes) -> int @@ -127,8 +127,8 @@ extern def Fl_add_check(cb0: bytes, a1: bytes) extern def Fl_has_check(cb0: bytes, a1: bytes) -> int extern def Fl_remove_check(cb0: bytes, a1: bytes) extern def Fl_flush() -extern def Fl_set_screen_scale(n: int, val: t.CFloat) -extern def Fl_screen_scale(n: int) -> t.CFloat +extern def Fl_set_screen_scale(n: int, val: float) +extern def Fl_screen_scale(n: int) -> float extern def Fl_screen_scaling_supported() -> int extern def Fl_screen_count() -> int extern def Fl_screen_num(x: int, y: int) -> int @@ -153,19 +153,19 @@ extern def Fl_event_clipboard() -> bytes extern def Fl_event_clipboard_type() -> str extern def Fl_clipboard_contains(type: str) -> int extern def Fl_event_dispatch(cb0: bytes) -extern def Fl_inactive(c: t.CUInt32T) -> t.CUInt32T -extern def Fl_lighter(c: t.CUInt32T) -> t.CUInt32T -extern def Fl_darker(c: t.CUInt32T) -> t.CUInt32T +extern def Fl_inactive(c: uint32) -> uint32 +extern def Fl_lighter(c: uint32) -> uint32 +extern def Fl_darker(c: uint32) -> uint32 extern def Fl_set_box_type_cb(a0: int, cb1: bytes, a2: int, a3: int, a4: int, a5: int) extern def Fl_draw_box_active() -> int -extern def Fl_gray_ramp(i: int) -> t.CUInt32T -extern def Fl_color_average(a0: t.CUInt32T, a1: t.CUInt32T, f: t.CFloat) -> t.CUInt32T -extern def Fl_contrast(c1: t.CUInt32T, c2: t.CUInt32T) -> t.CUInt32T -extern def Fl_rgb_color(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -> t.CUInt32T -extern def Fl_rgb_color_grayscale(g: t.CUInt8T) -> t.CUInt32T -extern def Fl_cmap(c: t.CUInt32T) -> t.CUInt32T -extern def Fl_box_color(c: t.CUInt32T) -> t.CUInt32T -extern def Fl_set_box_color(c: t.CUInt32T) +extern def Fl_gray_ramp(i: int) -> uint32 +extern def Fl_color_average(a0: uint32, a1: uint32, f: float) -> uint32 +extern def Fl_contrast(c1: uint32, c2: uint32) -> uint32 +extern def Fl_rgb_color(r: uint8, g: uint8, b: uint8) -> uint32 +extern def Fl_rgb_color_grayscale(g: uint8) -> uint32 +extern def Fl_cmap(c: uint32) -> uint32 +extern def Fl_box_color(c: uint32) -> uint32 +extern def Fl_set_box_color(c: uint32) extern def Fl_add_system_handler(cb0: bytes, a1: bytes) extern def Fl_remove_system_handler(cb0: bytes) extern def Fl_gl_visual(mode: int) -> int @@ -175,7 +175,7 @@ extern def Fl_open_callback(cb0: bytes) extern def Fl_disable_wayland() extern def Fl_Widget_Tracker_widget(t: Fl_Widget_TrackerPtr) -> Fl_WidgetPtr extern def Fl_Widget_Tracker_exists(t: Fl_Widget_TrackerPtr) -> int -extern def Fl_get_color_rgb(col: t.CUInt32T, r: bytes, g: bytes, b: bytes) +extern def Fl_get_color_rgb(col: uint32, r: bytes, g: bytes, b: bytes) extern def Fl_callback_reason() -> int extern def Fl_get_fl_msg() -> bytes extern def Fl_cairo_make_current(w: Fl_WidgetPtr) -> bytes diff --git a/fltk/_cfl_box.vp b/fltk/_cfl_box.vp index b4c3c08..23f1460 100644 --- a/fltk/_cfl_box.vp +++ b/fltk/_cfl_box.vp @@ -29,11 +29,11 @@ extern def Fl_Box_tooltip(self: Fl_BoxPtr) -> str extern def Fl_Box_set_tooltip(self: Fl_BoxPtr, txt: str) extern def Fl_Box_get_type(self: Fl_BoxPtr) -> int extern def Fl_Box_set_type(self: Fl_BoxPtr, typ: int) -extern def Fl_Box_color(self: Fl_BoxPtr) -> t.CUInt32T -extern def Fl_Box_set_color(self: Fl_BoxPtr, color: t.CUInt32T) +extern def Fl_Box_color(self: Fl_BoxPtr) -> uint32 +extern def Fl_Box_set_color(self: Fl_BoxPtr, color: uint32) extern def Fl_Box_measure_label(self: Fl_BoxPtr, a1: bytes, a2: bytes) -extern def Fl_Box_label_color(self: Fl_BoxPtr) -> t.CUInt32T -extern def Fl_Box_set_label_color(self: Fl_BoxPtr, color: t.CUInt32T) +extern def Fl_Box_label_color(self: Fl_BoxPtr) -> uint32 +extern def Fl_Box_set_label_color(self: Fl_BoxPtr, color: uint32) extern def Fl_Box_label_font(self: Fl_BoxPtr) -> int extern def Fl_Box_set_label_font(self: Fl_BoxPtr, font: int) extern def Fl_Box_label_size(self: Fl_BoxPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Box_set_when(self: Fl_BoxPtr, a1: int) extern def Fl_Box_when(self: Fl_BoxPtr) -> int extern def Fl_Box_image(self: Fl_BoxPtr) -> bytes extern def Fl_Box_parent(self: Fl_BoxPtr) -> bytes -extern def Fl_Box_selection_color(self: Fl_BoxPtr) -> t.CUInt32T -extern def Fl_Box_set_selection_color(self: Fl_BoxPtr, color: t.CUInt32T) +extern def Fl_Box_selection_color(self: Fl_BoxPtr) -> uint32 +extern def Fl_Box_set_selection_color(self: Fl_BoxPtr, color: uint32) extern def Fl_Box_do_callback(self: Fl_BoxPtr) extern def Fl_Box_inside(self: Fl_BoxPtr, a1: bytes) -> int extern def Fl_Box_window(self: Fl_BoxPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Box_take_focus(self: Fl_BoxPtr) -> int extern def Fl_Box_set_visible_focus(self: Fl_BoxPtr) extern def Fl_Box_clear_visible_focus(self: Fl_BoxPtr) extern def Fl_Box_visible_focus(self: Fl_BoxPtr, v: int) -extern def Fl_Box_has_visible_focus(self: Fl_BoxPtr) -> t.CUInt32T +extern def Fl_Box_has_visible_focus(self: Fl_BoxPtr) -> uint32 extern def Fl_Box_set_user_data(self: Fl_BoxPtr, data: bytes) extern def Fl_Box_draw_data(self: Fl_BoxPtr) -> bytes extern def Fl_Box_handle_data(self: Fl_BoxPtr) -> bytes extern def Fl_Box_set_draw_data(self: Fl_BoxPtr, data: bytes) extern def Fl_Box_set_handle_data(self: Fl_BoxPtr, data: bytes) -extern def Fl_Box_damage(self: Fl_BoxPtr) -> t.CUInt8T -extern def Fl_Box_set_damage(self: Fl_BoxPtr, flag: t.CUInt8T) -extern def Fl_Box_set_damage_area(self: Fl_BoxPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Box_damage(self: Fl_BoxPtr) -> uint8 +extern def Fl_Box_set_damage(self: Fl_BoxPtr, flag: uint8) +extern def Fl_Box_set_damage_area(self: Fl_BoxPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Box_clear_damage(self: Fl_BoxPtr) extern def Fl_Box_as_window(self: Fl_BoxPtr) -> bytes extern def Fl_Box_as_group(self: Fl_BoxPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Box_deimage(self: Fl_BoxPtr) -> bytes extern def Fl_Box_set_callback(self: Fl_BoxPtr, a1: bytes, a2: bytes) extern def Fl_Box_visible(self: Fl_BoxPtr) -> int extern def Fl_Box_visible_r(self: Fl_BoxPtr) -> int -extern def Fl_Box_active(self: Fl_BoxPtr) -> t.CUInt32T +extern def Fl_Box_active(self: Fl_BoxPtr) -> uint32 extern def Fl_Box_active_r(self: Fl_BoxPtr) -> int extern def Fl_Box_callback(self: Fl_BoxPtr) -> bytes extern def Fl_Box_set_deletion_callback(self: Fl_BoxPtr, cb1: bytes, data: bytes) diff --git a/fltk/_cfl_browser.vp b/fltk/_cfl_browser.vp index d31e6b0..d6dc49c 100644 --- a/fltk/_cfl_browser.vp +++ b/fltk/_cfl_browser.vp @@ -29,11 +29,11 @@ extern def Fl_Browser_tooltip(self: Fl_BrowserPtr) -> str extern def Fl_Browser_set_tooltip(self: Fl_BrowserPtr, txt: str) extern def Fl_Browser_get_type(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_type(self: Fl_BrowserPtr, typ: int) -extern def Fl_Browser_color(self: Fl_BrowserPtr) -> t.CUInt32T -extern def Fl_Browser_set_color(self: Fl_BrowserPtr, color: t.CUInt32T) +extern def Fl_Browser_color(self: Fl_BrowserPtr) -> uint32 +extern def Fl_Browser_set_color(self: Fl_BrowserPtr, color: uint32) extern def Fl_Browser_measure_label(self: Fl_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_Browser_label_color(self: Fl_BrowserPtr) -> t.CUInt32T -extern def Fl_Browser_set_label_color(self: Fl_BrowserPtr, color: t.CUInt32T) +extern def Fl_Browser_label_color(self: Fl_BrowserPtr) -> uint32 +extern def Fl_Browser_set_label_color(self: Fl_BrowserPtr, color: uint32) extern def Fl_Browser_label_font(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_label_font(self: Fl_BrowserPtr, font: int) extern def Fl_Browser_label_size(self: Fl_BrowserPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Browser_set_when(self: Fl_BrowserPtr, a1: int) extern def Fl_Browser_when(self: Fl_BrowserPtr) -> int extern def Fl_Browser_image(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_parent(self: Fl_BrowserPtr) -> bytes -extern def Fl_Browser_selection_color(self: Fl_BrowserPtr) -> t.CUInt32T -extern def Fl_Browser_set_selection_color(self: Fl_BrowserPtr, color: t.CUInt32T) +extern def Fl_Browser_selection_color(self: Fl_BrowserPtr) -> uint32 +extern def Fl_Browser_set_selection_color(self: Fl_BrowserPtr, color: uint32) extern def Fl_Browser_do_callback(self: Fl_BrowserPtr) extern def Fl_Browser_inside(self: Fl_BrowserPtr, a1: bytes) -> int extern def Fl_Browser_window(self: Fl_BrowserPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Browser_take_focus(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_visible_focus(self: Fl_BrowserPtr) extern def Fl_Browser_clear_visible_focus(self: Fl_BrowserPtr) extern def Fl_Browser_visible_focus(self: Fl_BrowserPtr, v: int) -extern def Fl_Browser_has_visible_focus(self: Fl_BrowserPtr) -> t.CUInt32T +extern def Fl_Browser_has_visible_focus(self: Fl_BrowserPtr) -> uint32 extern def Fl_Browser_set_user_data(self: Fl_BrowserPtr, data: bytes) extern def Fl_Browser_draw_data(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_handle_data(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_set_draw_data(self: Fl_BrowserPtr, data: bytes) extern def Fl_Browser_set_handle_data(self: Fl_BrowserPtr, data: bytes) -extern def Fl_Browser_damage(self: Fl_BrowserPtr) -> t.CUInt8T -extern def Fl_Browser_set_damage(self: Fl_BrowserPtr, flag: t.CUInt8T) -extern def Fl_Browser_set_damage_area(self: Fl_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Browser_damage(self: Fl_BrowserPtr) -> uint8 +extern def Fl_Browser_set_damage(self: Fl_BrowserPtr, flag: uint8) +extern def Fl_Browser_set_damage_area(self: Fl_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Browser_clear_damage(self: Fl_BrowserPtr) extern def Fl_Browser_as_window(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_as_group(self: Fl_BrowserPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Browser_deimage(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_set_callback(self: Fl_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_Browser_visible(self: Fl_BrowserPtr) -> int extern def Fl_Browser_visible_r(self: Fl_BrowserPtr) -> int -extern def Fl_Browser_active(self: Fl_BrowserPtr) -> t.CUInt32T +extern def Fl_Browser_active(self: Fl_BrowserPtr) -> uint32 extern def Fl_Browser_active_r(self: Fl_BrowserPtr) -> int extern def Fl_Browser_callback(self: Fl_BrowserPtr) -> bytes extern def Fl_Browser_set_deletion_callback(self: Fl_BrowserPtr, cb1: bytes, data: bytes) @@ -132,8 +132,8 @@ extern def Fl_Browser_position(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_position(self: Fl_BrowserPtr, pos: int) extern def Fl_Browser_hposition(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_hposition(self: Fl_BrowserPtr, a1: int) -extern def Fl_Browser_has_scrollbar(self: Fl_BrowserPtr) -> t.CUInt8T -extern def Fl_Browser_set_has_scrollbar(self: Fl_BrowserPtr, mode: t.CUInt8T) +extern def Fl_Browser_has_scrollbar(self: Fl_BrowserPtr) -> uint8 +extern def Fl_Browser_set_has_scrollbar(self: Fl_BrowserPtr, mode: uint8) extern def Fl_Browser_scrollbar_size(self: Fl_BrowserPtr) -> int extern def Fl_Browser_set_scrollbar_size(self: Fl_BrowserPtr, newSize: int) extern def Fl_Browser_sort(self: Fl_BrowserPtr) @@ -163,11 +163,11 @@ extern def Fl_Hold_Browser_tooltip(self: Fl_Hold_BrowserPtr) -> str extern def Fl_Hold_Browser_set_tooltip(self: Fl_Hold_BrowserPtr, txt: str) extern def Fl_Hold_Browser_get_type(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_type(self: Fl_Hold_BrowserPtr, typ: int) -extern def Fl_Hold_Browser_color(self: Fl_Hold_BrowserPtr) -> t.CUInt32T -extern def Fl_Hold_Browser_set_color(self: Fl_Hold_BrowserPtr, color: t.CUInt32T) +extern def Fl_Hold_Browser_color(self: Fl_Hold_BrowserPtr) -> uint32 +extern def Fl_Hold_Browser_set_color(self: Fl_Hold_BrowserPtr, color: uint32) extern def Fl_Hold_Browser_measure_label(self: Fl_Hold_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_Hold_Browser_label_color(self: Fl_Hold_BrowserPtr) -> t.CUInt32T -extern def Fl_Hold_Browser_set_label_color(self: Fl_Hold_BrowserPtr, color: t.CUInt32T) +extern def Fl_Hold_Browser_label_color(self: Fl_Hold_BrowserPtr) -> uint32 +extern def Fl_Hold_Browser_set_label_color(self: Fl_Hold_BrowserPtr, color: uint32) extern def Fl_Hold_Browser_label_font(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_label_font(self: Fl_Hold_BrowserPtr, font: int) extern def Fl_Hold_Browser_label_size(self: Fl_Hold_BrowserPtr) -> int @@ -191,8 +191,8 @@ extern def Fl_Hold_Browser_set_when(self: Fl_Hold_BrowserPtr, a1: int) extern def Fl_Hold_Browser_when(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_image(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_parent(self: Fl_Hold_BrowserPtr) -> bytes -extern def Fl_Hold_Browser_selection_color(self: Fl_Hold_BrowserPtr) -> t.CUInt32T -extern def Fl_Hold_Browser_set_selection_color(self: Fl_Hold_BrowserPtr, color: t.CUInt32T) +extern def Fl_Hold_Browser_selection_color(self: Fl_Hold_BrowserPtr) -> uint32 +extern def Fl_Hold_Browser_set_selection_color(self: Fl_Hold_BrowserPtr, color: uint32) extern def Fl_Hold_Browser_do_callback(self: Fl_Hold_BrowserPtr) extern def Fl_Hold_Browser_inside(self: Fl_Hold_BrowserPtr, a1: bytes) -> int extern def Fl_Hold_Browser_window(self: Fl_Hold_BrowserPtr) -> bytes @@ -203,15 +203,15 @@ extern def Fl_Hold_Browser_take_focus(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_visible_focus(self: Fl_Hold_BrowserPtr) extern def Fl_Hold_Browser_clear_visible_focus(self: Fl_Hold_BrowserPtr) extern def Fl_Hold_Browser_visible_focus(self: Fl_Hold_BrowserPtr, v: int) -extern def Fl_Hold_Browser_has_visible_focus(self: Fl_Hold_BrowserPtr) -> t.CUInt32T +extern def Fl_Hold_Browser_has_visible_focus(self: Fl_Hold_BrowserPtr) -> uint32 extern def Fl_Hold_Browser_set_user_data(self: Fl_Hold_BrowserPtr, data: bytes) extern def Fl_Hold_Browser_draw_data(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_handle_data(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_set_draw_data(self: Fl_Hold_BrowserPtr, data: bytes) extern def Fl_Hold_Browser_set_handle_data(self: Fl_Hold_BrowserPtr, data: bytes) -extern def Fl_Hold_Browser_damage(self: Fl_Hold_BrowserPtr) -> t.CUInt8T -extern def Fl_Hold_Browser_set_damage(self: Fl_Hold_BrowserPtr, flag: t.CUInt8T) -extern def Fl_Hold_Browser_set_damage_area(self: Fl_Hold_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Hold_Browser_damage(self: Fl_Hold_BrowserPtr) -> uint8 +extern def Fl_Hold_Browser_set_damage(self: Fl_Hold_BrowserPtr, flag: uint8) +extern def Fl_Hold_Browser_set_damage_area(self: Fl_Hold_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Hold_Browser_clear_damage(self: Fl_Hold_BrowserPtr) extern def Fl_Hold_Browser_as_window(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_as_group(self: Fl_Hold_BrowserPtr) -> bytes @@ -220,7 +220,7 @@ extern def Fl_Hold_Browser_deimage(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_set_callback(self: Fl_Hold_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_Hold_Browser_visible(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_visible_r(self: Fl_Hold_BrowserPtr) -> int -extern def Fl_Hold_Browser_active(self: Fl_Hold_BrowserPtr) -> t.CUInt32T +extern def Fl_Hold_Browser_active(self: Fl_Hold_BrowserPtr) -> uint32 extern def Fl_Hold_Browser_active_r(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_callback(self: Fl_Hold_BrowserPtr) -> bytes extern def Fl_Hold_Browser_set_deletion_callback(self: Fl_Hold_BrowserPtr, cb1: bytes, data: bytes) @@ -266,8 +266,8 @@ extern def Fl_Hold_Browser_position(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_position(self: Fl_Hold_BrowserPtr, pos: int) extern def Fl_Hold_Browser_hposition(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_hposition(self: Fl_Hold_BrowserPtr, a1: int) -extern def Fl_Hold_Browser_has_scrollbar(self: Fl_Hold_BrowserPtr) -> t.CUInt8T -extern def Fl_Hold_Browser_set_has_scrollbar(self: Fl_Hold_BrowserPtr, mode: t.CUInt8T) +extern def Fl_Hold_Browser_has_scrollbar(self: Fl_Hold_BrowserPtr) -> uint8 +extern def Fl_Hold_Browser_set_has_scrollbar(self: Fl_Hold_BrowserPtr, mode: uint8) extern def Fl_Hold_Browser_scrollbar_size(self: Fl_Hold_BrowserPtr) -> int extern def Fl_Hold_Browser_set_scrollbar_size(self: Fl_Hold_BrowserPtr, newSize: int) extern def Fl_Hold_Browser_sort(self: Fl_Hold_BrowserPtr) @@ -297,11 +297,11 @@ extern def Fl_Select_Browser_tooltip(self: Fl_Select_BrowserPtr) -> str extern def Fl_Select_Browser_set_tooltip(self: Fl_Select_BrowserPtr, txt: str) extern def Fl_Select_Browser_get_type(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_type(self: Fl_Select_BrowserPtr, typ: int) -extern def Fl_Select_Browser_color(self: Fl_Select_BrowserPtr) -> t.CUInt32T -extern def Fl_Select_Browser_set_color(self: Fl_Select_BrowserPtr, color: t.CUInt32T) +extern def Fl_Select_Browser_color(self: Fl_Select_BrowserPtr) -> uint32 +extern def Fl_Select_Browser_set_color(self: Fl_Select_BrowserPtr, color: uint32) extern def Fl_Select_Browser_measure_label(self: Fl_Select_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_Select_Browser_label_color(self: Fl_Select_BrowserPtr) -> t.CUInt32T -extern def Fl_Select_Browser_set_label_color(self: Fl_Select_BrowserPtr, color: t.CUInt32T) +extern def Fl_Select_Browser_label_color(self: Fl_Select_BrowserPtr) -> uint32 +extern def Fl_Select_Browser_set_label_color(self: Fl_Select_BrowserPtr, color: uint32) extern def Fl_Select_Browser_label_font(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_label_font(self: Fl_Select_BrowserPtr, font: int) extern def Fl_Select_Browser_label_size(self: Fl_Select_BrowserPtr) -> int @@ -325,8 +325,8 @@ extern def Fl_Select_Browser_set_when(self: Fl_Select_BrowserPtr, a1: int) extern def Fl_Select_Browser_when(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_image(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_parent(self: Fl_Select_BrowserPtr) -> bytes -extern def Fl_Select_Browser_selection_color(self: Fl_Select_BrowserPtr) -> t.CUInt32T -extern def Fl_Select_Browser_set_selection_color(self: Fl_Select_BrowserPtr, color: t.CUInt32T) +extern def Fl_Select_Browser_selection_color(self: Fl_Select_BrowserPtr) -> uint32 +extern def Fl_Select_Browser_set_selection_color(self: Fl_Select_BrowserPtr, color: uint32) extern def Fl_Select_Browser_do_callback(self: Fl_Select_BrowserPtr) extern def Fl_Select_Browser_inside(self: Fl_Select_BrowserPtr, a1: bytes) -> int extern def Fl_Select_Browser_window(self: Fl_Select_BrowserPtr) -> bytes @@ -337,15 +337,15 @@ extern def Fl_Select_Browser_take_focus(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_visible_focus(self: Fl_Select_BrowserPtr) extern def Fl_Select_Browser_clear_visible_focus(self: Fl_Select_BrowserPtr) extern def Fl_Select_Browser_visible_focus(self: Fl_Select_BrowserPtr, v: int) -extern def Fl_Select_Browser_has_visible_focus(self: Fl_Select_BrowserPtr) -> t.CUInt32T +extern def Fl_Select_Browser_has_visible_focus(self: Fl_Select_BrowserPtr) -> uint32 extern def Fl_Select_Browser_set_user_data(self: Fl_Select_BrowserPtr, data: bytes) extern def Fl_Select_Browser_draw_data(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_handle_data(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_set_draw_data(self: Fl_Select_BrowserPtr, data: bytes) extern def Fl_Select_Browser_set_handle_data(self: Fl_Select_BrowserPtr, data: bytes) -extern def Fl_Select_Browser_damage(self: Fl_Select_BrowserPtr) -> t.CUInt8T -extern def Fl_Select_Browser_set_damage(self: Fl_Select_BrowserPtr, flag: t.CUInt8T) -extern def Fl_Select_Browser_set_damage_area(self: Fl_Select_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Select_Browser_damage(self: Fl_Select_BrowserPtr) -> uint8 +extern def Fl_Select_Browser_set_damage(self: Fl_Select_BrowserPtr, flag: uint8) +extern def Fl_Select_Browser_set_damage_area(self: Fl_Select_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Select_Browser_clear_damage(self: Fl_Select_BrowserPtr) extern def Fl_Select_Browser_as_window(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_as_group(self: Fl_Select_BrowserPtr) -> bytes @@ -354,7 +354,7 @@ extern def Fl_Select_Browser_deimage(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_set_callback(self: Fl_Select_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_Select_Browser_visible(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_visible_r(self: Fl_Select_BrowserPtr) -> int -extern def Fl_Select_Browser_active(self: Fl_Select_BrowserPtr) -> t.CUInt32T +extern def Fl_Select_Browser_active(self: Fl_Select_BrowserPtr) -> uint32 extern def Fl_Select_Browser_active_r(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_callback(self: Fl_Select_BrowserPtr) -> bytes extern def Fl_Select_Browser_set_deletion_callback(self: Fl_Select_BrowserPtr, cb1: bytes, data: bytes) @@ -400,8 +400,8 @@ extern def Fl_Select_Browser_position(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_position(self: Fl_Select_BrowserPtr, pos: int) extern def Fl_Select_Browser_hposition(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_hposition(self: Fl_Select_BrowserPtr, a1: int) -extern def Fl_Select_Browser_has_scrollbar(self: Fl_Select_BrowserPtr) -> t.CUInt8T -extern def Fl_Select_Browser_set_has_scrollbar(self: Fl_Select_BrowserPtr, mode: t.CUInt8T) +extern def Fl_Select_Browser_has_scrollbar(self: Fl_Select_BrowserPtr) -> uint8 +extern def Fl_Select_Browser_set_has_scrollbar(self: Fl_Select_BrowserPtr, mode: uint8) extern def Fl_Select_Browser_scrollbar_size(self: Fl_Select_BrowserPtr) -> int extern def Fl_Select_Browser_set_scrollbar_size(self: Fl_Select_BrowserPtr, newSize: int) extern def Fl_Select_Browser_sort(self: Fl_Select_BrowserPtr) @@ -431,11 +431,11 @@ extern def Fl_Multi_Browser_tooltip(self: Fl_Multi_BrowserPtr) -> str extern def Fl_Multi_Browser_set_tooltip(self: Fl_Multi_BrowserPtr, txt: str) extern def Fl_Multi_Browser_get_type(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_type(self: Fl_Multi_BrowserPtr, typ: int) -extern def Fl_Multi_Browser_color(self: Fl_Multi_BrowserPtr) -> t.CUInt32T -extern def Fl_Multi_Browser_set_color(self: Fl_Multi_BrowserPtr, color: t.CUInt32T) +extern def Fl_Multi_Browser_color(self: Fl_Multi_BrowserPtr) -> uint32 +extern def Fl_Multi_Browser_set_color(self: Fl_Multi_BrowserPtr, color: uint32) extern def Fl_Multi_Browser_measure_label(self: Fl_Multi_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_Multi_Browser_label_color(self: Fl_Multi_BrowserPtr) -> t.CUInt32T -extern def Fl_Multi_Browser_set_label_color(self: Fl_Multi_BrowserPtr, color: t.CUInt32T) +extern def Fl_Multi_Browser_label_color(self: Fl_Multi_BrowserPtr) -> uint32 +extern def Fl_Multi_Browser_set_label_color(self: Fl_Multi_BrowserPtr, color: uint32) extern def Fl_Multi_Browser_label_font(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_label_font(self: Fl_Multi_BrowserPtr, font: int) extern def Fl_Multi_Browser_label_size(self: Fl_Multi_BrowserPtr) -> int @@ -459,8 +459,8 @@ extern def Fl_Multi_Browser_set_when(self: Fl_Multi_BrowserPtr, a1: int) extern def Fl_Multi_Browser_when(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_image(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_parent(self: Fl_Multi_BrowserPtr) -> bytes -extern def Fl_Multi_Browser_selection_color(self: Fl_Multi_BrowserPtr) -> t.CUInt32T -extern def Fl_Multi_Browser_set_selection_color(self: Fl_Multi_BrowserPtr, color: t.CUInt32T) +extern def Fl_Multi_Browser_selection_color(self: Fl_Multi_BrowserPtr) -> uint32 +extern def Fl_Multi_Browser_set_selection_color(self: Fl_Multi_BrowserPtr, color: uint32) extern def Fl_Multi_Browser_do_callback(self: Fl_Multi_BrowserPtr) extern def Fl_Multi_Browser_inside(self: Fl_Multi_BrowserPtr, a1: bytes) -> int extern def Fl_Multi_Browser_window(self: Fl_Multi_BrowserPtr) -> bytes @@ -471,15 +471,15 @@ extern def Fl_Multi_Browser_take_focus(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_visible_focus(self: Fl_Multi_BrowserPtr) extern def Fl_Multi_Browser_clear_visible_focus(self: Fl_Multi_BrowserPtr) extern def Fl_Multi_Browser_visible_focus(self: Fl_Multi_BrowserPtr, v: int) -extern def Fl_Multi_Browser_has_visible_focus(self: Fl_Multi_BrowserPtr) -> t.CUInt32T +extern def Fl_Multi_Browser_has_visible_focus(self: Fl_Multi_BrowserPtr) -> uint32 extern def Fl_Multi_Browser_set_user_data(self: Fl_Multi_BrowserPtr, data: bytes) extern def Fl_Multi_Browser_draw_data(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_handle_data(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_set_draw_data(self: Fl_Multi_BrowserPtr, data: bytes) extern def Fl_Multi_Browser_set_handle_data(self: Fl_Multi_BrowserPtr, data: bytes) -extern def Fl_Multi_Browser_damage(self: Fl_Multi_BrowserPtr) -> t.CUInt8T -extern def Fl_Multi_Browser_set_damage(self: Fl_Multi_BrowserPtr, flag: t.CUInt8T) -extern def Fl_Multi_Browser_set_damage_area(self: Fl_Multi_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Multi_Browser_damage(self: Fl_Multi_BrowserPtr) -> uint8 +extern def Fl_Multi_Browser_set_damage(self: Fl_Multi_BrowserPtr, flag: uint8) +extern def Fl_Multi_Browser_set_damage_area(self: Fl_Multi_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Multi_Browser_clear_damage(self: Fl_Multi_BrowserPtr) extern def Fl_Multi_Browser_as_window(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_as_group(self: Fl_Multi_BrowserPtr) -> bytes @@ -488,7 +488,7 @@ extern def Fl_Multi_Browser_deimage(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_set_callback(self: Fl_Multi_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_Multi_Browser_visible(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_visible_r(self: Fl_Multi_BrowserPtr) -> int -extern def Fl_Multi_Browser_active(self: Fl_Multi_BrowserPtr) -> t.CUInt32T +extern def Fl_Multi_Browser_active(self: Fl_Multi_BrowserPtr) -> uint32 extern def Fl_Multi_Browser_active_r(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_callback(self: Fl_Multi_BrowserPtr) -> bytes extern def Fl_Multi_Browser_set_deletion_callback(self: Fl_Multi_BrowserPtr, cb1: bytes, data: bytes) @@ -534,8 +534,8 @@ extern def Fl_Multi_Browser_position(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_position(self: Fl_Multi_BrowserPtr, pos: int) extern def Fl_Multi_Browser_hposition(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_hposition(self: Fl_Multi_BrowserPtr, a1: int) -extern def Fl_Multi_Browser_has_scrollbar(self: Fl_Multi_BrowserPtr) -> t.CUInt8T -extern def Fl_Multi_Browser_set_has_scrollbar(self: Fl_Multi_BrowserPtr, mode: t.CUInt8T) +extern def Fl_Multi_Browser_has_scrollbar(self: Fl_Multi_BrowserPtr) -> uint8 +extern def Fl_Multi_Browser_set_has_scrollbar(self: Fl_Multi_BrowserPtr, mode: uint8) extern def Fl_Multi_Browser_scrollbar_size(self: Fl_Multi_BrowserPtr) -> int extern def Fl_Multi_Browser_set_scrollbar_size(self: Fl_Multi_BrowserPtr, newSize: int) extern def Fl_Multi_Browser_sort(self: Fl_Multi_BrowserPtr) @@ -565,11 +565,11 @@ extern def Fl_File_Browser_tooltip(self: Fl_File_BrowserPtr) -> str extern def Fl_File_Browser_set_tooltip(self: Fl_File_BrowserPtr, txt: str) extern def Fl_File_Browser_get_type(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_type(self: Fl_File_BrowserPtr, typ: int) -extern def Fl_File_Browser_color(self: Fl_File_BrowserPtr) -> t.CUInt32T -extern def Fl_File_Browser_set_color(self: Fl_File_BrowserPtr, color: t.CUInt32T) +extern def Fl_File_Browser_color(self: Fl_File_BrowserPtr) -> uint32 +extern def Fl_File_Browser_set_color(self: Fl_File_BrowserPtr, color: uint32) extern def Fl_File_Browser_measure_label(self: Fl_File_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_File_Browser_label_color(self: Fl_File_BrowserPtr) -> t.CUInt32T -extern def Fl_File_Browser_set_label_color(self: Fl_File_BrowserPtr, color: t.CUInt32T) +extern def Fl_File_Browser_label_color(self: Fl_File_BrowserPtr) -> uint32 +extern def Fl_File_Browser_set_label_color(self: Fl_File_BrowserPtr, color: uint32) extern def Fl_File_Browser_label_font(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_label_font(self: Fl_File_BrowserPtr, font: int) extern def Fl_File_Browser_label_size(self: Fl_File_BrowserPtr) -> int @@ -593,8 +593,8 @@ extern def Fl_File_Browser_set_when(self: Fl_File_BrowserPtr, a1: int) extern def Fl_File_Browser_when(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_image(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_parent(self: Fl_File_BrowserPtr) -> bytes -extern def Fl_File_Browser_selection_color(self: Fl_File_BrowserPtr) -> t.CUInt32T -extern def Fl_File_Browser_set_selection_color(self: Fl_File_BrowserPtr, color: t.CUInt32T) +extern def Fl_File_Browser_selection_color(self: Fl_File_BrowserPtr) -> uint32 +extern def Fl_File_Browser_set_selection_color(self: Fl_File_BrowserPtr, color: uint32) extern def Fl_File_Browser_do_callback(self: Fl_File_BrowserPtr) extern def Fl_File_Browser_inside(self: Fl_File_BrowserPtr, a1: bytes) -> int extern def Fl_File_Browser_window(self: Fl_File_BrowserPtr) -> bytes @@ -605,15 +605,15 @@ extern def Fl_File_Browser_take_focus(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_visible_focus(self: Fl_File_BrowserPtr) extern def Fl_File_Browser_clear_visible_focus(self: Fl_File_BrowserPtr) extern def Fl_File_Browser_visible_focus(self: Fl_File_BrowserPtr, v: int) -extern def Fl_File_Browser_has_visible_focus(self: Fl_File_BrowserPtr) -> t.CUInt32T +extern def Fl_File_Browser_has_visible_focus(self: Fl_File_BrowserPtr) -> uint32 extern def Fl_File_Browser_set_user_data(self: Fl_File_BrowserPtr, data: bytes) extern def Fl_File_Browser_draw_data(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_handle_data(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_set_draw_data(self: Fl_File_BrowserPtr, data: bytes) extern def Fl_File_Browser_set_handle_data(self: Fl_File_BrowserPtr, data: bytes) -extern def Fl_File_Browser_damage(self: Fl_File_BrowserPtr) -> t.CUInt8T -extern def Fl_File_Browser_set_damage(self: Fl_File_BrowserPtr, flag: t.CUInt8T) -extern def Fl_File_Browser_set_damage_area(self: Fl_File_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_File_Browser_damage(self: Fl_File_BrowserPtr) -> uint8 +extern def Fl_File_Browser_set_damage(self: Fl_File_BrowserPtr, flag: uint8) +extern def Fl_File_Browser_set_damage_area(self: Fl_File_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_File_Browser_clear_damage(self: Fl_File_BrowserPtr) extern def Fl_File_Browser_as_window(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_as_group(self: Fl_File_BrowserPtr) -> bytes @@ -622,7 +622,7 @@ extern def Fl_File_Browser_deimage(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_set_callback(self: Fl_File_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_File_Browser_visible(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_visible_r(self: Fl_File_BrowserPtr) -> int -extern def Fl_File_Browser_active(self: Fl_File_BrowserPtr) -> t.CUInt32T +extern def Fl_File_Browser_active(self: Fl_File_BrowserPtr) -> uint32 extern def Fl_File_Browser_active_r(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_callback(self: Fl_File_BrowserPtr) -> bytes extern def Fl_File_Browser_set_deletion_callback(self: Fl_File_BrowserPtr, cb1: bytes, data: bytes) @@ -668,8 +668,8 @@ extern def Fl_File_Browser_position(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_position(self: Fl_File_BrowserPtr, pos: int) extern def Fl_File_Browser_hposition(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_hposition(self: Fl_File_BrowserPtr, a1: int) -extern def Fl_File_Browser_has_scrollbar(self: Fl_File_BrowserPtr) -> t.CUInt8T -extern def Fl_File_Browser_set_has_scrollbar(self: Fl_File_BrowserPtr, mode: t.CUInt8T) +extern def Fl_File_Browser_has_scrollbar(self: Fl_File_BrowserPtr) -> uint8 +extern def Fl_File_Browser_set_has_scrollbar(self: Fl_File_BrowserPtr, mode: uint8) extern def Fl_File_Browser_scrollbar_size(self: Fl_File_BrowserPtr) -> int extern def Fl_File_Browser_set_scrollbar_size(self: Fl_File_BrowserPtr, newSize: int) extern def Fl_File_Browser_sort(self: Fl_File_BrowserPtr) @@ -699,11 +699,11 @@ extern def Fl_Check_Browser_tooltip(self: Fl_Check_BrowserPtr) -> str extern def Fl_Check_Browser_set_tooltip(self: Fl_Check_BrowserPtr, txt: str) extern def Fl_Check_Browser_get_type(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_type(self: Fl_Check_BrowserPtr, typ: int) -extern def Fl_Check_Browser_color(self: Fl_Check_BrowserPtr) -> t.CUInt32T -extern def Fl_Check_Browser_set_color(self: Fl_Check_BrowserPtr, color: t.CUInt32T) +extern def Fl_Check_Browser_color(self: Fl_Check_BrowserPtr) -> uint32 +extern def Fl_Check_Browser_set_color(self: Fl_Check_BrowserPtr, color: uint32) extern def Fl_Check_Browser_measure_label(self: Fl_Check_BrowserPtr, a1: bytes, a2: bytes) -extern def Fl_Check_Browser_label_color(self: Fl_Check_BrowserPtr) -> t.CUInt32T -extern def Fl_Check_Browser_set_label_color(self: Fl_Check_BrowserPtr, color: t.CUInt32T) +extern def Fl_Check_Browser_label_color(self: Fl_Check_BrowserPtr) -> uint32 +extern def Fl_Check_Browser_set_label_color(self: Fl_Check_BrowserPtr, color: uint32) extern def Fl_Check_Browser_label_font(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_label_font(self: Fl_Check_BrowserPtr, font: int) extern def Fl_Check_Browser_label_size(self: Fl_Check_BrowserPtr) -> int @@ -727,8 +727,8 @@ extern def Fl_Check_Browser_set_when(self: Fl_Check_BrowserPtr, a1: int) extern def Fl_Check_Browser_when(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_image(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_parent(self: Fl_Check_BrowserPtr) -> bytes -extern def Fl_Check_Browser_selection_color(self: Fl_Check_BrowserPtr) -> t.CUInt32T -extern def Fl_Check_Browser_set_selection_color(self: Fl_Check_BrowserPtr, color: t.CUInt32T) +extern def Fl_Check_Browser_selection_color(self: Fl_Check_BrowserPtr) -> uint32 +extern def Fl_Check_Browser_set_selection_color(self: Fl_Check_BrowserPtr, color: uint32) extern def Fl_Check_Browser_do_callback(self: Fl_Check_BrowserPtr) extern def Fl_Check_Browser_inside(self: Fl_Check_BrowserPtr, a1: bytes) -> int extern def Fl_Check_Browser_window(self: Fl_Check_BrowserPtr) -> bytes @@ -739,15 +739,15 @@ extern def Fl_Check_Browser_take_focus(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_visible_focus(self: Fl_Check_BrowserPtr) extern def Fl_Check_Browser_clear_visible_focus(self: Fl_Check_BrowserPtr) extern def Fl_Check_Browser_visible_focus(self: Fl_Check_BrowserPtr, v: int) -extern def Fl_Check_Browser_has_visible_focus(self: Fl_Check_BrowserPtr) -> t.CUInt32T +extern def Fl_Check_Browser_has_visible_focus(self: Fl_Check_BrowserPtr) -> uint32 extern def Fl_Check_Browser_set_user_data(self: Fl_Check_BrowserPtr, data: bytes) extern def Fl_Check_Browser_draw_data(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_handle_data(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_set_draw_data(self: Fl_Check_BrowserPtr, data: bytes) extern def Fl_Check_Browser_set_handle_data(self: Fl_Check_BrowserPtr, data: bytes) -extern def Fl_Check_Browser_damage(self: Fl_Check_BrowserPtr) -> t.CUInt8T -extern def Fl_Check_Browser_set_damage(self: Fl_Check_BrowserPtr, flag: t.CUInt8T) -extern def Fl_Check_Browser_set_damage_area(self: Fl_Check_BrowserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Check_Browser_damage(self: Fl_Check_BrowserPtr) -> uint8 +extern def Fl_Check_Browser_set_damage(self: Fl_Check_BrowserPtr, flag: uint8) +extern def Fl_Check_Browser_set_damage_area(self: Fl_Check_BrowserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Check_Browser_clear_damage(self: Fl_Check_BrowserPtr) extern def Fl_Check_Browser_as_window(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_as_group(self: Fl_Check_BrowserPtr) -> bytes @@ -756,7 +756,7 @@ extern def Fl_Check_Browser_deimage(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_set_callback(self: Fl_Check_BrowserPtr, a1: bytes, a2: bytes) extern def Fl_Check_Browser_visible(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_visible_r(self: Fl_Check_BrowserPtr) -> int -extern def Fl_Check_Browser_active(self: Fl_Check_BrowserPtr) -> t.CUInt32T +extern def Fl_Check_Browser_active(self: Fl_Check_BrowserPtr) -> uint32 extern def Fl_Check_Browser_active_r(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_callback(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_set_deletion_callback(self: Fl_Check_BrowserPtr, cb1: bytes, data: bytes) @@ -787,15 +787,15 @@ extern def Fl_Check_Browser_position(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_position(self: Fl_Check_BrowserPtr, pos: int) extern def Fl_Check_Browser_hposition(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_hposition(self: Fl_Check_BrowserPtr, a1: int) -extern def Fl_Check_Browser_has_scrollbar(self: Fl_Check_BrowserPtr) -> t.CUInt8T +extern def Fl_Check_Browser_has_scrollbar(self: Fl_Check_BrowserPtr) -> uint8 extern def Fl_Check_Browser_scrollbar(self: Fl_Check_BrowserPtr) -> bytes extern def Fl_Check_Browser_hscrollbar(self: Fl_Check_BrowserPtr) -> bytes -extern def Fl_Check_Browser_set_has_scrollbar(self: Fl_Check_BrowserPtr, mode: t.CUInt8T) +extern def Fl_Check_Browser_set_has_scrollbar(self: Fl_Check_BrowserPtr, mode: uint8) extern def Fl_Check_Browser_scrollbar_size(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_scrollbar_size(self: Fl_Check_BrowserPtr, newSize: int) extern def Fl_Check_Browser_sort(self: Fl_Check_BrowserPtr) -extern def Fl_Check_Browser_set_text_color(self: Fl_Check_BrowserPtr, c: t.CUInt32T) -extern def Fl_Check_Browser_text_color(self: Fl_Check_BrowserPtr) -> t.CUInt32T +extern def Fl_Check_Browser_set_text_color(self: Fl_Check_BrowserPtr, c: uint32) +extern def Fl_Check_Browser_text_color(self: Fl_Check_BrowserPtr) -> uint32 extern def Fl_Check_Browser_set_text_font(self: Fl_Check_BrowserPtr, f: int) extern def Fl_Check_Browser_text_font(self: Fl_Check_BrowserPtr) -> int extern def Fl_Check_Browser_set_text_size(self: Fl_Check_BrowserPtr, s: int) diff --git a/fltk/_cfl_button.vp b/fltk/_cfl_button.vp index 0b59c65..ab32ab1 100644 --- a/fltk/_cfl_button.vp +++ b/fltk/_cfl_button.vp @@ -29,11 +29,11 @@ extern def Fl_Button_tooltip(self: Fl_ButtonPtr) -> str extern def Fl_Button_set_tooltip(self: Fl_ButtonPtr, txt: str) extern def Fl_Button_get_type(self: Fl_ButtonPtr) -> int extern def Fl_Button_set_type(self: Fl_ButtonPtr, typ: int) -extern def Fl_Button_color(self: Fl_ButtonPtr) -> t.CUInt32T -extern def Fl_Button_set_color(self: Fl_ButtonPtr, color: t.CUInt32T) +extern def Fl_Button_color(self: Fl_ButtonPtr) -> uint32 +extern def Fl_Button_set_color(self: Fl_ButtonPtr, color: uint32) extern def Fl_Button_measure_label(self: Fl_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Button_label_color(self: Fl_ButtonPtr) -> t.CUInt32T -extern def Fl_Button_set_label_color(self: Fl_ButtonPtr, color: t.CUInt32T) +extern def Fl_Button_label_color(self: Fl_ButtonPtr) -> uint32 +extern def Fl_Button_set_label_color(self: Fl_ButtonPtr, color: uint32) extern def Fl_Button_label_font(self: Fl_ButtonPtr) -> int extern def Fl_Button_set_label_font(self: Fl_ButtonPtr, font: int) extern def Fl_Button_label_size(self: Fl_ButtonPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Button_set_when(self: Fl_ButtonPtr, a1: int) extern def Fl_Button_when(self: Fl_ButtonPtr) -> int extern def Fl_Button_image(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_parent(self: Fl_ButtonPtr) -> bytes -extern def Fl_Button_selection_color(self: Fl_ButtonPtr) -> t.CUInt32T -extern def Fl_Button_set_selection_color(self: Fl_ButtonPtr, color: t.CUInt32T) +extern def Fl_Button_selection_color(self: Fl_ButtonPtr) -> uint32 +extern def Fl_Button_set_selection_color(self: Fl_ButtonPtr, color: uint32) extern def Fl_Button_do_callback(self: Fl_ButtonPtr) extern def Fl_Button_inside(self: Fl_ButtonPtr, a1: bytes) -> int extern def Fl_Button_window(self: Fl_ButtonPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Button_take_focus(self: Fl_ButtonPtr) -> int extern def Fl_Button_set_visible_focus(self: Fl_ButtonPtr) extern def Fl_Button_clear_visible_focus(self: Fl_ButtonPtr) extern def Fl_Button_visible_focus(self: Fl_ButtonPtr, v: int) -extern def Fl_Button_has_visible_focus(self: Fl_ButtonPtr) -> t.CUInt32T +extern def Fl_Button_has_visible_focus(self: Fl_ButtonPtr) -> uint32 extern def Fl_Button_set_user_data(self: Fl_ButtonPtr, data: bytes) extern def Fl_Button_draw_data(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_handle_data(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_set_draw_data(self: Fl_ButtonPtr, data: bytes) extern def Fl_Button_set_handle_data(self: Fl_ButtonPtr, data: bytes) -extern def Fl_Button_damage(self: Fl_ButtonPtr) -> t.CUInt8T -extern def Fl_Button_set_damage(self: Fl_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Button_set_damage_area(self: Fl_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Button_damage(self: Fl_ButtonPtr) -> uint8 +extern def Fl_Button_set_damage(self: Fl_ButtonPtr, flag: uint8) +extern def Fl_Button_set_damage_area(self: Fl_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Button_clear_damage(self: Fl_ButtonPtr) extern def Fl_Button_as_window(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_as_group(self: Fl_ButtonPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Button_deimage(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_set_callback(self: Fl_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Button_visible(self: Fl_ButtonPtr) -> int extern def Fl_Button_visible_r(self: Fl_ButtonPtr) -> int -extern def Fl_Button_active(self: Fl_ButtonPtr) -> t.CUInt32T +extern def Fl_Button_active(self: Fl_ButtonPtr) -> uint32 extern def Fl_Button_active_r(self: Fl_ButtonPtr) -> int extern def Fl_Button_callback(self: Fl_ButtonPtr) -> bytes extern def Fl_Button_set_deletion_callback(self: Fl_ButtonPtr, cb1: bytes, data: bytes) @@ -104,8 +104,8 @@ extern def Fl_Button_value(self: Fl_ButtonPtr) -> int extern def Fl_Button_set_value(self: Fl_ButtonPtr, flag: int) extern def Fl_Button_set_down_box(self: Fl_ButtonPtr, a1: int) extern def Fl_Button_down_box(self: Fl_ButtonPtr) -> int -extern def Fl_Button_set_compact(self: Fl_ButtonPtr, v: t.CUInt8T) -extern def Fl_Button_compact(self: Fl_ButtonPtr) -> t.CUInt8T +extern def Fl_Button_set_compact(self: Fl_ButtonPtr, v: uint8) +extern def Fl_Button_compact(self: Fl_ButtonPtr) -> uint8 # ----- Fl_Check_Button (widget_declare) ----- extern def Fl_Check_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Check_ButtonPtr @@ -127,11 +127,11 @@ extern def Fl_Check_Button_tooltip(self: Fl_Check_ButtonPtr) -> str extern def Fl_Check_Button_set_tooltip(self: Fl_Check_ButtonPtr, txt: str) extern def Fl_Check_Button_get_type(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_set_type(self: Fl_Check_ButtonPtr, typ: int) -extern def Fl_Check_Button_color(self: Fl_Check_ButtonPtr) -> t.CUInt32T -extern def Fl_Check_Button_set_color(self: Fl_Check_ButtonPtr, color: t.CUInt32T) +extern def Fl_Check_Button_color(self: Fl_Check_ButtonPtr) -> uint32 +extern def Fl_Check_Button_set_color(self: Fl_Check_ButtonPtr, color: uint32) extern def Fl_Check_Button_measure_label(self: Fl_Check_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Check_Button_label_color(self: Fl_Check_ButtonPtr) -> t.CUInt32T -extern def Fl_Check_Button_set_label_color(self: Fl_Check_ButtonPtr, color: t.CUInt32T) +extern def Fl_Check_Button_label_color(self: Fl_Check_ButtonPtr) -> uint32 +extern def Fl_Check_Button_set_label_color(self: Fl_Check_ButtonPtr, color: uint32) extern def Fl_Check_Button_label_font(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_set_label_font(self: Fl_Check_ButtonPtr, font: int) extern def Fl_Check_Button_label_size(self: Fl_Check_ButtonPtr) -> int @@ -155,8 +155,8 @@ extern def Fl_Check_Button_set_when(self: Fl_Check_ButtonPtr, a1: int) extern def Fl_Check_Button_when(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_image(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_parent(self: Fl_Check_ButtonPtr) -> bytes -extern def Fl_Check_Button_selection_color(self: Fl_Check_ButtonPtr) -> t.CUInt32T -extern def Fl_Check_Button_set_selection_color(self: Fl_Check_ButtonPtr, color: t.CUInt32T) +extern def Fl_Check_Button_selection_color(self: Fl_Check_ButtonPtr) -> uint32 +extern def Fl_Check_Button_set_selection_color(self: Fl_Check_ButtonPtr, color: uint32) extern def Fl_Check_Button_do_callback(self: Fl_Check_ButtonPtr) extern def Fl_Check_Button_inside(self: Fl_Check_ButtonPtr, a1: bytes) -> int extern def Fl_Check_Button_window(self: Fl_Check_ButtonPtr) -> bytes @@ -167,15 +167,15 @@ extern def Fl_Check_Button_take_focus(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_set_visible_focus(self: Fl_Check_ButtonPtr) extern def Fl_Check_Button_clear_visible_focus(self: Fl_Check_ButtonPtr) extern def Fl_Check_Button_visible_focus(self: Fl_Check_ButtonPtr, v: int) -extern def Fl_Check_Button_has_visible_focus(self: Fl_Check_ButtonPtr) -> t.CUInt32T +extern def Fl_Check_Button_has_visible_focus(self: Fl_Check_ButtonPtr) -> uint32 extern def Fl_Check_Button_set_user_data(self: Fl_Check_ButtonPtr, data: bytes) extern def Fl_Check_Button_draw_data(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_handle_data(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_set_draw_data(self: Fl_Check_ButtonPtr, data: bytes) extern def Fl_Check_Button_set_handle_data(self: Fl_Check_ButtonPtr, data: bytes) -extern def Fl_Check_Button_damage(self: Fl_Check_ButtonPtr) -> t.CUInt8T -extern def Fl_Check_Button_set_damage(self: Fl_Check_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Check_Button_set_damage_area(self: Fl_Check_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Check_Button_damage(self: Fl_Check_ButtonPtr) -> uint8 +extern def Fl_Check_Button_set_damage(self: Fl_Check_ButtonPtr, flag: uint8) +extern def Fl_Check_Button_set_damage_area(self: Fl_Check_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Check_Button_clear_damage(self: Fl_Check_ButtonPtr) extern def Fl_Check_Button_as_window(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_as_group(self: Fl_Check_ButtonPtr) -> bytes @@ -184,7 +184,7 @@ extern def Fl_Check_Button_deimage(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_set_callback(self: Fl_Check_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Check_Button_visible(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_visible_r(self: Fl_Check_ButtonPtr) -> int -extern def Fl_Check_Button_active(self: Fl_Check_ButtonPtr) -> t.CUInt32T +extern def Fl_Check_Button_active(self: Fl_Check_ButtonPtr) -> uint32 extern def Fl_Check_Button_active_r(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_callback(self: Fl_Check_ButtonPtr) -> bytes extern def Fl_Check_Button_set_deletion_callback(self: Fl_Check_ButtonPtr, cb1: bytes, data: bytes) @@ -202,8 +202,8 @@ extern def Fl_Check_Button_value(self: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_set_value(self: Fl_Check_ButtonPtr, flag: int) extern def Fl_Check_Button_set_down_box(self: Fl_Check_ButtonPtr, a1: int) extern def Fl_Check_Button_down_box(self: Fl_Check_ButtonPtr) -> int -extern def Fl_Check_Button_set_compact(self: Fl_Check_ButtonPtr, v: t.CUInt8T) -extern def Fl_Check_Button_compact(self: Fl_Check_ButtonPtr) -> t.CUInt8T +extern def Fl_Check_Button_set_compact(self: Fl_Check_ButtonPtr, v: uint8) +extern def Fl_Check_Button_compact(self: Fl_Check_ButtonPtr) -> uint8 # ----- Fl_Radio_Button (widget_declare) ----- extern def Fl_Radio_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Radio_ButtonPtr @@ -225,11 +225,11 @@ extern def Fl_Radio_Button_tooltip(self: Fl_Radio_ButtonPtr) -> str extern def Fl_Radio_Button_set_tooltip(self: Fl_Radio_ButtonPtr, txt: str) extern def Fl_Radio_Button_get_type(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_set_type(self: Fl_Radio_ButtonPtr, typ: int) -extern def Fl_Radio_Button_color(self: Fl_Radio_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Button_set_color(self: Fl_Radio_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Button_color(self: Fl_Radio_ButtonPtr) -> uint32 +extern def Fl_Radio_Button_set_color(self: Fl_Radio_ButtonPtr, color: uint32) extern def Fl_Radio_Button_measure_label(self: Fl_Radio_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Radio_Button_label_color(self: Fl_Radio_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Button_set_label_color(self: Fl_Radio_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Button_label_color(self: Fl_Radio_ButtonPtr) -> uint32 +extern def Fl_Radio_Button_set_label_color(self: Fl_Radio_ButtonPtr, color: uint32) extern def Fl_Radio_Button_label_font(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_set_label_font(self: Fl_Radio_ButtonPtr, font: int) extern def Fl_Radio_Button_label_size(self: Fl_Radio_ButtonPtr) -> int @@ -253,8 +253,8 @@ extern def Fl_Radio_Button_set_when(self: Fl_Radio_ButtonPtr, a1: int) extern def Fl_Radio_Button_when(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_image(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_parent(self: Fl_Radio_ButtonPtr) -> bytes -extern def Fl_Radio_Button_selection_color(self: Fl_Radio_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Button_set_selection_color(self: Fl_Radio_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Button_selection_color(self: Fl_Radio_ButtonPtr) -> uint32 +extern def Fl_Radio_Button_set_selection_color(self: Fl_Radio_ButtonPtr, color: uint32) extern def Fl_Radio_Button_do_callback(self: Fl_Radio_ButtonPtr) extern def Fl_Radio_Button_inside(self: Fl_Radio_ButtonPtr, a1: bytes) -> int extern def Fl_Radio_Button_window(self: Fl_Radio_ButtonPtr) -> bytes @@ -265,15 +265,15 @@ extern def Fl_Radio_Button_take_focus(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_set_visible_focus(self: Fl_Radio_ButtonPtr) extern def Fl_Radio_Button_clear_visible_focus(self: Fl_Radio_ButtonPtr) extern def Fl_Radio_Button_visible_focus(self: Fl_Radio_ButtonPtr, v: int) -extern def Fl_Radio_Button_has_visible_focus(self: Fl_Radio_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Button_has_visible_focus(self: Fl_Radio_ButtonPtr) -> uint32 extern def Fl_Radio_Button_set_user_data(self: Fl_Radio_ButtonPtr, data: bytes) extern def Fl_Radio_Button_draw_data(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_handle_data(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_set_draw_data(self: Fl_Radio_ButtonPtr, data: bytes) extern def Fl_Radio_Button_set_handle_data(self: Fl_Radio_ButtonPtr, data: bytes) -extern def Fl_Radio_Button_damage(self: Fl_Radio_ButtonPtr) -> t.CUInt8T -extern def Fl_Radio_Button_set_damage(self: Fl_Radio_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Radio_Button_set_damage_area(self: Fl_Radio_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Radio_Button_damage(self: Fl_Radio_ButtonPtr) -> uint8 +extern def Fl_Radio_Button_set_damage(self: Fl_Radio_ButtonPtr, flag: uint8) +extern def Fl_Radio_Button_set_damage_area(self: Fl_Radio_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Radio_Button_clear_damage(self: Fl_Radio_ButtonPtr) extern def Fl_Radio_Button_as_window(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_as_group(self: Fl_Radio_ButtonPtr) -> bytes @@ -282,7 +282,7 @@ extern def Fl_Radio_Button_deimage(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_set_callback(self: Fl_Radio_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Radio_Button_visible(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_visible_r(self: Fl_Radio_ButtonPtr) -> int -extern def Fl_Radio_Button_active(self: Fl_Radio_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Button_active(self: Fl_Radio_ButtonPtr) -> uint32 extern def Fl_Radio_Button_active_r(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_callback(self: Fl_Radio_ButtonPtr) -> bytes extern def Fl_Radio_Button_set_deletion_callback(self: Fl_Radio_ButtonPtr, cb1: bytes, data: bytes) @@ -300,8 +300,8 @@ extern def Fl_Radio_Button_value(self: Fl_Radio_ButtonPtr) -> int extern def Fl_Radio_Button_set_value(self: Fl_Radio_ButtonPtr, flag: int) extern def Fl_Radio_Button_set_down_box(self: Fl_Radio_ButtonPtr, a1: int) extern def Fl_Radio_Button_down_box(self: Fl_Radio_ButtonPtr) -> int -extern def Fl_Radio_Button_set_compact(self: Fl_Radio_ButtonPtr, v: t.CUInt8T) -extern def Fl_Radio_Button_compact(self: Fl_Radio_ButtonPtr) -> t.CUInt8T +extern def Fl_Radio_Button_set_compact(self: Fl_Radio_ButtonPtr, v: uint8) +extern def Fl_Radio_Button_compact(self: Fl_Radio_ButtonPtr) -> uint8 # ----- Fl_Toggle_Button (widget_declare) ----- extern def Fl_Toggle_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Toggle_ButtonPtr @@ -323,11 +323,11 @@ extern def Fl_Toggle_Button_tooltip(self: Fl_Toggle_ButtonPtr) -> str extern def Fl_Toggle_Button_set_tooltip(self: Fl_Toggle_ButtonPtr, txt: str) extern def Fl_Toggle_Button_get_type(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_set_type(self: Fl_Toggle_ButtonPtr, typ: int) -extern def Fl_Toggle_Button_color(self: Fl_Toggle_ButtonPtr) -> t.CUInt32T -extern def Fl_Toggle_Button_set_color(self: Fl_Toggle_ButtonPtr, color: t.CUInt32T) +extern def Fl_Toggle_Button_color(self: Fl_Toggle_ButtonPtr) -> uint32 +extern def Fl_Toggle_Button_set_color(self: Fl_Toggle_ButtonPtr, color: uint32) extern def Fl_Toggle_Button_measure_label(self: Fl_Toggle_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Toggle_Button_label_color(self: Fl_Toggle_ButtonPtr) -> t.CUInt32T -extern def Fl_Toggle_Button_set_label_color(self: Fl_Toggle_ButtonPtr, color: t.CUInt32T) +extern def Fl_Toggle_Button_label_color(self: Fl_Toggle_ButtonPtr) -> uint32 +extern def Fl_Toggle_Button_set_label_color(self: Fl_Toggle_ButtonPtr, color: uint32) extern def Fl_Toggle_Button_label_font(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_set_label_font(self: Fl_Toggle_ButtonPtr, font: int) extern def Fl_Toggle_Button_label_size(self: Fl_Toggle_ButtonPtr) -> int @@ -351,8 +351,8 @@ extern def Fl_Toggle_Button_set_when(self: Fl_Toggle_ButtonPtr, a1: int) extern def Fl_Toggle_Button_when(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_image(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_parent(self: Fl_Toggle_ButtonPtr) -> bytes -extern def Fl_Toggle_Button_selection_color(self: Fl_Toggle_ButtonPtr) -> t.CUInt32T -extern def Fl_Toggle_Button_set_selection_color(self: Fl_Toggle_ButtonPtr, color: t.CUInt32T) +extern def Fl_Toggle_Button_selection_color(self: Fl_Toggle_ButtonPtr) -> uint32 +extern def Fl_Toggle_Button_set_selection_color(self: Fl_Toggle_ButtonPtr, color: uint32) extern def Fl_Toggle_Button_do_callback(self: Fl_Toggle_ButtonPtr) extern def Fl_Toggle_Button_inside(self: Fl_Toggle_ButtonPtr, a1: bytes) -> int extern def Fl_Toggle_Button_window(self: Fl_Toggle_ButtonPtr) -> bytes @@ -363,15 +363,15 @@ extern def Fl_Toggle_Button_take_focus(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_set_visible_focus(self: Fl_Toggle_ButtonPtr) extern def Fl_Toggle_Button_clear_visible_focus(self: Fl_Toggle_ButtonPtr) extern def Fl_Toggle_Button_visible_focus(self: Fl_Toggle_ButtonPtr, v: int) -extern def Fl_Toggle_Button_has_visible_focus(self: Fl_Toggle_ButtonPtr) -> t.CUInt32T +extern def Fl_Toggle_Button_has_visible_focus(self: Fl_Toggle_ButtonPtr) -> uint32 extern def Fl_Toggle_Button_set_user_data(self: Fl_Toggle_ButtonPtr, data: bytes) extern def Fl_Toggle_Button_draw_data(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_handle_data(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_set_draw_data(self: Fl_Toggle_ButtonPtr, data: bytes) extern def Fl_Toggle_Button_set_handle_data(self: Fl_Toggle_ButtonPtr, data: bytes) -extern def Fl_Toggle_Button_damage(self: Fl_Toggle_ButtonPtr) -> t.CUInt8T -extern def Fl_Toggle_Button_set_damage(self: Fl_Toggle_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Toggle_Button_set_damage_area(self: Fl_Toggle_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Toggle_Button_damage(self: Fl_Toggle_ButtonPtr) -> uint8 +extern def Fl_Toggle_Button_set_damage(self: Fl_Toggle_ButtonPtr, flag: uint8) +extern def Fl_Toggle_Button_set_damage_area(self: Fl_Toggle_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Toggle_Button_clear_damage(self: Fl_Toggle_ButtonPtr) extern def Fl_Toggle_Button_as_window(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_as_group(self: Fl_Toggle_ButtonPtr) -> bytes @@ -380,7 +380,7 @@ extern def Fl_Toggle_Button_deimage(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_set_callback(self: Fl_Toggle_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Toggle_Button_visible(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_visible_r(self: Fl_Toggle_ButtonPtr) -> int -extern def Fl_Toggle_Button_active(self: Fl_Toggle_ButtonPtr) -> t.CUInt32T +extern def Fl_Toggle_Button_active(self: Fl_Toggle_ButtonPtr) -> uint32 extern def Fl_Toggle_Button_active_r(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_callback(self: Fl_Toggle_ButtonPtr) -> bytes extern def Fl_Toggle_Button_set_deletion_callback(self: Fl_Toggle_ButtonPtr, cb1: bytes, data: bytes) @@ -398,8 +398,8 @@ extern def Fl_Toggle_Button_value(self: Fl_Toggle_ButtonPtr) -> int extern def Fl_Toggle_Button_set_value(self: Fl_Toggle_ButtonPtr, flag: int) extern def Fl_Toggle_Button_set_down_box(self: Fl_Toggle_ButtonPtr, a1: int) extern def Fl_Toggle_Button_down_box(self: Fl_Toggle_ButtonPtr) -> int -extern def Fl_Toggle_Button_set_compact(self: Fl_Toggle_ButtonPtr, v: t.CUInt8T) -extern def Fl_Toggle_Button_compact(self: Fl_Toggle_ButtonPtr) -> t.CUInt8T +extern def Fl_Toggle_Button_set_compact(self: Fl_Toggle_ButtonPtr, v: uint8) +extern def Fl_Toggle_Button_compact(self: Fl_Toggle_ButtonPtr) -> uint8 # ----- Fl_Round_Button (widget_declare) ----- extern def Fl_Round_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Round_ButtonPtr @@ -421,11 +421,11 @@ extern def Fl_Round_Button_tooltip(self: Fl_Round_ButtonPtr) -> str extern def Fl_Round_Button_set_tooltip(self: Fl_Round_ButtonPtr, txt: str) extern def Fl_Round_Button_get_type(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_set_type(self: Fl_Round_ButtonPtr, typ: int) -extern def Fl_Round_Button_color(self: Fl_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Round_Button_set_color(self: Fl_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Round_Button_color(self: Fl_Round_ButtonPtr) -> uint32 +extern def Fl_Round_Button_set_color(self: Fl_Round_ButtonPtr, color: uint32) extern def Fl_Round_Button_measure_label(self: Fl_Round_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Round_Button_label_color(self: Fl_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Round_Button_set_label_color(self: Fl_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Round_Button_label_color(self: Fl_Round_ButtonPtr) -> uint32 +extern def Fl_Round_Button_set_label_color(self: Fl_Round_ButtonPtr, color: uint32) extern def Fl_Round_Button_label_font(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_set_label_font(self: Fl_Round_ButtonPtr, font: int) extern def Fl_Round_Button_label_size(self: Fl_Round_ButtonPtr) -> int @@ -449,8 +449,8 @@ extern def Fl_Round_Button_set_when(self: Fl_Round_ButtonPtr, a1: int) extern def Fl_Round_Button_when(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_image(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_parent(self: Fl_Round_ButtonPtr) -> bytes -extern def Fl_Round_Button_selection_color(self: Fl_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Round_Button_set_selection_color(self: Fl_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Round_Button_selection_color(self: Fl_Round_ButtonPtr) -> uint32 +extern def Fl_Round_Button_set_selection_color(self: Fl_Round_ButtonPtr, color: uint32) extern def Fl_Round_Button_do_callback(self: Fl_Round_ButtonPtr) extern def Fl_Round_Button_inside(self: Fl_Round_ButtonPtr, a1: bytes) -> int extern def Fl_Round_Button_window(self: Fl_Round_ButtonPtr) -> bytes @@ -461,15 +461,15 @@ extern def Fl_Round_Button_take_focus(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_set_visible_focus(self: Fl_Round_ButtonPtr) extern def Fl_Round_Button_clear_visible_focus(self: Fl_Round_ButtonPtr) extern def Fl_Round_Button_visible_focus(self: Fl_Round_ButtonPtr, v: int) -extern def Fl_Round_Button_has_visible_focus(self: Fl_Round_ButtonPtr) -> t.CUInt32T +extern def Fl_Round_Button_has_visible_focus(self: Fl_Round_ButtonPtr) -> uint32 extern def Fl_Round_Button_set_user_data(self: Fl_Round_ButtonPtr, data: bytes) extern def Fl_Round_Button_draw_data(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_handle_data(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_set_draw_data(self: Fl_Round_ButtonPtr, data: bytes) extern def Fl_Round_Button_set_handle_data(self: Fl_Round_ButtonPtr, data: bytes) -extern def Fl_Round_Button_damage(self: Fl_Round_ButtonPtr) -> t.CUInt8T -extern def Fl_Round_Button_set_damage(self: Fl_Round_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Round_Button_set_damage_area(self: Fl_Round_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Round_Button_damage(self: Fl_Round_ButtonPtr) -> uint8 +extern def Fl_Round_Button_set_damage(self: Fl_Round_ButtonPtr, flag: uint8) +extern def Fl_Round_Button_set_damage_area(self: Fl_Round_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Round_Button_clear_damage(self: Fl_Round_ButtonPtr) extern def Fl_Round_Button_as_window(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_as_group(self: Fl_Round_ButtonPtr) -> bytes @@ -478,7 +478,7 @@ extern def Fl_Round_Button_deimage(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_set_callback(self: Fl_Round_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Round_Button_visible(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_visible_r(self: Fl_Round_ButtonPtr) -> int -extern def Fl_Round_Button_active(self: Fl_Round_ButtonPtr) -> t.CUInt32T +extern def Fl_Round_Button_active(self: Fl_Round_ButtonPtr) -> uint32 extern def Fl_Round_Button_active_r(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_callback(self: Fl_Round_ButtonPtr) -> bytes extern def Fl_Round_Button_set_deletion_callback(self: Fl_Round_ButtonPtr, cb1: bytes, data: bytes) @@ -496,8 +496,8 @@ extern def Fl_Round_Button_value(self: Fl_Round_ButtonPtr) -> int extern def Fl_Round_Button_set_value(self: Fl_Round_ButtonPtr, flag: int) extern def Fl_Round_Button_set_down_box(self: Fl_Round_ButtonPtr, a1: int) extern def Fl_Round_Button_down_box(self: Fl_Round_ButtonPtr) -> int -extern def Fl_Round_Button_set_compact(self: Fl_Round_ButtonPtr, v: t.CUInt8T) -extern def Fl_Round_Button_compact(self: Fl_Round_ButtonPtr) -> t.CUInt8T +extern def Fl_Round_Button_set_compact(self: Fl_Round_ButtonPtr, v: uint8) +extern def Fl_Round_Button_compact(self: Fl_Round_ButtonPtr) -> uint8 # ----- Fl_Radio_Round_Button (widget_declare) ----- extern def Fl_Radio_Round_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Radio_Round_ButtonPtr @@ -519,11 +519,11 @@ extern def Fl_Radio_Round_Button_tooltip(self: Fl_Radio_Round_ButtonPtr) -> str extern def Fl_Radio_Round_Button_set_tooltip(self: Fl_Radio_Round_ButtonPtr, txt: str) extern def Fl_Radio_Round_Button_get_type(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_set_type(self: Fl_Radio_Round_ButtonPtr, typ: int) -extern def Fl_Radio_Round_Button_color(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Round_Button_set_color(self: Fl_Radio_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Round_Button_color(self: Fl_Radio_Round_ButtonPtr) -> uint32 +extern def Fl_Radio_Round_Button_set_color(self: Fl_Radio_Round_ButtonPtr, color: uint32) extern def Fl_Radio_Round_Button_measure_label(self: Fl_Radio_Round_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Radio_Round_Button_label_color(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Round_Button_set_label_color(self: Fl_Radio_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Round_Button_label_color(self: Fl_Radio_Round_ButtonPtr) -> uint32 +extern def Fl_Radio_Round_Button_set_label_color(self: Fl_Radio_Round_ButtonPtr, color: uint32) extern def Fl_Radio_Round_Button_label_font(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_set_label_font(self: Fl_Radio_Round_ButtonPtr, font: int) extern def Fl_Radio_Round_Button_label_size(self: Fl_Radio_Round_ButtonPtr) -> int @@ -547,8 +547,8 @@ extern def Fl_Radio_Round_Button_set_when(self: Fl_Radio_Round_ButtonPtr, a1: in extern def Fl_Radio_Round_Button_when(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_image(self: Fl_Radio_Round_ButtonPtr) -> bytes extern def Fl_Radio_Round_Button_parent(self: Fl_Radio_Round_ButtonPtr) -> bytes -extern def Fl_Radio_Round_Button_selection_color(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Round_Button_set_selection_color(self: Fl_Radio_Round_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Round_Button_selection_color(self: Fl_Radio_Round_ButtonPtr) -> uint32 +extern def Fl_Radio_Round_Button_set_selection_color(self: Fl_Radio_Round_ButtonPtr, color: uint32) extern def Fl_Radio_Round_Button_do_callback(self: Fl_Radio_Round_ButtonPtr) extern def Fl_Radio_Round_Button_inside(self: Fl_Radio_Round_ButtonPtr, a1: bytes) -> int extern def Fl_Radio_Round_Button_window(self: Fl_Radio_Round_ButtonPtr) -> bytes @@ -559,15 +559,15 @@ extern def Fl_Radio_Round_Button_take_focus(self: Fl_Radio_Round_ButtonPtr) -> i extern def Fl_Radio_Round_Button_set_visible_focus(self: Fl_Radio_Round_ButtonPtr) extern def Fl_Radio_Round_Button_clear_visible_focus(self: Fl_Radio_Round_ButtonPtr) extern def Fl_Radio_Round_Button_visible_focus(self: Fl_Radio_Round_ButtonPtr, v: int) -extern def Fl_Radio_Round_Button_has_visible_focus(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Round_Button_has_visible_focus(self: Fl_Radio_Round_ButtonPtr) -> uint32 extern def Fl_Radio_Round_Button_set_user_data(self: Fl_Radio_Round_ButtonPtr, data: bytes) extern def Fl_Radio_Round_Button_draw_data(self: Fl_Radio_Round_ButtonPtr) -> bytes extern def Fl_Radio_Round_Button_handle_data(self: Fl_Radio_Round_ButtonPtr) -> bytes extern def Fl_Radio_Round_Button_set_draw_data(self: Fl_Radio_Round_ButtonPtr, data: bytes) extern def Fl_Radio_Round_Button_set_handle_data(self: Fl_Radio_Round_ButtonPtr, data: bytes) -extern def Fl_Radio_Round_Button_damage(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt8T -extern def Fl_Radio_Round_Button_set_damage(self: Fl_Radio_Round_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Radio_Round_Button_set_damage_area(self: Fl_Radio_Round_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Radio_Round_Button_damage(self: Fl_Radio_Round_ButtonPtr) -> uint8 +extern def Fl_Radio_Round_Button_set_damage(self: Fl_Radio_Round_ButtonPtr, flag: uint8) +extern def Fl_Radio_Round_Button_set_damage_area(self: Fl_Radio_Round_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Radio_Round_Button_clear_damage(self: Fl_Radio_Round_ButtonPtr) extern def Fl_Radio_Round_Button_as_window(self: Fl_Radio_Round_ButtonPtr) -> bytes extern def Fl_Radio_Round_Button_as_group(self: Fl_Radio_Round_ButtonPtr) -> bytes @@ -576,7 +576,7 @@ extern def Fl_Radio_Round_Button_deimage(self: Fl_Radio_Round_ButtonPtr) -> byte extern def Fl_Radio_Round_Button_set_callback(self: Fl_Radio_Round_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Radio_Round_Button_visible(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_visible_r(self: Fl_Radio_Round_ButtonPtr) -> int -extern def Fl_Radio_Round_Button_active(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Round_Button_active(self: Fl_Radio_Round_ButtonPtr) -> uint32 extern def Fl_Radio_Round_Button_active_r(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_callback(self: Fl_Radio_Round_ButtonPtr) -> bytes extern def Fl_Radio_Round_Button_set_deletion_callback(self: Fl_Radio_Round_ButtonPtr, cb1: bytes, data: bytes) @@ -594,8 +594,8 @@ extern def Fl_Radio_Round_Button_value(self: Fl_Radio_Round_ButtonPtr) -> int extern def Fl_Radio_Round_Button_set_value(self: Fl_Radio_Round_ButtonPtr, flag: int) extern def Fl_Radio_Round_Button_set_down_box(self: Fl_Radio_Round_ButtonPtr, a1: int) extern def Fl_Radio_Round_Button_down_box(self: Fl_Radio_Round_ButtonPtr) -> int -extern def Fl_Radio_Round_Button_set_compact(self: Fl_Radio_Round_ButtonPtr, v: t.CUInt8T) -extern def Fl_Radio_Round_Button_compact(self: Fl_Radio_Round_ButtonPtr) -> t.CUInt8T +extern def Fl_Radio_Round_Button_set_compact(self: Fl_Radio_Round_ButtonPtr, v: uint8) +extern def Fl_Radio_Round_Button_compact(self: Fl_Radio_Round_ButtonPtr) -> uint8 # ----- Fl_Radio_Light_Button (widget_declare) ----- extern def Fl_Radio_Light_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Radio_Light_ButtonPtr @@ -617,11 +617,11 @@ extern def Fl_Radio_Light_Button_tooltip(self: Fl_Radio_Light_ButtonPtr) -> str extern def Fl_Radio_Light_Button_set_tooltip(self: Fl_Radio_Light_ButtonPtr, txt: str) extern def Fl_Radio_Light_Button_get_type(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_set_type(self: Fl_Radio_Light_ButtonPtr, typ: int) -extern def Fl_Radio_Light_Button_color(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Light_Button_set_color(self: Fl_Radio_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Light_Button_color(self: Fl_Radio_Light_ButtonPtr) -> uint32 +extern def Fl_Radio_Light_Button_set_color(self: Fl_Radio_Light_ButtonPtr, color: uint32) extern def Fl_Radio_Light_Button_measure_label(self: Fl_Radio_Light_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Radio_Light_Button_label_color(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Light_Button_set_label_color(self: Fl_Radio_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Light_Button_label_color(self: Fl_Radio_Light_ButtonPtr) -> uint32 +extern def Fl_Radio_Light_Button_set_label_color(self: Fl_Radio_Light_ButtonPtr, color: uint32) extern def Fl_Radio_Light_Button_label_font(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_set_label_font(self: Fl_Radio_Light_ButtonPtr, font: int) extern def Fl_Radio_Light_Button_label_size(self: Fl_Radio_Light_ButtonPtr) -> int @@ -645,8 +645,8 @@ extern def Fl_Radio_Light_Button_set_when(self: Fl_Radio_Light_ButtonPtr, a1: in extern def Fl_Radio_Light_Button_when(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_image(self: Fl_Radio_Light_ButtonPtr) -> bytes extern def Fl_Radio_Light_Button_parent(self: Fl_Radio_Light_ButtonPtr) -> bytes -extern def Fl_Radio_Light_Button_selection_color(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Radio_Light_Button_set_selection_color(self: Fl_Radio_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Radio_Light_Button_selection_color(self: Fl_Radio_Light_ButtonPtr) -> uint32 +extern def Fl_Radio_Light_Button_set_selection_color(self: Fl_Radio_Light_ButtonPtr, color: uint32) extern def Fl_Radio_Light_Button_do_callback(self: Fl_Radio_Light_ButtonPtr) extern def Fl_Radio_Light_Button_inside(self: Fl_Radio_Light_ButtonPtr, a1: bytes) -> int extern def Fl_Radio_Light_Button_window(self: Fl_Radio_Light_ButtonPtr) -> bytes @@ -657,15 +657,15 @@ extern def Fl_Radio_Light_Button_take_focus(self: Fl_Radio_Light_ButtonPtr) -> i extern def Fl_Radio_Light_Button_set_visible_focus(self: Fl_Radio_Light_ButtonPtr) extern def Fl_Radio_Light_Button_clear_visible_focus(self: Fl_Radio_Light_ButtonPtr) extern def Fl_Radio_Light_Button_visible_focus(self: Fl_Radio_Light_ButtonPtr, v: int) -extern def Fl_Radio_Light_Button_has_visible_focus(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Light_Button_has_visible_focus(self: Fl_Radio_Light_ButtonPtr) -> uint32 extern def Fl_Radio_Light_Button_set_user_data(self: Fl_Radio_Light_ButtonPtr, data: bytes) extern def Fl_Radio_Light_Button_draw_data(self: Fl_Radio_Light_ButtonPtr) -> bytes extern def Fl_Radio_Light_Button_handle_data(self: Fl_Radio_Light_ButtonPtr) -> bytes extern def Fl_Radio_Light_Button_set_draw_data(self: Fl_Radio_Light_ButtonPtr, data: bytes) extern def Fl_Radio_Light_Button_set_handle_data(self: Fl_Radio_Light_ButtonPtr, data: bytes) -extern def Fl_Radio_Light_Button_damage(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt8T -extern def Fl_Radio_Light_Button_set_damage(self: Fl_Radio_Light_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Radio_Light_Button_set_damage_area(self: Fl_Radio_Light_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Radio_Light_Button_damage(self: Fl_Radio_Light_ButtonPtr) -> uint8 +extern def Fl_Radio_Light_Button_set_damage(self: Fl_Radio_Light_ButtonPtr, flag: uint8) +extern def Fl_Radio_Light_Button_set_damage_area(self: Fl_Radio_Light_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Radio_Light_Button_clear_damage(self: Fl_Radio_Light_ButtonPtr) extern def Fl_Radio_Light_Button_as_window(self: Fl_Radio_Light_ButtonPtr) -> bytes extern def Fl_Radio_Light_Button_as_group(self: Fl_Radio_Light_ButtonPtr) -> bytes @@ -674,7 +674,7 @@ extern def Fl_Radio_Light_Button_deimage(self: Fl_Radio_Light_ButtonPtr) -> byte extern def Fl_Radio_Light_Button_set_callback(self: Fl_Radio_Light_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Radio_Light_Button_visible(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_visible_r(self: Fl_Radio_Light_ButtonPtr) -> int -extern def Fl_Radio_Light_Button_active(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt32T +extern def Fl_Radio_Light_Button_active(self: Fl_Radio_Light_ButtonPtr) -> uint32 extern def Fl_Radio_Light_Button_active_r(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_callback(self: Fl_Radio_Light_ButtonPtr) -> bytes extern def Fl_Radio_Light_Button_set_deletion_callback(self: Fl_Radio_Light_ButtonPtr, cb1: bytes, data: bytes) @@ -692,8 +692,8 @@ extern def Fl_Radio_Light_Button_value(self: Fl_Radio_Light_ButtonPtr) -> int extern def Fl_Radio_Light_Button_set_value(self: Fl_Radio_Light_ButtonPtr, flag: int) extern def Fl_Radio_Light_Button_set_down_box(self: Fl_Radio_Light_ButtonPtr, a1: int) extern def Fl_Radio_Light_Button_down_box(self: Fl_Radio_Light_ButtonPtr) -> int -extern def Fl_Radio_Light_Button_set_compact(self: Fl_Radio_Light_ButtonPtr, v: t.CUInt8T) -extern def Fl_Radio_Light_Button_compact(self: Fl_Radio_Light_ButtonPtr) -> t.CUInt8T +extern def Fl_Radio_Light_Button_set_compact(self: Fl_Radio_Light_ButtonPtr, v: uint8) +extern def Fl_Radio_Light_Button_compact(self: Fl_Radio_Light_ButtonPtr) -> uint8 # ----- Fl_Light_Button (widget_declare) ----- extern def Fl_Light_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Light_ButtonPtr @@ -715,11 +715,11 @@ extern def Fl_Light_Button_tooltip(self: Fl_Light_ButtonPtr) -> str extern def Fl_Light_Button_set_tooltip(self: Fl_Light_ButtonPtr, txt: str) extern def Fl_Light_Button_get_type(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_set_type(self: Fl_Light_ButtonPtr, typ: int) -extern def Fl_Light_Button_color(self: Fl_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Light_Button_set_color(self: Fl_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Light_Button_color(self: Fl_Light_ButtonPtr) -> uint32 +extern def Fl_Light_Button_set_color(self: Fl_Light_ButtonPtr, color: uint32) extern def Fl_Light_Button_measure_label(self: Fl_Light_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Light_Button_label_color(self: Fl_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Light_Button_set_label_color(self: Fl_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Light_Button_label_color(self: Fl_Light_ButtonPtr) -> uint32 +extern def Fl_Light_Button_set_label_color(self: Fl_Light_ButtonPtr, color: uint32) extern def Fl_Light_Button_label_font(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_set_label_font(self: Fl_Light_ButtonPtr, font: int) extern def Fl_Light_Button_label_size(self: Fl_Light_ButtonPtr) -> int @@ -743,8 +743,8 @@ extern def Fl_Light_Button_set_when(self: Fl_Light_ButtonPtr, a1: int) extern def Fl_Light_Button_when(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_image(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_parent(self: Fl_Light_ButtonPtr) -> bytes -extern def Fl_Light_Button_selection_color(self: Fl_Light_ButtonPtr) -> t.CUInt32T -extern def Fl_Light_Button_set_selection_color(self: Fl_Light_ButtonPtr, color: t.CUInt32T) +extern def Fl_Light_Button_selection_color(self: Fl_Light_ButtonPtr) -> uint32 +extern def Fl_Light_Button_set_selection_color(self: Fl_Light_ButtonPtr, color: uint32) extern def Fl_Light_Button_do_callback(self: Fl_Light_ButtonPtr) extern def Fl_Light_Button_inside(self: Fl_Light_ButtonPtr, a1: bytes) -> int extern def Fl_Light_Button_window(self: Fl_Light_ButtonPtr) -> bytes @@ -755,15 +755,15 @@ extern def Fl_Light_Button_take_focus(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_set_visible_focus(self: Fl_Light_ButtonPtr) extern def Fl_Light_Button_clear_visible_focus(self: Fl_Light_ButtonPtr) extern def Fl_Light_Button_visible_focus(self: Fl_Light_ButtonPtr, v: int) -extern def Fl_Light_Button_has_visible_focus(self: Fl_Light_ButtonPtr) -> t.CUInt32T +extern def Fl_Light_Button_has_visible_focus(self: Fl_Light_ButtonPtr) -> uint32 extern def Fl_Light_Button_set_user_data(self: Fl_Light_ButtonPtr, data: bytes) extern def Fl_Light_Button_draw_data(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_handle_data(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_set_draw_data(self: Fl_Light_ButtonPtr, data: bytes) extern def Fl_Light_Button_set_handle_data(self: Fl_Light_ButtonPtr, data: bytes) -extern def Fl_Light_Button_damage(self: Fl_Light_ButtonPtr) -> t.CUInt8T -extern def Fl_Light_Button_set_damage(self: Fl_Light_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Light_Button_set_damage_area(self: Fl_Light_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Light_Button_damage(self: Fl_Light_ButtonPtr) -> uint8 +extern def Fl_Light_Button_set_damage(self: Fl_Light_ButtonPtr, flag: uint8) +extern def Fl_Light_Button_set_damage_area(self: Fl_Light_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Light_Button_clear_damage(self: Fl_Light_ButtonPtr) extern def Fl_Light_Button_as_window(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_as_group(self: Fl_Light_ButtonPtr) -> bytes @@ -772,7 +772,7 @@ extern def Fl_Light_Button_deimage(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_set_callback(self: Fl_Light_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Light_Button_visible(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_visible_r(self: Fl_Light_ButtonPtr) -> int -extern def Fl_Light_Button_active(self: Fl_Light_ButtonPtr) -> t.CUInt32T +extern def Fl_Light_Button_active(self: Fl_Light_ButtonPtr) -> uint32 extern def Fl_Light_Button_active_r(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_callback(self: Fl_Light_ButtonPtr) -> bytes extern def Fl_Light_Button_set_deletion_callback(self: Fl_Light_ButtonPtr, cb1: bytes, data: bytes) @@ -790,8 +790,8 @@ extern def Fl_Light_Button_value(self: Fl_Light_ButtonPtr) -> int extern def Fl_Light_Button_set_value(self: Fl_Light_ButtonPtr, flag: int) extern def Fl_Light_Button_set_down_box(self: Fl_Light_ButtonPtr, a1: int) extern def Fl_Light_Button_down_box(self: Fl_Light_ButtonPtr) -> int -extern def Fl_Light_Button_set_compact(self: Fl_Light_ButtonPtr, v: t.CUInt8T) -extern def Fl_Light_Button_compact(self: Fl_Light_ButtonPtr) -> t.CUInt8T +extern def Fl_Light_Button_set_compact(self: Fl_Light_ButtonPtr, v: uint8) +extern def Fl_Light_Button_compact(self: Fl_Light_ButtonPtr) -> uint8 # ----- Fl_Repeat_Button (widget_declare) ----- extern def Fl_Repeat_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Repeat_ButtonPtr @@ -813,11 +813,11 @@ extern def Fl_Repeat_Button_tooltip(self: Fl_Repeat_ButtonPtr) -> str extern def Fl_Repeat_Button_set_tooltip(self: Fl_Repeat_ButtonPtr, txt: str) extern def Fl_Repeat_Button_get_type(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_set_type(self: Fl_Repeat_ButtonPtr, typ: int) -extern def Fl_Repeat_Button_color(self: Fl_Repeat_ButtonPtr) -> t.CUInt32T -extern def Fl_Repeat_Button_set_color(self: Fl_Repeat_ButtonPtr, color: t.CUInt32T) +extern def Fl_Repeat_Button_color(self: Fl_Repeat_ButtonPtr) -> uint32 +extern def Fl_Repeat_Button_set_color(self: Fl_Repeat_ButtonPtr, color: uint32) extern def Fl_Repeat_Button_measure_label(self: Fl_Repeat_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Repeat_Button_label_color(self: Fl_Repeat_ButtonPtr) -> t.CUInt32T -extern def Fl_Repeat_Button_set_label_color(self: Fl_Repeat_ButtonPtr, color: t.CUInt32T) +extern def Fl_Repeat_Button_label_color(self: Fl_Repeat_ButtonPtr) -> uint32 +extern def Fl_Repeat_Button_set_label_color(self: Fl_Repeat_ButtonPtr, color: uint32) extern def Fl_Repeat_Button_label_font(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_set_label_font(self: Fl_Repeat_ButtonPtr, font: int) extern def Fl_Repeat_Button_label_size(self: Fl_Repeat_ButtonPtr) -> int @@ -841,8 +841,8 @@ extern def Fl_Repeat_Button_set_when(self: Fl_Repeat_ButtonPtr, a1: int) extern def Fl_Repeat_Button_when(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_image(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_parent(self: Fl_Repeat_ButtonPtr) -> bytes -extern def Fl_Repeat_Button_selection_color(self: Fl_Repeat_ButtonPtr) -> t.CUInt32T -extern def Fl_Repeat_Button_set_selection_color(self: Fl_Repeat_ButtonPtr, color: t.CUInt32T) +extern def Fl_Repeat_Button_selection_color(self: Fl_Repeat_ButtonPtr) -> uint32 +extern def Fl_Repeat_Button_set_selection_color(self: Fl_Repeat_ButtonPtr, color: uint32) extern def Fl_Repeat_Button_do_callback(self: Fl_Repeat_ButtonPtr) extern def Fl_Repeat_Button_inside(self: Fl_Repeat_ButtonPtr, a1: bytes) -> int extern def Fl_Repeat_Button_window(self: Fl_Repeat_ButtonPtr) -> bytes @@ -853,15 +853,15 @@ extern def Fl_Repeat_Button_take_focus(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_set_visible_focus(self: Fl_Repeat_ButtonPtr) extern def Fl_Repeat_Button_clear_visible_focus(self: Fl_Repeat_ButtonPtr) extern def Fl_Repeat_Button_visible_focus(self: Fl_Repeat_ButtonPtr, v: int) -extern def Fl_Repeat_Button_has_visible_focus(self: Fl_Repeat_ButtonPtr) -> t.CUInt32T +extern def Fl_Repeat_Button_has_visible_focus(self: Fl_Repeat_ButtonPtr) -> uint32 extern def Fl_Repeat_Button_set_user_data(self: Fl_Repeat_ButtonPtr, data: bytes) extern def Fl_Repeat_Button_draw_data(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_handle_data(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_set_draw_data(self: Fl_Repeat_ButtonPtr, data: bytes) extern def Fl_Repeat_Button_set_handle_data(self: Fl_Repeat_ButtonPtr, data: bytes) -extern def Fl_Repeat_Button_damage(self: Fl_Repeat_ButtonPtr) -> t.CUInt8T -extern def Fl_Repeat_Button_set_damage(self: Fl_Repeat_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Repeat_Button_set_damage_area(self: Fl_Repeat_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Repeat_Button_damage(self: Fl_Repeat_ButtonPtr) -> uint8 +extern def Fl_Repeat_Button_set_damage(self: Fl_Repeat_ButtonPtr, flag: uint8) +extern def Fl_Repeat_Button_set_damage_area(self: Fl_Repeat_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Repeat_Button_clear_damage(self: Fl_Repeat_ButtonPtr) extern def Fl_Repeat_Button_as_window(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_as_group(self: Fl_Repeat_ButtonPtr) -> bytes @@ -870,7 +870,7 @@ extern def Fl_Repeat_Button_deimage(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_set_callback(self: Fl_Repeat_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Repeat_Button_visible(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_visible_r(self: Fl_Repeat_ButtonPtr) -> int -extern def Fl_Repeat_Button_active(self: Fl_Repeat_ButtonPtr) -> t.CUInt32T +extern def Fl_Repeat_Button_active(self: Fl_Repeat_ButtonPtr) -> uint32 extern def Fl_Repeat_Button_active_r(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_callback(self: Fl_Repeat_ButtonPtr) -> bytes extern def Fl_Repeat_Button_set_deletion_callback(self: Fl_Repeat_ButtonPtr, cb1: bytes, data: bytes) @@ -888,8 +888,8 @@ extern def Fl_Repeat_Button_value(self: Fl_Repeat_ButtonPtr) -> int extern def Fl_Repeat_Button_set_value(self: Fl_Repeat_ButtonPtr, flag: int) extern def Fl_Repeat_Button_set_down_box(self: Fl_Repeat_ButtonPtr, a1: int) extern def Fl_Repeat_Button_down_box(self: Fl_Repeat_ButtonPtr) -> int -extern def Fl_Repeat_Button_set_compact(self: Fl_Repeat_ButtonPtr, v: t.CUInt8T) -extern def Fl_Repeat_Button_compact(self: Fl_Repeat_ButtonPtr) -> t.CUInt8T +extern def Fl_Repeat_Button_set_compact(self: Fl_Repeat_ButtonPtr, v: uint8) +extern def Fl_Repeat_Button_compact(self: Fl_Repeat_ButtonPtr) -> uint8 # ----- Fl_Return_Button (widget_declare) ----- extern def Fl_Return_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Return_ButtonPtr @@ -911,11 +911,11 @@ extern def Fl_Return_Button_tooltip(self: Fl_Return_ButtonPtr) -> str extern def Fl_Return_Button_set_tooltip(self: Fl_Return_ButtonPtr, txt: str) extern def Fl_Return_Button_get_type(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_set_type(self: Fl_Return_ButtonPtr, typ: int) -extern def Fl_Return_Button_color(self: Fl_Return_ButtonPtr) -> t.CUInt32T -extern def Fl_Return_Button_set_color(self: Fl_Return_ButtonPtr, color: t.CUInt32T) +extern def Fl_Return_Button_color(self: Fl_Return_ButtonPtr) -> uint32 +extern def Fl_Return_Button_set_color(self: Fl_Return_ButtonPtr, color: uint32) extern def Fl_Return_Button_measure_label(self: Fl_Return_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Return_Button_label_color(self: Fl_Return_ButtonPtr) -> t.CUInt32T -extern def Fl_Return_Button_set_label_color(self: Fl_Return_ButtonPtr, color: t.CUInt32T) +extern def Fl_Return_Button_label_color(self: Fl_Return_ButtonPtr) -> uint32 +extern def Fl_Return_Button_set_label_color(self: Fl_Return_ButtonPtr, color: uint32) extern def Fl_Return_Button_label_font(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_set_label_font(self: Fl_Return_ButtonPtr, font: int) extern def Fl_Return_Button_label_size(self: Fl_Return_ButtonPtr) -> int @@ -939,8 +939,8 @@ extern def Fl_Return_Button_set_when(self: Fl_Return_ButtonPtr, a1: int) extern def Fl_Return_Button_when(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_image(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_parent(self: Fl_Return_ButtonPtr) -> bytes -extern def Fl_Return_Button_selection_color(self: Fl_Return_ButtonPtr) -> t.CUInt32T -extern def Fl_Return_Button_set_selection_color(self: Fl_Return_ButtonPtr, color: t.CUInt32T) +extern def Fl_Return_Button_selection_color(self: Fl_Return_ButtonPtr) -> uint32 +extern def Fl_Return_Button_set_selection_color(self: Fl_Return_ButtonPtr, color: uint32) extern def Fl_Return_Button_do_callback(self: Fl_Return_ButtonPtr) extern def Fl_Return_Button_inside(self: Fl_Return_ButtonPtr, a1: bytes) -> int extern def Fl_Return_Button_window(self: Fl_Return_ButtonPtr) -> bytes @@ -951,15 +951,15 @@ extern def Fl_Return_Button_take_focus(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_set_visible_focus(self: Fl_Return_ButtonPtr) extern def Fl_Return_Button_clear_visible_focus(self: Fl_Return_ButtonPtr) extern def Fl_Return_Button_visible_focus(self: Fl_Return_ButtonPtr, v: int) -extern def Fl_Return_Button_has_visible_focus(self: Fl_Return_ButtonPtr) -> t.CUInt32T +extern def Fl_Return_Button_has_visible_focus(self: Fl_Return_ButtonPtr) -> uint32 extern def Fl_Return_Button_set_user_data(self: Fl_Return_ButtonPtr, data: bytes) extern def Fl_Return_Button_draw_data(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_handle_data(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_set_draw_data(self: Fl_Return_ButtonPtr, data: bytes) extern def Fl_Return_Button_set_handle_data(self: Fl_Return_ButtonPtr, data: bytes) -extern def Fl_Return_Button_damage(self: Fl_Return_ButtonPtr) -> t.CUInt8T -extern def Fl_Return_Button_set_damage(self: Fl_Return_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Return_Button_set_damage_area(self: Fl_Return_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Return_Button_damage(self: Fl_Return_ButtonPtr) -> uint8 +extern def Fl_Return_Button_set_damage(self: Fl_Return_ButtonPtr, flag: uint8) +extern def Fl_Return_Button_set_damage_area(self: Fl_Return_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Return_Button_clear_damage(self: Fl_Return_ButtonPtr) extern def Fl_Return_Button_as_window(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_as_group(self: Fl_Return_ButtonPtr) -> bytes @@ -968,7 +968,7 @@ extern def Fl_Return_Button_deimage(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_set_callback(self: Fl_Return_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Return_Button_visible(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_visible_r(self: Fl_Return_ButtonPtr) -> int -extern def Fl_Return_Button_active(self: Fl_Return_ButtonPtr) -> t.CUInt32T +extern def Fl_Return_Button_active(self: Fl_Return_ButtonPtr) -> uint32 extern def Fl_Return_Button_active_r(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_callback(self: Fl_Return_ButtonPtr) -> bytes extern def Fl_Return_Button_set_deletion_callback(self: Fl_Return_ButtonPtr, cb1: bytes, data: bytes) @@ -986,8 +986,8 @@ extern def Fl_Return_Button_value(self: Fl_Return_ButtonPtr) -> int extern def Fl_Return_Button_set_value(self: Fl_Return_ButtonPtr, flag: int) extern def Fl_Return_Button_set_down_box(self: Fl_Return_ButtonPtr, a1: int) extern def Fl_Return_Button_down_box(self: Fl_Return_ButtonPtr) -> int -extern def Fl_Return_Button_set_compact(self: Fl_Return_ButtonPtr, v: t.CUInt8T) -extern def Fl_Return_Button_compact(self: Fl_Return_ButtonPtr) -> t.CUInt8T +extern def Fl_Return_Button_set_compact(self: Fl_Return_ButtonPtr, v: uint8) +extern def Fl_Return_Button_compact(self: Fl_Return_ButtonPtr) -> uint8 # ----- Fl_Shortcut_Button (widget_declare) ----- extern def Fl_Shortcut_Button_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Shortcut_ButtonPtr @@ -1009,11 +1009,11 @@ extern def Fl_Shortcut_Button_tooltip(self: Fl_Shortcut_ButtonPtr) -> str extern def Fl_Shortcut_Button_set_tooltip(self: Fl_Shortcut_ButtonPtr, txt: str) extern def Fl_Shortcut_Button_get_type(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_set_type(self: Fl_Shortcut_ButtonPtr, typ: int) -extern def Fl_Shortcut_Button_color(self: Fl_Shortcut_ButtonPtr) -> t.CUInt32T -extern def Fl_Shortcut_Button_set_color(self: Fl_Shortcut_ButtonPtr, color: t.CUInt32T) +extern def Fl_Shortcut_Button_color(self: Fl_Shortcut_ButtonPtr) -> uint32 +extern def Fl_Shortcut_Button_set_color(self: Fl_Shortcut_ButtonPtr, color: uint32) extern def Fl_Shortcut_Button_measure_label(self: Fl_Shortcut_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Shortcut_Button_label_color(self: Fl_Shortcut_ButtonPtr) -> t.CUInt32T -extern def Fl_Shortcut_Button_set_label_color(self: Fl_Shortcut_ButtonPtr, color: t.CUInt32T) +extern def Fl_Shortcut_Button_label_color(self: Fl_Shortcut_ButtonPtr) -> uint32 +extern def Fl_Shortcut_Button_set_label_color(self: Fl_Shortcut_ButtonPtr, color: uint32) extern def Fl_Shortcut_Button_label_font(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_set_label_font(self: Fl_Shortcut_ButtonPtr, font: int) extern def Fl_Shortcut_Button_label_size(self: Fl_Shortcut_ButtonPtr) -> int @@ -1037,8 +1037,8 @@ extern def Fl_Shortcut_Button_set_when(self: Fl_Shortcut_ButtonPtr, a1: int) extern def Fl_Shortcut_Button_when(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_image(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_parent(self: Fl_Shortcut_ButtonPtr) -> bytes -extern def Fl_Shortcut_Button_selection_color(self: Fl_Shortcut_ButtonPtr) -> t.CUInt32T -extern def Fl_Shortcut_Button_set_selection_color(self: Fl_Shortcut_ButtonPtr, color: t.CUInt32T) +extern def Fl_Shortcut_Button_selection_color(self: Fl_Shortcut_ButtonPtr) -> uint32 +extern def Fl_Shortcut_Button_set_selection_color(self: Fl_Shortcut_ButtonPtr, color: uint32) extern def Fl_Shortcut_Button_do_callback(self: Fl_Shortcut_ButtonPtr) extern def Fl_Shortcut_Button_inside(self: Fl_Shortcut_ButtonPtr, a1: bytes) -> int extern def Fl_Shortcut_Button_window(self: Fl_Shortcut_ButtonPtr) -> bytes @@ -1049,15 +1049,15 @@ extern def Fl_Shortcut_Button_take_focus(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_set_visible_focus(self: Fl_Shortcut_ButtonPtr) extern def Fl_Shortcut_Button_clear_visible_focus(self: Fl_Shortcut_ButtonPtr) extern def Fl_Shortcut_Button_visible_focus(self: Fl_Shortcut_ButtonPtr, v: int) -extern def Fl_Shortcut_Button_has_visible_focus(self: Fl_Shortcut_ButtonPtr) -> t.CUInt32T +extern def Fl_Shortcut_Button_has_visible_focus(self: Fl_Shortcut_ButtonPtr) -> uint32 extern def Fl_Shortcut_Button_set_user_data(self: Fl_Shortcut_ButtonPtr, data: bytes) extern def Fl_Shortcut_Button_draw_data(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_handle_data(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_set_draw_data(self: Fl_Shortcut_ButtonPtr, data: bytes) extern def Fl_Shortcut_Button_set_handle_data(self: Fl_Shortcut_ButtonPtr, data: bytes) -extern def Fl_Shortcut_Button_damage(self: Fl_Shortcut_ButtonPtr) -> t.CUInt8T -extern def Fl_Shortcut_Button_set_damage(self: Fl_Shortcut_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Shortcut_Button_set_damage_area(self: Fl_Shortcut_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Shortcut_Button_damage(self: Fl_Shortcut_ButtonPtr) -> uint8 +extern def Fl_Shortcut_Button_set_damage(self: Fl_Shortcut_ButtonPtr, flag: uint8) +extern def Fl_Shortcut_Button_set_damage_area(self: Fl_Shortcut_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Shortcut_Button_clear_damage(self: Fl_Shortcut_ButtonPtr) extern def Fl_Shortcut_Button_as_window(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_as_group(self: Fl_Shortcut_ButtonPtr) -> bytes @@ -1066,7 +1066,7 @@ extern def Fl_Shortcut_Button_deimage(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_set_callback(self: Fl_Shortcut_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Shortcut_Button_visible(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_visible_r(self: Fl_Shortcut_ButtonPtr) -> int -extern def Fl_Shortcut_Button_active(self: Fl_Shortcut_ButtonPtr) -> t.CUInt32T +extern def Fl_Shortcut_Button_active(self: Fl_Shortcut_ButtonPtr) -> uint32 extern def Fl_Shortcut_Button_active_r(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_callback(self: Fl_Shortcut_ButtonPtr) -> bytes extern def Fl_Shortcut_Button_set_deletion_callback(self: Fl_Shortcut_ButtonPtr, cb1: bytes, data: bytes) @@ -1084,8 +1084,8 @@ extern def Fl_Shortcut_Button_value(self: Fl_Shortcut_ButtonPtr) -> int extern def Fl_Shortcut_Button_set_value(self: Fl_Shortcut_ButtonPtr, flag: int) extern def Fl_Shortcut_Button_set_down_box(self: Fl_Shortcut_ButtonPtr, a1: int) extern def Fl_Shortcut_Button_down_box(self: Fl_Shortcut_ButtonPtr) -> int -extern def Fl_Shortcut_Button_set_compact(self: Fl_Shortcut_ButtonPtr, v: t.CUInt8T) -extern def Fl_Shortcut_Button_compact(self: Fl_Shortcut_ButtonPtr) -> t.CUInt8T +extern def Fl_Shortcut_Button_set_compact(self: Fl_Shortcut_ButtonPtr, v: uint8) +extern def Fl_Shortcut_Button_compact(self: Fl_Shortcut_ButtonPtr) -> uint8 extern def Fl_Check_Button_is_checked(a0: Fl_Check_ButtonPtr) -> int extern def Fl_Check_Button_set_checked(self: Fl_Check_ButtonPtr, checked: int) diff --git a/fltk/_cfl_dialog.vp b/fltk/_cfl_dialog.vp index 80ee0c2..deb6c94 100644 --- a/fltk/_cfl_dialog.vp +++ b/fltk/_cfl_dialog.vp @@ -55,8 +55,8 @@ extern def Fl_File_Chooser_newButton(self: Fl_File_ChooserPtr) -> bytes extern def Fl_File_Chooser_previewButton(self: Fl_File_ChooserPtr) -> bytes extern def Fl_File_Chooser_showHiddenButton(self: Fl_File_ChooserPtr) -> bytes extern def Fl_File_Chooser_set_callback(self: Fl_File_ChooserPtr, cb1: bytes, d: bytes) -extern def Fl_File_Chooser_set_color(self: Fl_File_ChooserPtr, c: t.CUInt32T) -extern def Fl_File_Chooser_color(self: Fl_File_ChooserPtr) -> t.CUInt32T +extern def Fl_File_Chooser_set_color(self: Fl_File_ChooserPtr, c: uint32) +extern def Fl_File_Chooser_color(self: Fl_File_ChooserPtr) -> uint32 extern def Fl_File_Chooser_count(self: Fl_File_ChooserPtr) -> int extern def Fl_File_Chooser_set_directory(self: Fl_File_ChooserPtr, d: str) extern def Fl_File_Chooser_directory(self: Fl_File_ChooserPtr) -> str @@ -65,8 +65,8 @@ extern def Fl_File_Chooser_filter(self: Fl_File_ChooserPtr) -> str extern def Fl_File_Chooser_filter_value(self: Fl_File_ChooserPtr) -> int extern def Fl_File_Chooser_set_filter_value(self: Fl_File_ChooserPtr, f: int) extern def Fl_File_Chooser_hide(self: Fl_File_ChooserPtr) -extern def Fl_File_Chooser_set_iconsize(self: Fl_File_ChooserPtr, s: t.CUInt8T) -extern def Fl_File_Chooser_iconsize(self: Fl_File_ChooserPtr) -> t.CUInt8T +extern def Fl_File_Chooser_set_iconsize(self: Fl_File_ChooserPtr, s: uint8) +extern def Fl_File_Chooser_iconsize(self: Fl_File_ChooserPtr) -> uint8 extern def Fl_File_Chooser_set_label(self: Fl_File_ChooserPtr, l: str) extern def Fl_File_Chooser_label(self: Fl_File_ChooserPtr) -> str extern def Fl_File_Chooser_set_ok_label(self: Fl_File_ChooserPtr, l: str) @@ -77,8 +77,8 @@ extern def Fl_File_Chooser_rescan(self: Fl_File_ChooserPtr) extern def Fl_File_Chooser_rescan_keep_filename(self: Fl_File_ChooserPtr) extern def Fl_File_Chooser_show(self: Fl_File_ChooserPtr) extern def Fl_File_Chooser_shown(self: Fl_File_ChooserPtr) -> int -extern def Fl_File_Chooser_set_text_color(self: Fl_File_ChooserPtr, c: t.CUInt32T) -extern def Fl_File_Chooser_text_color(self: Fl_File_ChooserPtr) -> t.CUInt32T +extern def Fl_File_Chooser_set_text_color(self: Fl_File_ChooserPtr, c: uint32) +extern def Fl_File_Chooser_text_color(self: Fl_File_ChooserPtr) -> uint32 extern def Fl_File_Chooser_set_text_font(self: Fl_File_ChooserPtr, f: int) extern def Fl_File_Chooser_text_font(self: Fl_File_ChooserPtr) -> int extern def Fl_File_Chooser_set_text_size(self: Fl_File_ChooserPtr, s: int) diff --git a/fltk/_cfl_draw.vp b/fltk/_cfl_draw.vp index 9b8f8ce..9a3bab6 100644 --- a/fltk/_cfl_draw.vp +++ b/fltk/_cfl_draw.vp @@ -9,9 +9,9 @@ from fltk._types import * # 类型约定: Fl_* 对象均为不透明指针 (Fl_XxxPtr)；const char* → str； # 函数指针/void* → bytes（Viper 端传 0/NULL 或不使用）。 -extern def Fl_set_color_int(c: t.CUInt32T) -extern def Fl_set_color_rgb(r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) -extern def Fl_get_color() -> t.CUInt32T +extern def Fl_set_color_int(c: uint32) +extern def Fl_set_color_rgb(r: uint8, g: uint8, b: uint8) +extern def Fl_get_color() -> uint32 extern def Fl_push_clip(x: int, y: int, w: int, h: int) extern def Fl_push_no_clip() extern def Fl_pop_clip() @@ -24,10 +24,10 @@ extern def Fl_point(x: int, y: int) extern def Fl_line_style(style: int, width: int, dashes: str) extern def Fl_rect(x: int, y: int, w: int, h: int) extern def Fl_focus_rect(x: int, y: int, w: int, h: int) -extern def Fl_rect_with_color(x: int, y: int, w: int, h: int, c: t.CUInt32T) +extern def Fl_rect_with_color(x: int, y: int, w: int, h: int, c: uint32) extern def Fl_rectf(x: int, y: int, w: int, h: int) -extern def Fl_rectf_with_color(x: int, y: int, w: int, h: int, c: t.CUInt32T) -extern def Fl_rectf_with_rgb(x: int, y: int, w: int, h: int, r: t.CUInt8T, g: t.CUInt8T, b: t.CUInt8T) +extern def Fl_rectf_with_color(x: int, y: int, w: int, h: int, c: uint32) +extern def Fl_rectf_with_rgb(x: int, y: int, w: int, h: int, r: uint8, g: uint8, b: uint8) extern def Fl_line(x: int, y: int, x1: int, y1: int) extern def Fl_polyline(x: int, y: int, x1: int, y1: int, x2: int, y2: int) extern def Fl_loop(x: int, y: int, x1: int, y1: int, x2: int, y2: int) @@ -40,24 +40,24 @@ extern def Fl_xyline3(x: int, y: int, x1: int, y2: int, x3: int) extern def Fl_yxline(x: int, y: int, y1: int) extern def Fl_yxline2(x: int, y: int, y1: int, x2: int) extern def Fl_yxline3(x: int, y: int, y1: int, x2: int, y3: int) -extern def Fl_arc(x: int, y: int, w: int, h: int, a1: t.CDouble, a2: t.CDouble) -extern def Fl_pie(x: int, y: int, w: int, h: int, a1: t.CDouble, a2: t.CDouble) +extern def Fl_arc(x: int, y: int, w: int, h: int, a1: double, a2: double) +extern def Fl_pie(x: int, y: int, w: int, h: int, a1: double, a2: double) extern def Fl_push_matrix() extern def Fl_pop_matrix() -extern def Fl_scale_xy(x: t.CDouble, y: t.CDouble) -extern def Fl_scale(x: t.CDouble) -extern def Fl_translate(x: t.CDouble, y: t.CDouble) -extern def Fl_rotate(d: t.CDouble) -extern def Fl_mult_matrix(a: t.CDouble, b: t.CDouble, c: t.CDouble, d: t.CDouble, x: t.CDouble, y: t.CDouble) +extern def Fl_scale_xy(x: double, y: double) +extern def Fl_scale(x: double) +extern def Fl_translate(x: double, y: double) +extern def Fl_rotate(d: double) +extern def Fl_mult_matrix(a: double, b: double, c: double, d: double, x: double, y: double) extern def Fl_begin_points() extern def Fl_begin_line() extern def Fl_begin_loop() extern def Fl_begin_polygon() -extern def Fl_vertex(x: t.CDouble, y: t.CDouble) -extern def Fl_curve(X0: t.CDouble, Y0: t.CDouble, X1: t.CDouble, Y1: t.CDouble, X2: t.CDouble, Y2: t.CDouble, X3: t.CDouble, Y3: t.CDouble) -extern def Fl_arc_with_radius(x: t.CDouble, y: t.CDouble, r: t.CDouble, start: t.CDouble, end: t.CDouble) -extern def Fl_circle(x: t.CDouble, y: t.CDouble, r: t.CDouble) -extern def Fl_draw_circle(x: int, y: int, d: int, c: t.CUInt32T) +extern def Fl_vertex(x: double, y: double) +extern def Fl_curve(X0: double, Y0: double, X1: double, Y1: double, X2: double, Y2: double, X3: double, Y3: double) +extern def Fl_arc_with_radius(x: double, y: double, r: double, start: double, end: double) +extern def Fl_circle(x: double, y: double, r: double) +extern def Fl_draw_circle(x: int, y: int, d: int, c: uint32) extern def Fl_end_points() extern def Fl_end_line() extern def Fl_end_loop() @@ -65,11 +65,11 @@ extern def Fl_end_polygon() extern def Fl_begin_complex_polygon() extern def Fl_gap() extern def Fl_end_complex_polygon() -extern def Fl_transform_x(x: t.CDouble, y: t.CDouble) -> t.CDouble -extern def Fl_transform_y(x: t.CDouble, y: t.CDouble) -> t.CDouble -extern def Fl_transform_dx(x: t.CDouble, y: t.CDouble) -> t.CDouble -extern def Fl_transform_dy(x: t.CDouble, y: t.CDouble) -> t.CDouble -extern def Fl_transformed_vertex(xf: t.CDouble, yf: t.CDouble) +extern def Fl_transform_x(x: double, y: double) -> double +extern def Fl_transform_y(x: double, y: double) -> double +extern def Fl_transform_dx(x: double, y: double) -> double +extern def Fl_transform_dy(x: double, y: double) -> double +extern def Fl_transformed_vertex(xf: double, yf: double) extern def Fl_end_offscreen() extern def Fl_set_draw_font(face: int, fsize: int) extern def Fl_font() -> int @@ -77,8 +77,8 @@ extern def Fl_size() -> int extern def Fl_height() -> int extern def Fl_set_height(font: int, size: int) -> int extern def Fl_descent() -> int -extern def Fl_width(txt: str, n: int) -> t.CDouble -extern def Fl_char_width(c: t.CUInt32T) -> t.CDouble +extern def Fl_width(txt: str, n: int) -> double +extern def Fl_char_width(c: uint32) -> double extern def Fl_text_extents(a0: str, dx: bytes, dy: bytes, w: bytes, h: bytes) extern def Fl_text_extents_n(t: str, n: int, dx: bytes, dy: bytes, w: bytes, h: bytes) extern def Fl_latin1_to_local(t: str, n: int) -> str @@ -94,7 +94,7 @@ extern def Fl_measure(str_: str, x: bytes, y: bytes, draw_symbols: int) extern def Fl_draw5(str_: str, x: int, y: int, w: int, h: int, align: int, img: bytes, draw_symbols: int) extern def Fl_frame(s: str, x: int, y: int, w: int, h: int) extern def Fl_frame2(s: str, x: int, y: int, w: int, h: int) -extern def Fl_draw_box(box_type: int, x: int, y: int, w: int, h: int, a5: t.CUInt32T) +extern def Fl_draw_box(box_type: int, x: int, y: int, w: int, h: int, a5: uint32) extern def Fl_draw_image(buf: bytes, X: int, Y: int, W: int, H: int, D: int, L: int) extern def Fl_draw_image_mono(buf: bytes, X: int, Y: int, W: int, H: int, D: int, L: int) extern def Fl_can_do_alpha_blending() -> char @@ -104,18 +104,18 @@ extern def Fl_draw_pixmap(data: bytes, x: int, y: int, bg: int) -> int extern def Fl_draw_pixmap2(data: bytes, x: int, y: int, bg: int) -> int extern def Fl_measure_pixmap(data: bytes, w: bytes, h: bytes) -> int extern def Fl_measure_pixmap2(cdata: bytes, w: bytes, h: bytes) -> int -extern def Fl_shortcut_label(shortcut: t.CUInt32T) -> str -extern def Fl_shortcut_label2(shortcut: t.CUInt32T, eom: bytes) -> str -extern def Fl_old_shortcut(s: str) -> t.CUInt32T +extern def Fl_shortcut_label(shortcut: uint32) -> str +extern def Fl_shortcut_label2(shortcut: uint32, eom: bytes) -> str +extern def Fl_old_shortcut(s: str) -> uint32 extern def Fl_overlay_rect(x: int, y: int, w: int, h: int) extern def Fl_overlay_clear() extern def Fl_set_cursor(cursor: int) extern def Fl_set_cursor_with_color(cursor: int, fg: int, bg: int) -extern def Fl_expand_text(from_: str, buf: str, maxbuf: int, maxw: t.CDouble, n: bytes, width: bytes, wrap: int, draw_symbols: int) -> str +extern def Fl_expand_text(from_: str, buf: str, maxbuf: int, maxw: double, n: bytes, width: bytes, wrap: int, draw_symbols: int) -> str extern def Fl_set_status(X: int, Y: int, W: int, H: int) extern def Fl_set_spot(font: int, size: int, X: int, Y: int, W: int, H: int, win: bytes) extern def Fl_reset_spot() -extern def Fl_show_colormap(old_col: t.CUInt32T) -> t.CUInt32T +extern def Fl_show_colormap(old_col: uint32) -> uint32 extern def Fl_copy_offscreen(x: int, y: int, w: int, h: int, pixmap: bytes, srcx: int, srcy: int) extern def Fl_create_offscreen(w: int, h: int) -> bytes extern def Fl_begin_offscreen(b: bytes) @@ -123,9 +123,9 @@ extern def Fl_end_offscreen() extern def Fl_delete_offscreen(bitmap: bytes) extern def Fl_rescale_offscreen(ctx: bytes) extern def Fl_draw_text_boxed(str_: str, x: int, y: int, w: int, h: int, align: int) -extern def Fl_draw_check(x: int, y: int, w: int, h: int, col: t.CUInt32T) +extern def Fl_draw_check(x: int, y: int, w: int, h: int, col: uint32) extern def Fl_add_symbol(name: str, cb1: bytes, scalable: int) -> int extern def Fl_rounded_rect(x: int, y: int, w: int, h: int, r: int) extern def Fl_rounded_rectf(x: int, y: int, w: int, h: int, r: int) -extern def Fl_override_scale() -> t.CFloat -extern def Fl_restore_scale(s: t.CFloat) +extern def Fl_override_scale() -> float +extern def Fl_restore_scale(s: float) diff --git a/fltk/_cfl_group.vp b/fltk/_cfl_group.vp index d73b45c..66d308c 100644 --- a/fltk/_cfl_group.vp +++ b/fltk/_cfl_group.vp @@ -29,11 +29,11 @@ extern def Fl_Group_tooltip(self: Fl_GroupPtr) -> str extern def Fl_Group_set_tooltip(self: Fl_GroupPtr, txt: str) extern def Fl_Group_get_type(self: Fl_GroupPtr) -> int extern def Fl_Group_set_type(self: Fl_GroupPtr, typ: int) -extern def Fl_Group_color(self: Fl_GroupPtr) -> t.CUInt32T -extern def Fl_Group_set_color(self: Fl_GroupPtr, color: t.CUInt32T) +extern def Fl_Group_color(self: Fl_GroupPtr) -> uint32 +extern def Fl_Group_set_color(self: Fl_GroupPtr, color: uint32) extern def Fl_Group_measure_label(self: Fl_GroupPtr, a1: bytes, a2: bytes) -extern def Fl_Group_label_color(self: Fl_GroupPtr) -> t.CUInt32T -extern def Fl_Group_set_label_color(self: Fl_GroupPtr, color: t.CUInt32T) +extern def Fl_Group_label_color(self: Fl_GroupPtr) -> uint32 +extern def Fl_Group_set_label_color(self: Fl_GroupPtr, color: uint32) extern def Fl_Group_label_font(self: Fl_GroupPtr) -> int extern def Fl_Group_set_label_font(self: Fl_GroupPtr, font: int) extern def Fl_Group_label_size(self: Fl_GroupPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Group_set_when(self: Fl_GroupPtr, a1: int) extern def Fl_Group_when(self: Fl_GroupPtr) -> int extern def Fl_Group_image(self: Fl_GroupPtr) -> bytes extern def Fl_Group_parent(self: Fl_GroupPtr) -> bytes -extern def Fl_Group_selection_color(self: Fl_GroupPtr) -> t.CUInt32T -extern def Fl_Group_set_selection_color(self: Fl_GroupPtr, color: t.CUInt32T) +extern def Fl_Group_selection_color(self: Fl_GroupPtr) -> uint32 +extern def Fl_Group_set_selection_color(self: Fl_GroupPtr, color: uint32) extern def Fl_Group_do_callback(self: Fl_GroupPtr) extern def Fl_Group_inside(self: Fl_GroupPtr, a1: bytes) -> int extern def Fl_Group_window(self: Fl_GroupPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Group_take_focus(self: Fl_GroupPtr) -> int extern def Fl_Group_set_visible_focus(self: Fl_GroupPtr) extern def Fl_Group_clear_visible_focus(self: Fl_GroupPtr) extern def Fl_Group_visible_focus(self: Fl_GroupPtr, v: int) -extern def Fl_Group_has_visible_focus(self: Fl_GroupPtr) -> t.CUInt32T +extern def Fl_Group_has_visible_focus(self: Fl_GroupPtr) -> uint32 extern def Fl_Group_set_user_data(self: Fl_GroupPtr, data: bytes) extern def Fl_Group_draw_data(self: Fl_GroupPtr) -> bytes extern def Fl_Group_handle_data(self: Fl_GroupPtr) -> bytes extern def Fl_Group_set_draw_data(self: Fl_GroupPtr, data: bytes) extern def Fl_Group_set_handle_data(self: Fl_GroupPtr, data: bytes) -extern def Fl_Group_damage(self: Fl_GroupPtr) -> t.CUInt8T -extern def Fl_Group_set_damage(self: Fl_GroupPtr, flag: t.CUInt8T) -extern def Fl_Group_set_damage_area(self: Fl_GroupPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Group_damage(self: Fl_GroupPtr) -> uint8 +extern def Fl_Group_set_damage(self: Fl_GroupPtr, flag: uint8) +extern def Fl_Group_set_damage_area(self: Fl_GroupPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Group_clear_damage(self: Fl_GroupPtr) extern def Fl_Group_as_window(self: Fl_GroupPtr) -> bytes extern def Fl_Group_as_group(self: Fl_GroupPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Group_deimage(self: Fl_GroupPtr) -> bytes extern def Fl_Group_set_callback(self: Fl_GroupPtr, a1: bytes, a2: bytes) extern def Fl_Group_visible(self: Fl_GroupPtr) -> int extern def Fl_Group_visible_r(self: Fl_GroupPtr) -> int -extern def Fl_Group_active(self: Fl_GroupPtr) -> t.CUInt32T +extern def Fl_Group_active(self: Fl_GroupPtr) -> uint32 extern def Fl_Group_active_r(self: Fl_GroupPtr) -> int extern def Fl_Group_callback(self: Fl_GroupPtr) -> bytes extern def Fl_Group_set_deletion_callback(self: Fl_GroupPtr, cb1: bytes, data: bytes) @@ -136,11 +136,11 @@ extern def Fl_Overlay_Group_tooltip(self: Fl_Overlay_GroupPtr) -> str extern def Fl_Overlay_Group_set_tooltip(self: Fl_Overlay_GroupPtr, txt: str) extern def Fl_Overlay_Group_get_type(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_set_type(self: Fl_Overlay_GroupPtr, typ: int) -extern def Fl_Overlay_Group_color(self: Fl_Overlay_GroupPtr) -> t.CUInt32T -extern def Fl_Overlay_Group_set_color(self: Fl_Overlay_GroupPtr, color: t.CUInt32T) +extern def Fl_Overlay_Group_color(self: Fl_Overlay_GroupPtr) -> uint32 +extern def Fl_Overlay_Group_set_color(self: Fl_Overlay_GroupPtr, color: uint32) extern def Fl_Overlay_Group_measure_label(self: Fl_Overlay_GroupPtr, a1: bytes, a2: bytes) -extern def Fl_Overlay_Group_label_color(self: Fl_Overlay_GroupPtr) -> t.CUInt32T -extern def Fl_Overlay_Group_set_label_color(self: Fl_Overlay_GroupPtr, color: t.CUInt32T) +extern def Fl_Overlay_Group_label_color(self: Fl_Overlay_GroupPtr) -> uint32 +extern def Fl_Overlay_Group_set_label_color(self: Fl_Overlay_GroupPtr, color: uint32) extern def Fl_Overlay_Group_label_font(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_set_label_font(self: Fl_Overlay_GroupPtr, font: int) extern def Fl_Overlay_Group_label_size(self: Fl_Overlay_GroupPtr) -> int @@ -164,8 +164,8 @@ extern def Fl_Overlay_Group_set_when(self: Fl_Overlay_GroupPtr, a1: int) extern def Fl_Overlay_Group_when(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_image(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_parent(self: Fl_Overlay_GroupPtr) -> bytes -extern def Fl_Overlay_Group_selection_color(self: Fl_Overlay_GroupPtr) -> t.CUInt32T -extern def Fl_Overlay_Group_set_selection_color(self: Fl_Overlay_GroupPtr, color: t.CUInt32T) +extern def Fl_Overlay_Group_selection_color(self: Fl_Overlay_GroupPtr) -> uint32 +extern def Fl_Overlay_Group_set_selection_color(self: Fl_Overlay_GroupPtr, color: uint32) extern def Fl_Overlay_Group_do_callback(self: Fl_Overlay_GroupPtr) extern def Fl_Overlay_Group_inside(self: Fl_Overlay_GroupPtr, a1: bytes) -> int extern def Fl_Overlay_Group_window(self: Fl_Overlay_GroupPtr) -> bytes @@ -176,15 +176,15 @@ extern def Fl_Overlay_Group_take_focus(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_set_visible_focus(self: Fl_Overlay_GroupPtr) extern def Fl_Overlay_Group_clear_visible_focus(self: Fl_Overlay_GroupPtr) extern def Fl_Overlay_Group_visible_focus(self: Fl_Overlay_GroupPtr, v: int) -extern def Fl_Overlay_Group_has_visible_focus(self: Fl_Overlay_GroupPtr) -> t.CUInt32T +extern def Fl_Overlay_Group_has_visible_focus(self: Fl_Overlay_GroupPtr) -> uint32 extern def Fl_Overlay_Group_set_user_data(self: Fl_Overlay_GroupPtr, data: bytes) extern def Fl_Overlay_Group_draw_data(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_handle_data(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_set_draw_data(self: Fl_Overlay_GroupPtr, data: bytes) extern def Fl_Overlay_Group_set_handle_data(self: Fl_Overlay_GroupPtr, data: bytes) -extern def Fl_Overlay_Group_damage(self: Fl_Overlay_GroupPtr) -> t.CUInt8T -extern def Fl_Overlay_Group_set_damage(self: Fl_Overlay_GroupPtr, flag: t.CUInt8T) -extern def Fl_Overlay_Group_set_damage_area(self: Fl_Overlay_GroupPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Overlay_Group_damage(self: Fl_Overlay_GroupPtr) -> uint8 +extern def Fl_Overlay_Group_set_damage(self: Fl_Overlay_GroupPtr, flag: uint8) +extern def Fl_Overlay_Group_set_damage_area(self: Fl_Overlay_GroupPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Overlay_Group_clear_damage(self: Fl_Overlay_GroupPtr) extern def Fl_Overlay_Group_as_window(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_as_group(self: Fl_Overlay_GroupPtr) -> bytes @@ -193,7 +193,7 @@ extern def Fl_Overlay_Group_deimage(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_set_callback(self: Fl_Overlay_GroupPtr, a1: bytes, a2: bytes) extern def Fl_Overlay_Group_visible(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_visible_r(self: Fl_Overlay_GroupPtr) -> int -extern def Fl_Overlay_Group_active(self: Fl_Overlay_GroupPtr) -> t.CUInt32T +extern def Fl_Overlay_Group_active(self: Fl_Overlay_GroupPtr) -> uint32 extern def Fl_Overlay_Group_active_r(self: Fl_Overlay_GroupPtr) -> int extern def Fl_Overlay_Group_callback(self: Fl_Overlay_GroupPtr) -> bytes extern def Fl_Overlay_Group_set_deletion_callback(self: Fl_Overlay_GroupPtr, cb1: bytes, data: bytes) @@ -243,11 +243,11 @@ extern def Fl_Pack_tooltip(self: Fl_PackPtr) -> str extern def Fl_Pack_set_tooltip(self: Fl_PackPtr, txt: str) extern def Fl_Pack_get_type(self: Fl_PackPtr) -> int extern def Fl_Pack_set_type(self: Fl_PackPtr, typ: int) -extern def Fl_Pack_color(self: Fl_PackPtr) -> t.CUInt32T -extern def Fl_Pack_set_color(self: Fl_PackPtr, color: t.CUInt32T) +extern def Fl_Pack_color(self: Fl_PackPtr) -> uint32 +extern def Fl_Pack_set_color(self: Fl_PackPtr, color: uint32) extern def Fl_Pack_measure_label(self: Fl_PackPtr, a1: bytes, a2: bytes) -extern def Fl_Pack_label_color(self: Fl_PackPtr) -> t.CUInt32T -extern def Fl_Pack_set_label_color(self: Fl_PackPtr, color: t.CUInt32T) +extern def Fl_Pack_label_color(self: Fl_PackPtr) -> uint32 +extern def Fl_Pack_set_label_color(self: Fl_PackPtr, color: uint32) extern def Fl_Pack_label_font(self: Fl_PackPtr) -> int extern def Fl_Pack_set_label_font(self: Fl_PackPtr, font: int) extern def Fl_Pack_label_size(self: Fl_PackPtr) -> int @@ -271,8 +271,8 @@ extern def Fl_Pack_set_when(self: Fl_PackPtr, a1: int) extern def Fl_Pack_when(self: Fl_PackPtr) -> int extern def Fl_Pack_image(self: Fl_PackPtr) -> bytes extern def Fl_Pack_parent(self: Fl_PackPtr) -> bytes -extern def Fl_Pack_selection_color(self: Fl_PackPtr) -> t.CUInt32T -extern def Fl_Pack_set_selection_color(self: Fl_PackPtr, color: t.CUInt32T) +extern def Fl_Pack_selection_color(self: Fl_PackPtr) -> uint32 +extern def Fl_Pack_set_selection_color(self: Fl_PackPtr, color: uint32) extern def Fl_Pack_do_callback(self: Fl_PackPtr) extern def Fl_Pack_inside(self: Fl_PackPtr, a1: bytes) -> int extern def Fl_Pack_window(self: Fl_PackPtr) -> bytes @@ -283,15 +283,15 @@ extern def Fl_Pack_take_focus(self: Fl_PackPtr) -> int extern def Fl_Pack_set_visible_focus(self: Fl_PackPtr) extern def Fl_Pack_clear_visible_focus(self: Fl_PackPtr) extern def Fl_Pack_visible_focus(self: Fl_PackPtr, v: int) -extern def Fl_Pack_has_visible_focus(self: Fl_PackPtr) -> t.CUInt32T +extern def Fl_Pack_has_visible_focus(self: Fl_PackPtr) -> uint32 extern def Fl_Pack_set_user_data(self: Fl_PackPtr, data: bytes) extern def Fl_Pack_draw_data(self: Fl_PackPtr) -> bytes extern def Fl_Pack_handle_data(self: Fl_PackPtr) -> bytes extern def Fl_Pack_set_draw_data(self: Fl_PackPtr, data: bytes) extern def Fl_Pack_set_handle_data(self: Fl_PackPtr, data: bytes) -extern def Fl_Pack_damage(self: Fl_PackPtr) -> t.CUInt8T -extern def Fl_Pack_set_damage(self: Fl_PackPtr, flag: t.CUInt8T) -extern def Fl_Pack_set_damage_area(self: Fl_PackPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Pack_damage(self: Fl_PackPtr) -> uint8 +extern def Fl_Pack_set_damage(self: Fl_PackPtr, flag: uint8) +extern def Fl_Pack_set_damage_area(self: Fl_PackPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Pack_clear_damage(self: Fl_PackPtr) extern def Fl_Pack_as_window(self: Fl_PackPtr) -> bytes extern def Fl_Pack_as_group(self: Fl_PackPtr) -> bytes @@ -300,7 +300,7 @@ extern def Fl_Pack_deimage(self: Fl_PackPtr) -> bytes extern def Fl_Pack_set_callback(self: Fl_PackPtr, a1: bytes, a2: bytes) extern def Fl_Pack_visible(self: Fl_PackPtr) -> int extern def Fl_Pack_visible_r(self: Fl_PackPtr) -> int -extern def Fl_Pack_active(self: Fl_PackPtr) -> t.CUInt32T +extern def Fl_Pack_active(self: Fl_PackPtr) -> uint32 extern def Fl_Pack_active_r(self: Fl_PackPtr) -> int extern def Fl_Pack_callback(self: Fl_PackPtr) -> bytes extern def Fl_Pack_set_deletion_callback(self: Fl_PackPtr, cb1: bytes, data: bytes) @@ -350,11 +350,11 @@ extern def Fl_Scroll_tooltip(self: Fl_ScrollPtr) -> str extern def Fl_Scroll_set_tooltip(self: Fl_ScrollPtr, txt: str) extern def Fl_Scroll_get_type(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_set_type(self: Fl_ScrollPtr, typ: int) -extern def Fl_Scroll_color(self: Fl_ScrollPtr) -> t.CUInt32T -extern def Fl_Scroll_set_color(self: Fl_ScrollPtr, color: t.CUInt32T) +extern def Fl_Scroll_color(self: Fl_ScrollPtr) -> uint32 +extern def Fl_Scroll_set_color(self: Fl_ScrollPtr, color: uint32) extern def Fl_Scroll_measure_label(self: Fl_ScrollPtr, a1: bytes, a2: bytes) -extern def Fl_Scroll_label_color(self: Fl_ScrollPtr) -> t.CUInt32T -extern def Fl_Scroll_set_label_color(self: Fl_ScrollPtr, color: t.CUInt32T) +extern def Fl_Scroll_label_color(self: Fl_ScrollPtr) -> uint32 +extern def Fl_Scroll_set_label_color(self: Fl_ScrollPtr, color: uint32) extern def Fl_Scroll_label_font(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_set_label_font(self: Fl_ScrollPtr, font: int) extern def Fl_Scroll_label_size(self: Fl_ScrollPtr) -> int @@ -378,8 +378,8 @@ extern def Fl_Scroll_set_when(self: Fl_ScrollPtr, a1: int) extern def Fl_Scroll_when(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_image(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_parent(self: Fl_ScrollPtr) -> bytes -extern def Fl_Scroll_selection_color(self: Fl_ScrollPtr) -> t.CUInt32T -extern def Fl_Scroll_set_selection_color(self: Fl_ScrollPtr, color: t.CUInt32T) +extern def Fl_Scroll_selection_color(self: Fl_ScrollPtr) -> uint32 +extern def Fl_Scroll_set_selection_color(self: Fl_ScrollPtr, color: uint32) extern def Fl_Scroll_do_callback(self: Fl_ScrollPtr) extern def Fl_Scroll_inside(self: Fl_ScrollPtr, a1: bytes) -> int extern def Fl_Scroll_window(self: Fl_ScrollPtr) -> bytes @@ -390,15 +390,15 @@ extern def Fl_Scroll_take_focus(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_set_visible_focus(self: Fl_ScrollPtr) extern def Fl_Scroll_clear_visible_focus(self: Fl_ScrollPtr) extern def Fl_Scroll_visible_focus(self: Fl_ScrollPtr, v: int) -extern def Fl_Scroll_has_visible_focus(self: Fl_ScrollPtr) -> t.CUInt32T +extern def Fl_Scroll_has_visible_focus(self: Fl_ScrollPtr) -> uint32 extern def Fl_Scroll_set_user_data(self: Fl_ScrollPtr, data: bytes) extern def Fl_Scroll_draw_data(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_handle_data(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_set_draw_data(self: Fl_ScrollPtr, data: bytes) extern def Fl_Scroll_set_handle_data(self: Fl_ScrollPtr, data: bytes) -extern def Fl_Scroll_damage(self: Fl_ScrollPtr) -> t.CUInt8T -extern def Fl_Scroll_set_damage(self: Fl_ScrollPtr, flag: t.CUInt8T) -extern def Fl_Scroll_set_damage_area(self: Fl_ScrollPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Scroll_damage(self: Fl_ScrollPtr) -> uint8 +extern def Fl_Scroll_set_damage(self: Fl_ScrollPtr, flag: uint8) +extern def Fl_Scroll_set_damage_area(self: Fl_ScrollPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Scroll_clear_damage(self: Fl_ScrollPtr) extern def Fl_Scroll_as_window(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_as_group(self: Fl_ScrollPtr) -> bytes @@ -407,7 +407,7 @@ extern def Fl_Scroll_deimage(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_set_callback(self: Fl_ScrollPtr, a1: bytes, a2: bytes) extern def Fl_Scroll_visible(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_visible_r(self: Fl_ScrollPtr) -> int -extern def Fl_Scroll_active(self: Fl_ScrollPtr) -> t.CUInt32T +extern def Fl_Scroll_active(self: Fl_ScrollPtr) -> uint32 extern def Fl_Scroll_active_r(self: Fl_ScrollPtr) -> int extern def Fl_Scroll_callback(self: Fl_ScrollPtr) -> bytes extern def Fl_Scroll_set_deletion_callback(self: Fl_ScrollPtr, cb1: bytes, data: bytes) @@ -457,11 +457,11 @@ extern def Fl_Tabs_tooltip(self: Fl_TabsPtr) -> str extern def Fl_Tabs_set_tooltip(self: Fl_TabsPtr, txt: str) extern def Fl_Tabs_get_type(self: Fl_TabsPtr) -> int extern def Fl_Tabs_set_type(self: Fl_TabsPtr, typ: int) -extern def Fl_Tabs_color(self: Fl_TabsPtr) -> t.CUInt32T -extern def Fl_Tabs_set_color(self: Fl_TabsPtr, color: t.CUInt32T) +extern def Fl_Tabs_color(self: Fl_TabsPtr) -> uint32 +extern def Fl_Tabs_set_color(self: Fl_TabsPtr, color: uint32) extern def Fl_Tabs_measure_label(self: Fl_TabsPtr, a1: bytes, a2: bytes) -extern def Fl_Tabs_label_color(self: Fl_TabsPtr) -> t.CUInt32T -extern def Fl_Tabs_set_label_color(self: Fl_TabsPtr, color: t.CUInt32T) +extern def Fl_Tabs_label_color(self: Fl_TabsPtr) -> uint32 +extern def Fl_Tabs_set_label_color(self: Fl_TabsPtr, color: uint32) extern def Fl_Tabs_label_font(self: Fl_TabsPtr) -> int extern def Fl_Tabs_set_label_font(self: Fl_TabsPtr, font: int) extern def Fl_Tabs_label_size(self: Fl_TabsPtr) -> int @@ -485,8 +485,8 @@ extern def Fl_Tabs_set_when(self: Fl_TabsPtr, a1: int) extern def Fl_Tabs_when(self: Fl_TabsPtr) -> int extern def Fl_Tabs_image(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_parent(self: Fl_TabsPtr) -> bytes -extern def Fl_Tabs_selection_color(self: Fl_TabsPtr) -> t.CUInt32T -extern def Fl_Tabs_set_selection_color(self: Fl_TabsPtr, color: t.CUInt32T) +extern def Fl_Tabs_selection_color(self: Fl_TabsPtr) -> uint32 +extern def Fl_Tabs_set_selection_color(self: Fl_TabsPtr, color: uint32) extern def Fl_Tabs_do_callback(self: Fl_TabsPtr) extern def Fl_Tabs_inside(self: Fl_TabsPtr, a1: bytes) -> int extern def Fl_Tabs_window(self: Fl_TabsPtr) -> bytes @@ -497,15 +497,15 @@ extern def Fl_Tabs_take_focus(self: Fl_TabsPtr) -> int extern def Fl_Tabs_set_visible_focus(self: Fl_TabsPtr) extern def Fl_Tabs_clear_visible_focus(self: Fl_TabsPtr) extern def Fl_Tabs_visible_focus(self: Fl_TabsPtr, v: int) -extern def Fl_Tabs_has_visible_focus(self: Fl_TabsPtr) -> t.CUInt32T +extern def Fl_Tabs_has_visible_focus(self: Fl_TabsPtr) -> uint32 extern def Fl_Tabs_set_user_data(self: Fl_TabsPtr, data: bytes) extern def Fl_Tabs_draw_data(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_handle_data(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_set_draw_data(self: Fl_TabsPtr, data: bytes) extern def Fl_Tabs_set_handle_data(self: Fl_TabsPtr, data: bytes) -extern def Fl_Tabs_damage(self: Fl_TabsPtr) -> t.CUInt8T -extern def Fl_Tabs_set_damage(self: Fl_TabsPtr, flag: t.CUInt8T) -extern def Fl_Tabs_set_damage_area(self: Fl_TabsPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Tabs_damage(self: Fl_TabsPtr) -> uint8 +extern def Fl_Tabs_set_damage(self: Fl_TabsPtr, flag: uint8) +extern def Fl_Tabs_set_damage_area(self: Fl_TabsPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Tabs_clear_damage(self: Fl_TabsPtr) extern def Fl_Tabs_as_window(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_as_group(self: Fl_TabsPtr) -> bytes @@ -514,7 +514,7 @@ extern def Fl_Tabs_deimage(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_set_callback(self: Fl_TabsPtr, a1: bytes, a2: bytes) extern def Fl_Tabs_visible(self: Fl_TabsPtr) -> int extern def Fl_Tabs_visible_r(self: Fl_TabsPtr) -> int -extern def Fl_Tabs_active(self: Fl_TabsPtr) -> t.CUInt32T +extern def Fl_Tabs_active(self: Fl_TabsPtr) -> uint32 extern def Fl_Tabs_active_r(self: Fl_TabsPtr) -> int extern def Fl_Tabs_callback(self: Fl_TabsPtr) -> bytes extern def Fl_Tabs_set_deletion_callback(self: Fl_TabsPtr, cb1: bytes, data: bytes) @@ -564,11 +564,11 @@ extern def Fl_Tile_tooltip(self: Fl_TilePtr) -> str extern def Fl_Tile_set_tooltip(self: Fl_TilePtr, txt: str) extern def Fl_Tile_get_type(self: Fl_TilePtr) -> int extern def Fl_Tile_set_type(self: Fl_TilePtr, typ: int) -extern def Fl_Tile_color(self: Fl_TilePtr) -> t.CUInt32T -extern def Fl_Tile_set_color(self: Fl_TilePtr, color: t.CUInt32T) +extern def Fl_Tile_color(self: Fl_TilePtr) -> uint32 +extern def Fl_Tile_set_color(self: Fl_TilePtr, color: uint32) extern def Fl_Tile_measure_label(self: Fl_TilePtr, a1: bytes, a2: bytes) -extern def Fl_Tile_label_color(self: Fl_TilePtr) -> t.CUInt32T -extern def Fl_Tile_set_label_color(self: Fl_TilePtr, color: t.CUInt32T) +extern def Fl_Tile_label_color(self: Fl_TilePtr) -> uint32 +extern def Fl_Tile_set_label_color(self: Fl_TilePtr, color: uint32) extern def Fl_Tile_label_font(self: Fl_TilePtr) -> int extern def Fl_Tile_set_label_font(self: Fl_TilePtr, font: int) extern def Fl_Tile_label_size(self: Fl_TilePtr) -> int @@ -592,8 +592,8 @@ extern def Fl_Tile_set_when(self: Fl_TilePtr, a1: int) extern def Fl_Tile_when(self: Fl_TilePtr) -> int extern def Fl_Tile_image(self: Fl_TilePtr) -> bytes extern def Fl_Tile_parent(self: Fl_TilePtr) -> bytes -extern def Fl_Tile_selection_color(self: Fl_TilePtr) -> t.CUInt32T -extern def Fl_Tile_set_selection_color(self: Fl_TilePtr, color: t.CUInt32T) +extern def Fl_Tile_selection_color(self: Fl_TilePtr) -> uint32 +extern def Fl_Tile_set_selection_color(self: Fl_TilePtr, color: uint32) extern def Fl_Tile_do_callback(self: Fl_TilePtr) extern def Fl_Tile_inside(self: Fl_TilePtr, a1: bytes) -> int extern def Fl_Tile_window(self: Fl_TilePtr) -> bytes @@ -604,15 +604,15 @@ extern def Fl_Tile_take_focus(self: Fl_TilePtr) -> int extern def Fl_Tile_set_visible_focus(self: Fl_TilePtr) extern def Fl_Tile_clear_visible_focus(self: Fl_TilePtr) extern def Fl_Tile_visible_focus(self: Fl_TilePtr, v: int) -extern def Fl_Tile_has_visible_focus(self: Fl_TilePtr) -> t.CUInt32T +extern def Fl_Tile_has_visible_focus(self: Fl_TilePtr) -> uint32 extern def Fl_Tile_set_user_data(self: Fl_TilePtr, data: bytes) extern def Fl_Tile_draw_data(self: Fl_TilePtr) -> bytes extern def Fl_Tile_handle_data(self: Fl_TilePtr) -> bytes extern def Fl_Tile_set_draw_data(self: Fl_TilePtr, data: bytes) extern def Fl_Tile_set_handle_data(self: Fl_TilePtr, data: bytes) -extern def Fl_Tile_damage(self: Fl_TilePtr) -> t.CUInt8T -extern def Fl_Tile_set_damage(self: Fl_TilePtr, flag: t.CUInt8T) -extern def Fl_Tile_set_damage_area(self: Fl_TilePtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Tile_damage(self: Fl_TilePtr) -> uint8 +extern def Fl_Tile_set_damage(self: Fl_TilePtr, flag: uint8) +extern def Fl_Tile_set_damage_area(self: Fl_TilePtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Tile_clear_damage(self: Fl_TilePtr) extern def Fl_Tile_as_window(self: Fl_TilePtr) -> bytes extern def Fl_Tile_as_group(self: Fl_TilePtr) -> bytes @@ -621,7 +621,7 @@ extern def Fl_Tile_deimage(self: Fl_TilePtr) -> bytes extern def Fl_Tile_set_callback(self: Fl_TilePtr, a1: bytes, a2: bytes) extern def Fl_Tile_visible(self: Fl_TilePtr) -> int extern def Fl_Tile_visible_r(self: Fl_TilePtr) -> int -extern def Fl_Tile_active(self: Fl_TilePtr) -> t.CUInt32T +extern def Fl_Tile_active(self: Fl_TilePtr) -> uint32 extern def Fl_Tile_active_r(self: Fl_TilePtr) -> int extern def Fl_Tile_callback(self: Fl_TilePtr) -> bytes extern def Fl_Tile_set_deletion_callback(self: Fl_TilePtr, cb1: bytes, data: bytes) @@ -671,11 +671,11 @@ extern def Fl_Wizard_tooltip(self: Fl_WizardPtr) -> str extern def Fl_Wizard_set_tooltip(self: Fl_WizardPtr, txt: str) extern def Fl_Wizard_get_type(self: Fl_WizardPtr) -> int extern def Fl_Wizard_set_type(self: Fl_WizardPtr, typ: int) -extern def Fl_Wizard_color(self: Fl_WizardPtr) -> t.CUInt32T -extern def Fl_Wizard_set_color(self: Fl_WizardPtr, color: t.CUInt32T) +extern def Fl_Wizard_color(self: Fl_WizardPtr) -> uint32 +extern def Fl_Wizard_set_color(self: Fl_WizardPtr, color: uint32) extern def Fl_Wizard_measure_label(self: Fl_WizardPtr, a1: bytes, a2: bytes) -extern def Fl_Wizard_label_color(self: Fl_WizardPtr) -> t.CUInt32T -extern def Fl_Wizard_set_label_color(self: Fl_WizardPtr, color: t.CUInt32T) +extern def Fl_Wizard_label_color(self: Fl_WizardPtr) -> uint32 +extern def Fl_Wizard_set_label_color(self: Fl_WizardPtr, color: uint32) extern def Fl_Wizard_label_font(self: Fl_WizardPtr) -> int extern def Fl_Wizard_set_label_font(self: Fl_WizardPtr, font: int) extern def Fl_Wizard_label_size(self: Fl_WizardPtr) -> int @@ -699,8 +699,8 @@ extern def Fl_Wizard_set_when(self: Fl_WizardPtr, a1: int) extern def Fl_Wizard_when(self: Fl_WizardPtr) -> int extern def Fl_Wizard_image(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_parent(self: Fl_WizardPtr) -> bytes -extern def Fl_Wizard_selection_color(self: Fl_WizardPtr) -> t.CUInt32T -extern def Fl_Wizard_set_selection_color(self: Fl_WizardPtr, color: t.CUInt32T) +extern def Fl_Wizard_selection_color(self: Fl_WizardPtr) -> uint32 +extern def Fl_Wizard_set_selection_color(self: Fl_WizardPtr, color: uint32) extern def Fl_Wizard_do_callback(self: Fl_WizardPtr) extern def Fl_Wizard_inside(self: Fl_WizardPtr, a1: bytes) -> int extern def Fl_Wizard_window(self: Fl_WizardPtr) -> bytes @@ -711,15 +711,15 @@ extern def Fl_Wizard_take_focus(self: Fl_WizardPtr) -> int extern def Fl_Wizard_set_visible_focus(self: Fl_WizardPtr) extern def Fl_Wizard_clear_visible_focus(self: Fl_WizardPtr) extern def Fl_Wizard_visible_focus(self: Fl_WizardPtr, v: int) -extern def Fl_Wizard_has_visible_focus(self: Fl_WizardPtr) -> t.CUInt32T +extern def Fl_Wizard_has_visible_focus(self: Fl_WizardPtr) -> uint32 extern def Fl_Wizard_set_user_data(self: Fl_WizardPtr, data: bytes) extern def Fl_Wizard_draw_data(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_handle_data(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_set_draw_data(self: Fl_WizardPtr, data: bytes) extern def Fl_Wizard_set_handle_data(self: Fl_WizardPtr, data: bytes) -extern def Fl_Wizard_damage(self: Fl_WizardPtr) -> t.CUInt8T -extern def Fl_Wizard_set_damage(self: Fl_WizardPtr, flag: t.CUInt8T) -extern def Fl_Wizard_set_damage_area(self: Fl_WizardPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Wizard_damage(self: Fl_WizardPtr) -> uint8 +extern def Fl_Wizard_set_damage(self: Fl_WizardPtr, flag: uint8) +extern def Fl_Wizard_set_damage_area(self: Fl_WizardPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Wizard_clear_damage(self: Fl_WizardPtr) extern def Fl_Wizard_as_window(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_as_group(self: Fl_WizardPtr) -> bytes @@ -728,7 +728,7 @@ extern def Fl_Wizard_deimage(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_set_callback(self: Fl_WizardPtr, a1: bytes, a2: bytes) extern def Fl_Wizard_visible(self: Fl_WizardPtr) -> int extern def Fl_Wizard_visible_r(self: Fl_WizardPtr) -> int -extern def Fl_Wizard_active(self: Fl_WizardPtr) -> t.CUInt32T +extern def Fl_Wizard_active(self: Fl_WizardPtr) -> uint32 extern def Fl_Wizard_active_r(self: Fl_WizardPtr) -> int extern def Fl_Wizard_callback(self: Fl_WizardPtr) -> bytes extern def Fl_Wizard_set_deletion_callback(self: Fl_WizardPtr, cb1: bytes, data: bytes) @@ -778,11 +778,11 @@ extern def Fl_Color_Chooser_tooltip(self: Fl_Color_ChooserPtr) -> str extern def Fl_Color_Chooser_set_tooltip(self: Fl_Color_ChooserPtr, txt: str) extern def Fl_Color_Chooser_get_type(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_set_type(self: Fl_Color_ChooserPtr, typ: int) -extern def Fl_Color_Chooser_color(self: Fl_Color_ChooserPtr) -> t.CUInt32T -extern def Fl_Color_Chooser_set_color(self: Fl_Color_ChooserPtr, color: t.CUInt32T) +extern def Fl_Color_Chooser_color(self: Fl_Color_ChooserPtr) -> uint32 +extern def Fl_Color_Chooser_set_color(self: Fl_Color_ChooserPtr, color: uint32) extern def Fl_Color_Chooser_measure_label(self: Fl_Color_ChooserPtr, a1: bytes, a2: bytes) -extern def Fl_Color_Chooser_label_color(self: Fl_Color_ChooserPtr) -> t.CUInt32T -extern def Fl_Color_Chooser_set_label_color(self: Fl_Color_ChooserPtr, color: t.CUInt32T) +extern def Fl_Color_Chooser_label_color(self: Fl_Color_ChooserPtr) -> uint32 +extern def Fl_Color_Chooser_set_label_color(self: Fl_Color_ChooserPtr, color: uint32) extern def Fl_Color_Chooser_label_font(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_set_label_font(self: Fl_Color_ChooserPtr, font: int) extern def Fl_Color_Chooser_label_size(self: Fl_Color_ChooserPtr) -> int @@ -806,8 +806,8 @@ extern def Fl_Color_Chooser_set_when(self: Fl_Color_ChooserPtr, a1: int) extern def Fl_Color_Chooser_when(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_image(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_parent(self: Fl_Color_ChooserPtr) -> bytes -extern def Fl_Color_Chooser_selection_color(self: Fl_Color_ChooserPtr) -> t.CUInt32T -extern def Fl_Color_Chooser_set_selection_color(self: Fl_Color_ChooserPtr, color: t.CUInt32T) +extern def Fl_Color_Chooser_selection_color(self: Fl_Color_ChooserPtr) -> uint32 +extern def Fl_Color_Chooser_set_selection_color(self: Fl_Color_ChooserPtr, color: uint32) extern def Fl_Color_Chooser_do_callback(self: Fl_Color_ChooserPtr) extern def Fl_Color_Chooser_inside(self: Fl_Color_ChooserPtr, a1: bytes) -> int extern def Fl_Color_Chooser_window(self: Fl_Color_ChooserPtr) -> bytes @@ -818,15 +818,15 @@ extern def Fl_Color_Chooser_take_focus(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_set_visible_focus(self: Fl_Color_ChooserPtr) extern def Fl_Color_Chooser_clear_visible_focus(self: Fl_Color_ChooserPtr) extern def Fl_Color_Chooser_visible_focus(self: Fl_Color_ChooserPtr, v: int) -extern def Fl_Color_Chooser_has_visible_focus(self: Fl_Color_ChooserPtr) -> t.CUInt32T +extern def Fl_Color_Chooser_has_visible_focus(self: Fl_Color_ChooserPtr) -> uint32 extern def Fl_Color_Chooser_set_user_data(self: Fl_Color_ChooserPtr, data: bytes) extern def Fl_Color_Chooser_draw_data(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_handle_data(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_set_draw_data(self: Fl_Color_ChooserPtr, data: bytes) extern def Fl_Color_Chooser_set_handle_data(self: Fl_Color_ChooserPtr, data: bytes) -extern def Fl_Color_Chooser_damage(self: Fl_Color_ChooserPtr) -> t.CUInt8T -extern def Fl_Color_Chooser_set_damage(self: Fl_Color_ChooserPtr, flag: t.CUInt8T) -extern def Fl_Color_Chooser_set_damage_area(self: Fl_Color_ChooserPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Color_Chooser_damage(self: Fl_Color_ChooserPtr) -> uint8 +extern def Fl_Color_Chooser_set_damage(self: Fl_Color_ChooserPtr, flag: uint8) +extern def Fl_Color_Chooser_set_damage_area(self: Fl_Color_ChooserPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Color_Chooser_clear_damage(self: Fl_Color_ChooserPtr) extern def Fl_Color_Chooser_as_window(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_as_group(self: Fl_Color_ChooserPtr) -> bytes @@ -835,7 +835,7 @@ extern def Fl_Color_Chooser_deimage(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_set_callback(self: Fl_Color_ChooserPtr, a1: bytes, a2: bytes) extern def Fl_Color_Chooser_visible(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_visible_r(self: Fl_Color_ChooserPtr) -> int -extern def Fl_Color_Chooser_active(self: Fl_Color_ChooserPtr) -> t.CUInt32T +extern def Fl_Color_Chooser_active(self: Fl_Color_ChooserPtr) -> uint32 extern def Fl_Color_Chooser_active_r(self: Fl_Color_ChooserPtr) -> int extern def Fl_Color_Chooser_callback(self: Fl_Color_ChooserPtr) -> bytes extern def Fl_Color_Chooser_set_deletion_callback(self: Fl_Color_ChooserPtr, cb1: bytes, data: bytes) @@ -885,11 +885,11 @@ extern def Fl_Flex_tooltip(self: Fl_FlexPtr) -> str extern def Fl_Flex_set_tooltip(self: Fl_FlexPtr, txt: str) extern def Fl_Flex_get_type(self: Fl_FlexPtr) -> int extern def Fl_Flex_set_type(self: Fl_FlexPtr, typ: int) -extern def Fl_Flex_color(self: Fl_FlexPtr) -> t.CUInt32T -extern def Fl_Flex_set_color(self: Fl_FlexPtr, color: t.CUInt32T) +extern def Fl_Flex_color(self: Fl_FlexPtr) -> uint32 +extern def Fl_Flex_set_color(self: Fl_FlexPtr, color: uint32) extern def Fl_Flex_measure_label(self: Fl_FlexPtr, a1: bytes, a2: bytes) -extern def Fl_Flex_label_color(self: Fl_FlexPtr) -> t.CUInt32T -extern def Fl_Flex_set_label_color(self: Fl_FlexPtr, color: t.CUInt32T) +extern def Fl_Flex_label_color(self: Fl_FlexPtr) -> uint32 +extern def Fl_Flex_set_label_color(self: Fl_FlexPtr, color: uint32) extern def Fl_Flex_label_font(self: Fl_FlexPtr) -> int extern def Fl_Flex_set_label_font(self: Fl_FlexPtr, font: int) extern def Fl_Flex_label_size(self: Fl_FlexPtr) -> int @@ -913,8 +913,8 @@ extern def Fl_Flex_set_when(self: Fl_FlexPtr, a1: int) extern def Fl_Flex_when(self: Fl_FlexPtr) -> int extern def Fl_Flex_image(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_parent(self: Fl_FlexPtr) -> bytes -extern def Fl_Flex_selection_color(self: Fl_FlexPtr) -> t.CUInt32T -extern def Fl_Flex_set_selection_color(self: Fl_FlexPtr, color: t.CUInt32T) +extern def Fl_Flex_selection_color(self: Fl_FlexPtr) -> uint32 +extern def Fl_Flex_set_selection_color(self: Fl_FlexPtr, color: uint32) extern def Fl_Flex_do_callback(self: Fl_FlexPtr) extern def Fl_Flex_inside(self: Fl_FlexPtr, a1: bytes) -> int extern def Fl_Flex_window(self: Fl_FlexPtr) -> bytes @@ -925,15 +925,15 @@ extern def Fl_Flex_take_focus(self: Fl_FlexPtr) -> int extern def Fl_Flex_set_visible_focus(self: Fl_FlexPtr) extern def Fl_Flex_clear_visible_focus(self: Fl_FlexPtr) extern def Fl_Flex_visible_focus(self: Fl_FlexPtr, v: int) -extern def Fl_Flex_has_visible_focus(self: Fl_FlexPtr) -> t.CUInt32T +extern def Fl_Flex_has_visible_focus(self: Fl_FlexPtr) -> uint32 extern def Fl_Flex_set_user_data(self: Fl_FlexPtr, data: bytes) extern def Fl_Flex_draw_data(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_handle_data(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_set_draw_data(self: Fl_FlexPtr, data: bytes) extern def Fl_Flex_set_handle_data(self: Fl_FlexPtr, data: bytes) -extern def Fl_Flex_damage(self: Fl_FlexPtr) -> t.CUInt8T -extern def Fl_Flex_set_damage(self: Fl_FlexPtr, flag: t.CUInt8T) -extern def Fl_Flex_set_damage_area(self: Fl_FlexPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Flex_damage(self: Fl_FlexPtr) -> uint8 +extern def Fl_Flex_set_damage(self: Fl_FlexPtr, flag: uint8) +extern def Fl_Flex_set_damage_area(self: Fl_FlexPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Flex_clear_damage(self: Fl_FlexPtr) extern def Fl_Flex_as_window(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_as_group(self: Fl_FlexPtr) -> bytes @@ -942,7 +942,7 @@ extern def Fl_Flex_deimage(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_set_callback(self: Fl_FlexPtr, a1: bytes, a2: bytes) extern def Fl_Flex_visible(self: Fl_FlexPtr) -> int extern def Fl_Flex_visible_r(self: Fl_FlexPtr) -> int -extern def Fl_Flex_active(self: Fl_FlexPtr) -> t.CUInt32T +extern def Fl_Flex_active(self: Fl_FlexPtr) -> uint32 extern def Fl_Flex_active_r(self: Fl_FlexPtr) -> int extern def Fl_Flex_callback(self: Fl_FlexPtr) -> bytes extern def Fl_Flex_set_deletion_callback(self: Fl_FlexPtr, cb1: bytes, data: bytes) @@ -992,11 +992,11 @@ extern def Fl_Grid_tooltip(self: Fl_GridPtr) -> str extern def Fl_Grid_set_tooltip(self: Fl_GridPtr, txt: str) extern def Fl_Grid_get_type(self: Fl_GridPtr) -> int extern def Fl_Grid_set_type(self: Fl_GridPtr, typ: int) -extern def Fl_Grid_color(self: Fl_GridPtr) -> t.CUInt32T -extern def Fl_Grid_set_color(self: Fl_GridPtr, color: t.CUInt32T) +extern def Fl_Grid_color(self: Fl_GridPtr) -> uint32 +extern def Fl_Grid_set_color(self: Fl_GridPtr, color: uint32) extern def Fl_Grid_measure_label(self: Fl_GridPtr, a1: bytes, a2: bytes) -extern def Fl_Grid_label_color(self: Fl_GridPtr) -> t.CUInt32T -extern def Fl_Grid_set_label_color(self: Fl_GridPtr, color: t.CUInt32T) +extern def Fl_Grid_label_color(self: Fl_GridPtr) -> uint32 +extern def Fl_Grid_set_label_color(self: Fl_GridPtr, color: uint32) extern def Fl_Grid_label_font(self: Fl_GridPtr) -> int extern def Fl_Grid_set_label_font(self: Fl_GridPtr, font: int) extern def Fl_Grid_label_size(self: Fl_GridPtr) -> int @@ -1020,8 +1020,8 @@ extern def Fl_Grid_set_when(self: Fl_GridPtr, a1: int) extern def Fl_Grid_when(self: Fl_GridPtr) -> int extern def Fl_Grid_image(self: Fl_GridPtr) -> bytes extern def Fl_Grid_parent(self: Fl_GridPtr) -> bytes -extern def Fl_Grid_selection_color(self: Fl_GridPtr) -> t.CUInt32T -extern def Fl_Grid_set_selection_color(self: Fl_GridPtr, color: t.CUInt32T) +extern def Fl_Grid_selection_color(self: Fl_GridPtr) -> uint32 +extern def Fl_Grid_set_selection_color(self: Fl_GridPtr, color: uint32) extern def Fl_Grid_do_callback(self: Fl_GridPtr) extern def Fl_Grid_inside(self: Fl_GridPtr, a1: bytes) -> int extern def Fl_Grid_window(self: Fl_GridPtr) -> bytes @@ -1032,15 +1032,15 @@ extern def Fl_Grid_take_focus(self: Fl_GridPtr) -> int extern def Fl_Grid_set_visible_focus(self: Fl_GridPtr) extern def Fl_Grid_clear_visible_focus(self: Fl_GridPtr) extern def Fl_Grid_visible_focus(self: Fl_GridPtr, v: int) -extern def Fl_Grid_has_visible_focus(self: Fl_GridPtr) -> t.CUInt32T +extern def Fl_Grid_has_visible_focus(self: Fl_GridPtr) -> uint32 extern def Fl_Grid_set_user_data(self: Fl_GridPtr, data: bytes) extern def Fl_Grid_draw_data(self: Fl_GridPtr) -> bytes extern def Fl_Grid_handle_data(self: Fl_GridPtr) -> bytes extern def Fl_Grid_set_draw_data(self: Fl_GridPtr, data: bytes) extern def Fl_Grid_set_handle_data(self: Fl_GridPtr, data: bytes) -extern def Fl_Grid_damage(self: Fl_GridPtr) -> t.CUInt8T -extern def Fl_Grid_set_damage(self: Fl_GridPtr, flag: t.CUInt8T) -extern def Fl_Grid_set_damage_area(self: Fl_GridPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Grid_damage(self: Fl_GridPtr) -> uint8 +extern def Fl_Grid_set_damage(self: Fl_GridPtr, flag: uint8) +extern def Fl_Grid_set_damage_area(self: Fl_GridPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Grid_clear_damage(self: Fl_GridPtr) extern def Fl_Grid_as_window(self: Fl_GridPtr) -> bytes extern def Fl_Grid_as_group(self: Fl_GridPtr) -> bytes @@ -1049,7 +1049,7 @@ extern def Fl_Grid_deimage(self: Fl_GridPtr) -> bytes extern def Fl_Grid_set_callback(self: Fl_GridPtr, a1: bytes, a2: bytes) extern def Fl_Grid_visible(self: Fl_GridPtr) -> int extern def Fl_Grid_visible_r(self: Fl_GridPtr) -> int -extern def Fl_Grid_active(self: Fl_GridPtr) -> t.CUInt32T +extern def Fl_Grid_active(self: Fl_GridPtr) -> uint32 extern def Fl_Grid_active_r(self: Fl_GridPtr) -> int extern def Fl_Grid_callback(self: Fl_GridPtr) -> bytes extern def Fl_Grid_set_deletion_callback(self: Fl_GridPtr, cb1: bytes, data: bytes) @@ -1105,10 +1105,10 @@ extern def Fl_Wizard_next(a0: Fl_WizardPtr) extern def Fl_Wizard_prev(a0: Fl_WizardPtr) extern def Fl_Wizard_value(a0: Fl_WizardPtr) -> Fl_WidgetPtr extern def Fl_Wizard_set_value(a0: Fl_WizardPtr, a1: Fl_WidgetPtr) -extern def Fl_Color_Chooser_r(self: Fl_Color_ChooserPtr) -> t.CDouble -extern def Fl_Color_Chooser_g(self: Fl_Color_ChooserPtr) -> t.CDouble -extern def Fl_Color_Chooser_b(self: Fl_Color_ChooserPtr) -> t.CDouble -extern def Fl_Color_Chooser_set_rgb(self: Fl_Color_ChooserPtr, r: t.CDouble, g: t.CDouble, b: t.CDouble) -> int +extern def Fl_Color_Chooser_r(self: Fl_Color_ChooserPtr) -> double +extern def Fl_Color_Chooser_g(self: Fl_Color_ChooserPtr) -> double +extern def Fl_Color_Chooser_b(self: Fl_Color_ChooserPtr) -> double +extern def Fl_Color_Chooser_set_rgb(self: Fl_Color_ChooserPtr, r: double, g: double, b: double) -> int extern def Fl_Flex_set_size(self: Fl_FlexPtr, w: Fl_WidgetPtr, size: int) extern def Fl_Flex_set_margin(self: Fl_FlexPtr, m: int) extern def Fl_Flex_margin(self: Fl_FlexPtr) -> int @@ -1123,8 +1123,8 @@ extern def Fl_Grid_set_need_layout(self: Fl_GridPtr, set: int) extern def Fl_Grid_need_layout(self: Fl_GridPtr) -> int extern def Fl_Grid_set_margin(self: Fl_GridPtr, left: int, top: int, right: int, bottom: int) extern def Fl_Grid_set_gap(self: Fl_GridPtr, row_gap: int, col_gap: int) -extern def Fl_Grid_set_widget(self: Fl_GridPtr, wi: Fl_WidgetPtr, row: int, col: int, align: t.CUInt16T) -> bytes -extern def Fl_Grid_set_widget_ext(self: Fl_GridPtr, wi: Fl_WidgetPtr, row: int, col: int, rowspan: int, colspan: int, align: t.CUInt16T) -> bytes +extern def Fl_Grid_set_widget(self: Fl_GridPtr, wi: Fl_WidgetPtr, row: int, col: int, align: uint16) -> bytes +extern def Fl_Grid_set_widget_ext(self: Fl_GridPtr, wi: Fl_WidgetPtr, row: int, col: int, rowspan: int, colspan: int, align: uint16) -> bytes extern def Fl_Grid_set_col_width(self: Fl_GridPtr, col: int, value: int) extern def Fl_Grid_set_col_weight(self: Fl_GridPtr, col: int, value: int) extern def Fl_Grid_set_col_gap(self: Fl_GridPtr, col: int, value: int) @@ -1132,5 +1132,5 @@ extern def Fl_Grid_set_row_height(self: Fl_GridPtr, row: int, value: int) extern def Fl_Grid_set_row_weight(self: Fl_GridPtr, row: int, value: int) extern def Fl_Grid_set_row_gap(self: Fl_GridPtr, row: int, value: int) extern def Fl_Grid_show_grid(self: Fl_GridPtr, set: int) -extern def Fl_Grid_show_grid_with_color(self: Fl_GridPtr, set: int, col: t.CUInt32T) +extern def Fl_Grid_show_grid_with_color(self: Fl_GridPtr, set: int, col: uint32) extern def Fl_Grid_debug(self: Fl_GridPtr, level: int) diff --git a/fltk/_cfl_image.vp b/fltk/_cfl_image.vp index 6c959f0..e254802 100644 --- a/fltk/_cfl_image.vp +++ b/fltk/_cfl_image.vp @@ -294,7 +294,7 @@ extern def Fl_ICO_Image_ld(self: Fl_ICO_ImagePtr) -> int extern def Fl_ICO_Image_inactive(self: Fl_ICO_ImagePtr) extern def Fl_ICO_Image_from_dyn_ptr(other: Fl_ImagePtr) -> Fl_ICO_ImagePtr -extern def Fl_Image_color_average(self: Fl_ImagePtr, c: t.CUInt32T, i: t.CFloat) +extern def Fl_Image_color_average(self: Fl_ImagePtr, c: uint32, i: float) extern def Fl_Image_desaturate(self: Fl_ImagePtr) extern def Fl_Image_uncache(self: Fl_ImagePtr) extern def Fl_Image_label_widget(self: Fl_ImagePtr, w: bytes) @@ -311,16 +311,16 @@ extern def Fl_SVG_Image_new(filename: str) -> Fl_SVG_ImagePtr extern def Fl_SVG_Image_from(data: str) -> Fl_SVG_ImagePtr extern def Fl_SVG_Image_normalize(self: Fl_SVG_ImagePtr) extern def Fl_BMP_Image_new(filename: str) -> Fl_BMP_ImagePtr -extern def Fl_BMP_Image_from(data: bytes, len_: t.CInt32T) -> Fl_BMP_ImagePtr +extern def Fl_BMP_Image_from(data: bytes, len_: int32) -> Fl_BMP_ImagePtr extern def Fl_GIF_Image_new(filename: str) -> Fl_GIF_ImagePtr -extern def Fl_GIF_Image_from(data: bytes, len_: t.CUInt32T) -> Fl_GIF_ImagePtr -extern def Fl_Anim_GIF_Image_new(filename: str, canvas: bytes, flags: t.CUInt16T) -> Fl_Anim_GIF_ImagePtr -extern def Fl_Anim_GIF_Image_from(imagename: str, data: bytes, length: t.CUInt32T, canvas: bytes, flags: t.CUInt16T) -> Fl_Anim_GIF_ImagePtr -extern def Fl_Anim_GIF_Image_delay(self: Fl_Anim_GIF_ImagePtr, frame_: int) -> t.CDouble -extern def Fl_Anim_GIF_Image_set_delay(self: Fl_Anim_GIF_ImagePtr, frame: int, delay: t.CDouble) +extern def Fl_GIF_Image_from(data: bytes, len_: uint32) -> Fl_GIF_ImagePtr +extern def Fl_Anim_GIF_Image_new(filename: str, canvas: bytes, flags: uint16) -> Fl_Anim_GIF_ImagePtr +extern def Fl_Anim_GIF_Image_from(imagename: str, data: bytes, length: uint32, canvas: bytes, flags: uint16) -> Fl_Anim_GIF_ImagePtr +extern def Fl_Anim_GIF_Image_delay(self: Fl_Anim_GIF_ImagePtr, frame_: int) -> double +extern def Fl_Anim_GIF_Image_set_delay(self: Fl_Anim_GIF_ImagePtr, frame: int, delay: double) extern def Fl_Anim_GIF_Image_is_animated(self: Fl_Anim_GIF_ImagePtr) -> int -extern def Fl_Anim_GIF_Image_set_speed(self: Fl_Anim_GIF_ImagePtr, speed: t.CDouble) -extern def Fl_Anim_GIF_Image_speed(self: Fl_Anim_GIF_ImagePtr) -> t.CDouble +extern def Fl_Anim_GIF_Image_set_speed(self: Fl_Anim_GIF_ImagePtr, speed: double) +extern def Fl_Anim_GIF_Image_speed(self: Fl_Anim_GIF_ImagePtr) -> double extern def Fl_Anim_GIF_Image_start(self: Fl_Anim_GIF_ImagePtr) -> int extern def Fl_Anim_GIF_Image_stop(self: Fl_Anim_GIF_ImagePtr) -> int extern def Fl_Anim_GIF_Image_next(self: Fl_Anim_GIF_ImagePtr) -> int @@ -336,6 +336,6 @@ extern def Fl_RGB_Image_from_pixmap(image: Fl_PixmapPtr) -> Fl_RGB_ImagePtr extern def Fl_Shared_Image_get(name: str, W: int, H: int) -> Fl_Shared_ImagePtr extern def Fl_Shared_Image_from_rgb(rgb: Fl_RGB_ImagePtr, own_it: int) -> Fl_Shared_ImagePtr extern def Fl_ICO_Image_new(filename: str, id: int) -> Fl_ICO_ImagePtr -extern def Fl_ICO_Image_from_data(bits: bytes, len_: t.CUInt32T, id: int) -> Fl_ICO_ImagePtr +extern def Fl_ICO_Image_from_data(bits: bytes, len_: uint32, id: int) -> Fl_ICO_ImagePtr extern def Fl_ICO_Image_icondirentry(self: Fl_ICO_ImagePtr, size: bytes) -> bytes extern def Fl_register_images() diff --git a/fltk/_cfl_input.vp b/fltk/_cfl_input.vp index c903110..1d65e4d 100644 --- a/fltk/_cfl_input.vp +++ b/fltk/_cfl_input.vp @@ -29,11 +29,11 @@ extern def Fl_Input_tooltip(self: Fl_InputPtr) -> str extern def Fl_Input_set_tooltip(self: Fl_InputPtr, txt: str) extern def Fl_Input_get_type(self: Fl_InputPtr) -> int extern def Fl_Input_set_type(self: Fl_InputPtr, typ: int) -extern def Fl_Input_color(self: Fl_InputPtr) -> t.CUInt32T -extern def Fl_Input_set_color(self: Fl_InputPtr, color: t.CUInt32T) +extern def Fl_Input_color(self: Fl_InputPtr) -> uint32 +extern def Fl_Input_set_color(self: Fl_InputPtr, color: uint32) extern def Fl_Input_measure_label(self: Fl_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Input_label_color(self: Fl_InputPtr) -> t.CUInt32T -extern def Fl_Input_set_label_color(self: Fl_InputPtr, color: t.CUInt32T) +extern def Fl_Input_label_color(self: Fl_InputPtr) -> uint32 +extern def Fl_Input_set_label_color(self: Fl_InputPtr, color: uint32) extern def Fl_Input_label_font(self: Fl_InputPtr) -> int extern def Fl_Input_set_label_font(self: Fl_InputPtr, font: int) extern def Fl_Input_label_size(self: Fl_InputPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Input_set_when(self: Fl_InputPtr, a1: int) extern def Fl_Input_when(self: Fl_InputPtr) -> int extern def Fl_Input_image(self: Fl_InputPtr) -> bytes extern def Fl_Input_parent(self: Fl_InputPtr) -> bytes -extern def Fl_Input_selection_color(self: Fl_InputPtr) -> t.CUInt32T -extern def Fl_Input_set_selection_color(self: Fl_InputPtr, color: t.CUInt32T) +extern def Fl_Input_selection_color(self: Fl_InputPtr) -> uint32 +extern def Fl_Input_set_selection_color(self: Fl_InputPtr, color: uint32) extern def Fl_Input_do_callback(self: Fl_InputPtr) extern def Fl_Input_inside(self: Fl_InputPtr, a1: bytes) -> int extern def Fl_Input_window(self: Fl_InputPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Input_take_focus(self: Fl_InputPtr) -> int extern def Fl_Input_set_visible_focus(self: Fl_InputPtr) extern def Fl_Input_clear_visible_focus(self: Fl_InputPtr) extern def Fl_Input_visible_focus(self: Fl_InputPtr, v: int) -extern def Fl_Input_has_visible_focus(self: Fl_InputPtr) -> t.CUInt32T +extern def Fl_Input_has_visible_focus(self: Fl_InputPtr) -> uint32 extern def Fl_Input_set_user_data(self: Fl_InputPtr, data: bytes) extern def Fl_Input_draw_data(self: Fl_InputPtr) -> bytes extern def Fl_Input_handle_data(self: Fl_InputPtr) -> bytes extern def Fl_Input_set_draw_data(self: Fl_InputPtr, data: bytes) extern def Fl_Input_set_handle_data(self: Fl_InputPtr, data: bytes) -extern def Fl_Input_damage(self: Fl_InputPtr) -> t.CUInt8T -extern def Fl_Input_set_damage(self: Fl_InputPtr, flag: t.CUInt8T) -extern def Fl_Input_set_damage_area(self: Fl_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Input_damage(self: Fl_InputPtr) -> uint8 +extern def Fl_Input_set_damage(self: Fl_InputPtr, flag: uint8) +extern def Fl_Input_set_damage_area(self: Fl_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Input_clear_damage(self: Fl_InputPtr) extern def Fl_Input_as_window(self: Fl_InputPtr) -> bytes extern def Fl_Input_as_group(self: Fl_InputPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Input_deimage(self: Fl_InputPtr) -> bytes extern def Fl_Input_set_callback(self: Fl_InputPtr, a1: bytes, a2: bytes) extern def Fl_Input_visible(self: Fl_InputPtr) -> int extern def Fl_Input_visible_r(self: Fl_InputPtr) -> int -extern def Fl_Input_active(self: Fl_InputPtr) -> t.CUInt32T +extern def Fl_Input_active(self: Fl_InputPtr) -> uint32 extern def Fl_Input_active_r(self: Fl_InputPtr) -> int extern def Fl_Input_callback(self: Fl_InputPtr) -> bytes extern def Fl_Input_set_deletion_callback(self: Fl_InputPtr, cb1: bytes, data: bytes) @@ -111,12 +111,12 @@ extern def Fl_Input_append(self: Fl_InputPtr, t: str, l: int, keep_selection: ch extern def Fl_Input_copy(self: Fl_InputPtr, clipboard: int) -> int extern def Fl_Input_undo(self: Fl_InputPtr) -> int extern def Fl_Input_copy_cuts(self: Fl_InputPtr) -> int -extern def Fl_Input_cursor_color(self: Fl_InputPtr) -> t.CUInt32T -extern def Fl_Input_set_cursor_color(self: Fl_InputPtr, s: t.CUInt32T) +extern def Fl_Input_cursor_color(self: Fl_InputPtr) -> uint32 +extern def Fl_Input_set_cursor_color(self: Fl_InputPtr, s: uint32) extern def Fl_Input_text_font(self: Fl_InputPtr) -> int extern def Fl_Input_set_text_font(self: Fl_InputPtr, s: int) -extern def Fl_Input_text_color(self: Fl_InputPtr) -> t.CUInt32T -extern def Fl_Input_set_text_color(self: Fl_InputPtr, s: t.CUInt32T) +extern def Fl_Input_text_color(self: Fl_InputPtr) -> uint32 +extern def Fl_Input_set_text_color(self: Fl_InputPtr, s: uint32) extern def Fl_Input_text_size(self: Fl_InputPtr) -> int extern def Fl_Input_set_text_size(self: Fl_InputPtr, s: int) extern def Fl_Input_readonly(self: Fl_InputPtr) -> int @@ -146,11 +146,11 @@ extern def Fl_Int_Input_tooltip(self: Fl_Int_InputPtr) -> str extern def Fl_Int_Input_set_tooltip(self: Fl_Int_InputPtr, txt: str) extern def Fl_Int_Input_get_type(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_set_type(self: Fl_Int_InputPtr, typ: int) -extern def Fl_Int_Input_color(self: Fl_Int_InputPtr) -> t.CUInt32T -extern def Fl_Int_Input_set_color(self: Fl_Int_InputPtr, color: t.CUInt32T) +extern def Fl_Int_Input_color(self: Fl_Int_InputPtr) -> uint32 +extern def Fl_Int_Input_set_color(self: Fl_Int_InputPtr, color: uint32) extern def Fl_Int_Input_measure_label(self: Fl_Int_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Int_Input_label_color(self: Fl_Int_InputPtr) -> t.CUInt32T -extern def Fl_Int_Input_set_label_color(self: Fl_Int_InputPtr, color: t.CUInt32T) +extern def Fl_Int_Input_label_color(self: Fl_Int_InputPtr) -> uint32 +extern def Fl_Int_Input_set_label_color(self: Fl_Int_InputPtr, color: uint32) extern def Fl_Int_Input_label_font(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_set_label_font(self: Fl_Int_InputPtr, font: int) extern def Fl_Int_Input_label_size(self: Fl_Int_InputPtr) -> int @@ -174,8 +174,8 @@ extern def Fl_Int_Input_set_when(self: Fl_Int_InputPtr, a1: int) extern def Fl_Int_Input_when(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_image(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_parent(self: Fl_Int_InputPtr) -> bytes -extern def Fl_Int_Input_selection_color(self: Fl_Int_InputPtr) -> t.CUInt32T -extern def Fl_Int_Input_set_selection_color(self: Fl_Int_InputPtr, color: t.CUInt32T) +extern def Fl_Int_Input_selection_color(self: Fl_Int_InputPtr) -> uint32 +extern def Fl_Int_Input_set_selection_color(self: Fl_Int_InputPtr, color: uint32) extern def Fl_Int_Input_do_callback(self: Fl_Int_InputPtr) extern def Fl_Int_Input_inside(self: Fl_Int_InputPtr, a1: bytes) -> int extern def Fl_Int_Input_window(self: Fl_Int_InputPtr) -> bytes @@ -186,15 +186,15 @@ extern def Fl_Int_Input_take_focus(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_set_visible_focus(self: Fl_Int_InputPtr) extern def Fl_Int_Input_clear_visible_focus(self: Fl_Int_InputPtr) extern def Fl_Int_Input_visible_focus(self: Fl_Int_InputPtr, v: int) -extern def Fl_Int_Input_has_visible_focus(self: Fl_Int_InputPtr) -> t.CUInt32T +extern def Fl_Int_Input_has_visible_focus(self: Fl_Int_InputPtr) -> uint32 extern def Fl_Int_Input_set_user_data(self: Fl_Int_InputPtr, data: bytes) extern def Fl_Int_Input_draw_data(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_handle_data(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_set_draw_data(self: Fl_Int_InputPtr, data: bytes) extern def Fl_Int_Input_set_handle_data(self: Fl_Int_InputPtr, data: bytes) -extern def Fl_Int_Input_damage(self: Fl_Int_InputPtr) -> t.CUInt8T -extern def Fl_Int_Input_set_damage(self: Fl_Int_InputPtr, flag: t.CUInt8T) -extern def Fl_Int_Input_set_damage_area(self: Fl_Int_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Int_Input_damage(self: Fl_Int_InputPtr) -> uint8 +extern def Fl_Int_Input_set_damage(self: Fl_Int_InputPtr, flag: uint8) +extern def Fl_Int_Input_set_damage_area(self: Fl_Int_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Int_Input_clear_damage(self: Fl_Int_InputPtr) extern def Fl_Int_Input_as_window(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_as_group(self: Fl_Int_InputPtr) -> bytes @@ -203,7 +203,7 @@ extern def Fl_Int_Input_deimage(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_set_callback(self: Fl_Int_InputPtr, a1: bytes, a2: bytes) extern def Fl_Int_Input_visible(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_visible_r(self: Fl_Int_InputPtr) -> int -extern def Fl_Int_Input_active(self: Fl_Int_InputPtr) -> t.CUInt32T +extern def Fl_Int_Input_active(self: Fl_Int_InputPtr) -> uint32 extern def Fl_Int_Input_active_r(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_callback(self: Fl_Int_InputPtr) -> bytes extern def Fl_Int_Input_set_deletion_callback(self: Fl_Int_InputPtr, cb1: bytes, data: bytes) @@ -228,12 +228,12 @@ extern def Fl_Int_Input_append(self: Fl_Int_InputPtr, t: str, l: int, keep_selec extern def Fl_Int_Input_copy(self: Fl_Int_InputPtr, clipboard: int) -> int extern def Fl_Int_Input_undo(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_copy_cuts(self: Fl_Int_InputPtr) -> int -extern def Fl_Int_Input_cursor_color(self: Fl_Int_InputPtr) -> t.CUInt32T -extern def Fl_Int_Input_set_cursor_color(self: Fl_Int_InputPtr, s: t.CUInt32T) +extern def Fl_Int_Input_cursor_color(self: Fl_Int_InputPtr) -> uint32 +extern def Fl_Int_Input_set_cursor_color(self: Fl_Int_InputPtr, s: uint32) extern def Fl_Int_Input_text_font(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_set_text_font(self: Fl_Int_InputPtr, s: int) -extern def Fl_Int_Input_text_color(self: Fl_Int_InputPtr) -> t.CUInt32T -extern def Fl_Int_Input_set_text_color(self: Fl_Int_InputPtr, s: t.CUInt32T) +extern def Fl_Int_Input_text_color(self: Fl_Int_InputPtr) -> uint32 +extern def Fl_Int_Input_set_text_color(self: Fl_Int_InputPtr, s: uint32) extern def Fl_Int_Input_text_size(self: Fl_Int_InputPtr) -> int extern def Fl_Int_Input_set_text_size(self: Fl_Int_InputPtr, s: int) extern def Fl_Int_Input_readonly(self: Fl_Int_InputPtr) -> int @@ -263,11 +263,11 @@ extern def Fl_Float_Input_tooltip(self: Fl_Float_InputPtr) -> str extern def Fl_Float_Input_set_tooltip(self: Fl_Float_InputPtr, txt: str) extern def Fl_Float_Input_get_type(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_set_type(self: Fl_Float_InputPtr, typ: int) -extern def Fl_Float_Input_color(self: Fl_Float_InputPtr) -> t.CUInt32T -extern def Fl_Float_Input_set_color(self: Fl_Float_InputPtr, color: t.CUInt32T) +extern def Fl_Float_Input_color(self: Fl_Float_InputPtr) -> uint32 +extern def Fl_Float_Input_set_color(self: Fl_Float_InputPtr, color: uint32) extern def Fl_Float_Input_measure_label(self: Fl_Float_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Float_Input_label_color(self: Fl_Float_InputPtr) -> t.CUInt32T -extern def Fl_Float_Input_set_label_color(self: Fl_Float_InputPtr, color: t.CUInt32T) +extern def Fl_Float_Input_label_color(self: Fl_Float_InputPtr) -> uint32 +extern def Fl_Float_Input_set_label_color(self: Fl_Float_InputPtr, color: uint32) extern def Fl_Float_Input_label_font(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_set_label_font(self: Fl_Float_InputPtr, font: int) extern def Fl_Float_Input_label_size(self: Fl_Float_InputPtr) -> int @@ -291,8 +291,8 @@ extern def Fl_Float_Input_set_when(self: Fl_Float_InputPtr, a1: int) extern def Fl_Float_Input_when(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_image(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_parent(self: Fl_Float_InputPtr) -> bytes -extern def Fl_Float_Input_selection_color(self: Fl_Float_InputPtr) -> t.CUInt32T -extern def Fl_Float_Input_set_selection_color(self: Fl_Float_InputPtr, color: t.CUInt32T) +extern def Fl_Float_Input_selection_color(self: Fl_Float_InputPtr) -> uint32 +extern def Fl_Float_Input_set_selection_color(self: Fl_Float_InputPtr, color: uint32) extern def Fl_Float_Input_do_callback(self: Fl_Float_InputPtr) extern def Fl_Float_Input_inside(self: Fl_Float_InputPtr, a1: bytes) -> int extern def Fl_Float_Input_window(self: Fl_Float_InputPtr) -> bytes @@ -303,15 +303,15 @@ extern def Fl_Float_Input_take_focus(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_set_visible_focus(self: Fl_Float_InputPtr) extern def Fl_Float_Input_clear_visible_focus(self: Fl_Float_InputPtr) extern def Fl_Float_Input_visible_focus(self: Fl_Float_InputPtr, v: int) -extern def Fl_Float_Input_has_visible_focus(self: Fl_Float_InputPtr) -> t.CUInt32T +extern def Fl_Float_Input_has_visible_focus(self: Fl_Float_InputPtr) -> uint32 extern def Fl_Float_Input_set_user_data(self: Fl_Float_InputPtr, data: bytes) extern def Fl_Float_Input_draw_data(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_handle_data(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_set_draw_data(self: Fl_Float_InputPtr, data: bytes) extern def Fl_Float_Input_set_handle_data(self: Fl_Float_InputPtr, data: bytes) -extern def Fl_Float_Input_damage(self: Fl_Float_InputPtr) -> t.CUInt8T -extern def Fl_Float_Input_set_damage(self: Fl_Float_InputPtr, flag: t.CUInt8T) -extern def Fl_Float_Input_set_damage_area(self: Fl_Float_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Float_Input_damage(self: Fl_Float_InputPtr) -> uint8 +extern def Fl_Float_Input_set_damage(self: Fl_Float_InputPtr, flag: uint8) +extern def Fl_Float_Input_set_damage_area(self: Fl_Float_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Float_Input_clear_damage(self: Fl_Float_InputPtr) extern def Fl_Float_Input_as_window(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_as_group(self: Fl_Float_InputPtr) -> bytes @@ -320,7 +320,7 @@ extern def Fl_Float_Input_deimage(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_set_callback(self: Fl_Float_InputPtr, a1: bytes, a2: bytes) extern def Fl_Float_Input_visible(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_visible_r(self: Fl_Float_InputPtr) -> int -extern def Fl_Float_Input_active(self: Fl_Float_InputPtr) -> t.CUInt32T +extern def Fl_Float_Input_active(self: Fl_Float_InputPtr) -> uint32 extern def Fl_Float_Input_active_r(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_callback(self: Fl_Float_InputPtr) -> bytes extern def Fl_Float_Input_set_deletion_callback(self: Fl_Float_InputPtr, cb1: bytes, data: bytes) @@ -345,12 +345,12 @@ extern def Fl_Float_Input_append(self: Fl_Float_InputPtr, t: str, l: int, keep_s extern def Fl_Float_Input_copy(self: Fl_Float_InputPtr, clipboard: int) -> int extern def Fl_Float_Input_undo(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_copy_cuts(self: Fl_Float_InputPtr) -> int -extern def Fl_Float_Input_cursor_color(self: Fl_Float_InputPtr) -> t.CUInt32T -extern def Fl_Float_Input_set_cursor_color(self: Fl_Float_InputPtr, s: t.CUInt32T) +extern def Fl_Float_Input_cursor_color(self: Fl_Float_InputPtr) -> uint32 +extern def Fl_Float_Input_set_cursor_color(self: Fl_Float_InputPtr, s: uint32) extern def Fl_Float_Input_text_font(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_set_text_font(self: Fl_Float_InputPtr, s: int) -extern def Fl_Float_Input_text_color(self: Fl_Float_InputPtr) -> t.CUInt32T -extern def Fl_Float_Input_set_text_color(self: Fl_Float_InputPtr, s: t.CUInt32T) +extern def Fl_Float_Input_text_color(self: Fl_Float_InputPtr) -> uint32 +extern def Fl_Float_Input_set_text_color(self: Fl_Float_InputPtr, s: uint32) extern def Fl_Float_Input_text_size(self: Fl_Float_InputPtr) -> int extern def Fl_Float_Input_set_text_size(self: Fl_Float_InputPtr, s: int) extern def Fl_Float_Input_readonly(self: Fl_Float_InputPtr) -> int @@ -380,11 +380,11 @@ extern def Fl_Multiline_Input_tooltip(self: Fl_Multiline_InputPtr) -> str extern def Fl_Multiline_Input_set_tooltip(self: Fl_Multiline_InputPtr, txt: str) extern def Fl_Multiline_Input_get_type(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_set_type(self: Fl_Multiline_InputPtr, typ: int) -extern def Fl_Multiline_Input_color(self: Fl_Multiline_InputPtr) -> t.CUInt32T -extern def Fl_Multiline_Input_set_color(self: Fl_Multiline_InputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Input_color(self: Fl_Multiline_InputPtr) -> uint32 +extern def Fl_Multiline_Input_set_color(self: Fl_Multiline_InputPtr, color: uint32) extern def Fl_Multiline_Input_measure_label(self: Fl_Multiline_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Multiline_Input_label_color(self: Fl_Multiline_InputPtr) -> t.CUInt32T -extern def Fl_Multiline_Input_set_label_color(self: Fl_Multiline_InputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Input_label_color(self: Fl_Multiline_InputPtr) -> uint32 +extern def Fl_Multiline_Input_set_label_color(self: Fl_Multiline_InputPtr, color: uint32) extern def Fl_Multiline_Input_label_font(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_set_label_font(self: Fl_Multiline_InputPtr, font: int) extern def Fl_Multiline_Input_label_size(self: Fl_Multiline_InputPtr) -> int @@ -408,8 +408,8 @@ extern def Fl_Multiline_Input_set_when(self: Fl_Multiline_InputPtr, a1: int) extern def Fl_Multiline_Input_when(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_image(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_parent(self: Fl_Multiline_InputPtr) -> bytes -extern def Fl_Multiline_Input_selection_color(self: Fl_Multiline_InputPtr) -> t.CUInt32T -extern def Fl_Multiline_Input_set_selection_color(self: Fl_Multiline_InputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Input_selection_color(self: Fl_Multiline_InputPtr) -> uint32 +extern def Fl_Multiline_Input_set_selection_color(self: Fl_Multiline_InputPtr, color: uint32) extern def Fl_Multiline_Input_do_callback(self: Fl_Multiline_InputPtr) extern def Fl_Multiline_Input_inside(self: Fl_Multiline_InputPtr, a1: bytes) -> int extern def Fl_Multiline_Input_window(self: Fl_Multiline_InputPtr) -> bytes @@ -420,15 +420,15 @@ extern def Fl_Multiline_Input_take_focus(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_set_visible_focus(self: Fl_Multiline_InputPtr) extern def Fl_Multiline_Input_clear_visible_focus(self: Fl_Multiline_InputPtr) extern def Fl_Multiline_Input_visible_focus(self: Fl_Multiline_InputPtr, v: int) -extern def Fl_Multiline_Input_has_visible_focus(self: Fl_Multiline_InputPtr) -> t.CUInt32T +extern def Fl_Multiline_Input_has_visible_focus(self: Fl_Multiline_InputPtr) -> uint32 extern def Fl_Multiline_Input_set_user_data(self: Fl_Multiline_InputPtr, data: bytes) extern def Fl_Multiline_Input_draw_data(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_handle_data(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_set_draw_data(self: Fl_Multiline_InputPtr, data: bytes) extern def Fl_Multiline_Input_set_handle_data(self: Fl_Multiline_InputPtr, data: bytes) -extern def Fl_Multiline_Input_damage(self: Fl_Multiline_InputPtr) -> t.CUInt8T -extern def Fl_Multiline_Input_set_damage(self: Fl_Multiline_InputPtr, flag: t.CUInt8T) -extern def Fl_Multiline_Input_set_damage_area(self: Fl_Multiline_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Multiline_Input_damage(self: Fl_Multiline_InputPtr) -> uint8 +extern def Fl_Multiline_Input_set_damage(self: Fl_Multiline_InputPtr, flag: uint8) +extern def Fl_Multiline_Input_set_damage_area(self: Fl_Multiline_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Multiline_Input_clear_damage(self: Fl_Multiline_InputPtr) extern def Fl_Multiline_Input_as_window(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_as_group(self: Fl_Multiline_InputPtr) -> bytes @@ -437,7 +437,7 @@ extern def Fl_Multiline_Input_deimage(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_set_callback(self: Fl_Multiline_InputPtr, a1: bytes, a2: bytes) extern def Fl_Multiline_Input_visible(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_visible_r(self: Fl_Multiline_InputPtr) -> int -extern def Fl_Multiline_Input_active(self: Fl_Multiline_InputPtr) -> t.CUInt32T +extern def Fl_Multiline_Input_active(self: Fl_Multiline_InputPtr) -> uint32 extern def Fl_Multiline_Input_active_r(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_callback(self: Fl_Multiline_InputPtr) -> bytes extern def Fl_Multiline_Input_set_deletion_callback(self: Fl_Multiline_InputPtr, cb1: bytes, data: bytes) @@ -462,12 +462,12 @@ extern def Fl_Multiline_Input_append(self: Fl_Multiline_InputPtr, t: str, l: int extern def Fl_Multiline_Input_copy(self: Fl_Multiline_InputPtr, clipboard: int) -> int extern def Fl_Multiline_Input_undo(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_copy_cuts(self: Fl_Multiline_InputPtr) -> int -extern def Fl_Multiline_Input_cursor_color(self: Fl_Multiline_InputPtr) -> t.CUInt32T -extern def Fl_Multiline_Input_set_cursor_color(self: Fl_Multiline_InputPtr, s: t.CUInt32T) +extern def Fl_Multiline_Input_cursor_color(self: Fl_Multiline_InputPtr) -> uint32 +extern def Fl_Multiline_Input_set_cursor_color(self: Fl_Multiline_InputPtr, s: uint32) extern def Fl_Multiline_Input_text_font(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_set_text_font(self: Fl_Multiline_InputPtr, s: int) -extern def Fl_Multiline_Input_text_color(self: Fl_Multiline_InputPtr) -> t.CUInt32T -extern def Fl_Multiline_Input_set_text_color(self: Fl_Multiline_InputPtr, s: t.CUInt32T) +extern def Fl_Multiline_Input_text_color(self: Fl_Multiline_InputPtr) -> uint32 +extern def Fl_Multiline_Input_set_text_color(self: Fl_Multiline_InputPtr, s: uint32) extern def Fl_Multiline_Input_text_size(self: Fl_Multiline_InputPtr) -> int extern def Fl_Multiline_Input_set_text_size(self: Fl_Multiline_InputPtr, s: int) extern def Fl_Multiline_Input_readonly(self: Fl_Multiline_InputPtr) -> int @@ -497,11 +497,11 @@ extern def Fl_Secret_Input_tooltip(self: Fl_Secret_InputPtr) -> str extern def Fl_Secret_Input_set_tooltip(self: Fl_Secret_InputPtr, txt: str) extern def Fl_Secret_Input_get_type(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_set_type(self: Fl_Secret_InputPtr, typ: int) -extern def Fl_Secret_Input_color(self: Fl_Secret_InputPtr) -> t.CUInt32T -extern def Fl_Secret_Input_set_color(self: Fl_Secret_InputPtr, color: t.CUInt32T) +extern def Fl_Secret_Input_color(self: Fl_Secret_InputPtr) -> uint32 +extern def Fl_Secret_Input_set_color(self: Fl_Secret_InputPtr, color: uint32) extern def Fl_Secret_Input_measure_label(self: Fl_Secret_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Secret_Input_label_color(self: Fl_Secret_InputPtr) -> t.CUInt32T -extern def Fl_Secret_Input_set_label_color(self: Fl_Secret_InputPtr, color: t.CUInt32T) +extern def Fl_Secret_Input_label_color(self: Fl_Secret_InputPtr) -> uint32 +extern def Fl_Secret_Input_set_label_color(self: Fl_Secret_InputPtr, color: uint32) extern def Fl_Secret_Input_label_font(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_set_label_font(self: Fl_Secret_InputPtr, font: int) extern def Fl_Secret_Input_label_size(self: Fl_Secret_InputPtr) -> int @@ -525,8 +525,8 @@ extern def Fl_Secret_Input_set_when(self: Fl_Secret_InputPtr, a1: int) extern def Fl_Secret_Input_when(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_image(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_parent(self: Fl_Secret_InputPtr) -> bytes -extern def Fl_Secret_Input_selection_color(self: Fl_Secret_InputPtr) -> t.CUInt32T -extern def Fl_Secret_Input_set_selection_color(self: Fl_Secret_InputPtr, color: t.CUInt32T) +extern def Fl_Secret_Input_selection_color(self: Fl_Secret_InputPtr) -> uint32 +extern def Fl_Secret_Input_set_selection_color(self: Fl_Secret_InputPtr, color: uint32) extern def Fl_Secret_Input_do_callback(self: Fl_Secret_InputPtr) extern def Fl_Secret_Input_inside(self: Fl_Secret_InputPtr, a1: bytes) -> int extern def Fl_Secret_Input_window(self: Fl_Secret_InputPtr) -> bytes @@ -537,15 +537,15 @@ extern def Fl_Secret_Input_take_focus(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_set_visible_focus(self: Fl_Secret_InputPtr) extern def Fl_Secret_Input_clear_visible_focus(self: Fl_Secret_InputPtr) extern def Fl_Secret_Input_visible_focus(self: Fl_Secret_InputPtr, v: int) -extern def Fl_Secret_Input_has_visible_focus(self: Fl_Secret_InputPtr) -> t.CUInt32T +extern def Fl_Secret_Input_has_visible_focus(self: Fl_Secret_InputPtr) -> uint32 extern def Fl_Secret_Input_set_user_data(self: Fl_Secret_InputPtr, data: bytes) extern def Fl_Secret_Input_draw_data(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_handle_data(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_set_draw_data(self: Fl_Secret_InputPtr, data: bytes) extern def Fl_Secret_Input_set_handle_data(self: Fl_Secret_InputPtr, data: bytes) -extern def Fl_Secret_Input_damage(self: Fl_Secret_InputPtr) -> t.CUInt8T -extern def Fl_Secret_Input_set_damage(self: Fl_Secret_InputPtr, flag: t.CUInt8T) -extern def Fl_Secret_Input_set_damage_area(self: Fl_Secret_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Secret_Input_damage(self: Fl_Secret_InputPtr) -> uint8 +extern def Fl_Secret_Input_set_damage(self: Fl_Secret_InputPtr, flag: uint8) +extern def Fl_Secret_Input_set_damage_area(self: Fl_Secret_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Secret_Input_clear_damage(self: Fl_Secret_InputPtr) extern def Fl_Secret_Input_as_window(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_as_group(self: Fl_Secret_InputPtr) -> bytes @@ -554,7 +554,7 @@ extern def Fl_Secret_Input_deimage(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_set_callback(self: Fl_Secret_InputPtr, a1: bytes, a2: bytes) extern def Fl_Secret_Input_visible(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_visible_r(self: Fl_Secret_InputPtr) -> int -extern def Fl_Secret_Input_active(self: Fl_Secret_InputPtr) -> t.CUInt32T +extern def Fl_Secret_Input_active(self: Fl_Secret_InputPtr) -> uint32 extern def Fl_Secret_Input_active_r(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_callback(self: Fl_Secret_InputPtr) -> bytes extern def Fl_Secret_Input_set_deletion_callback(self: Fl_Secret_InputPtr, cb1: bytes, data: bytes) @@ -579,12 +579,12 @@ extern def Fl_Secret_Input_append(self: Fl_Secret_InputPtr, t: str, l: int, keep extern def Fl_Secret_Input_copy(self: Fl_Secret_InputPtr, clipboard: int) -> int extern def Fl_Secret_Input_undo(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_copy_cuts(self: Fl_Secret_InputPtr) -> int -extern def Fl_Secret_Input_cursor_color(self: Fl_Secret_InputPtr) -> t.CUInt32T -extern def Fl_Secret_Input_set_cursor_color(self: Fl_Secret_InputPtr, s: t.CUInt32T) +extern def Fl_Secret_Input_cursor_color(self: Fl_Secret_InputPtr) -> uint32 +extern def Fl_Secret_Input_set_cursor_color(self: Fl_Secret_InputPtr, s: uint32) extern def Fl_Secret_Input_text_font(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_set_text_font(self: Fl_Secret_InputPtr, s: int) -extern def Fl_Secret_Input_text_color(self: Fl_Secret_InputPtr) -> t.CUInt32T -extern def Fl_Secret_Input_set_text_color(self: Fl_Secret_InputPtr, s: t.CUInt32T) +extern def Fl_Secret_Input_text_color(self: Fl_Secret_InputPtr) -> uint32 +extern def Fl_Secret_Input_set_text_color(self: Fl_Secret_InputPtr, s: uint32) extern def Fl_Secret_Input_text_size(self: Fl_Secret_InputPtr) -> int extern def Fl_Secret_Input_set_text_size(self: Fl_Secret_InputPtr, s: int) extern def Fl_Secret_Input_readonly(self: Fl_Secret_InputPtr) -> int @@ -614,11 +614,11 @@ extern def Fl_File_Input_tooltip(self: Fl_File_InputPtr) -> str extern def Fl_File_Input_set_tooltip(self: Fl_File_InputPtr, txt: str) extern def Fl_File_Input_get_type(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_set_type(self: Fl_File_InputPtr, typ: int) -extern def Fl_File_Input_color(self: Fl_File_InputPtr) -> t.CUInt32T -extern def Fl_File_Input_set_color(self: Fl_File_InputPtr, color: t.CUInt32T) +extern def Fl_File_Input_color(self: Fl_File_InputPtr) -> uint32 +extern def Fl_File_Input_set_color(self: Fl_File_InputPtr, color: uint32) extern def Fl_File_Input_measure_label(self: Fl_File_InputPtr, a1: bytes, a2: bytes) -extern def Fl_File_Input_label_color(self: Fl_File_InputPtr) -> t.CUInt32T -extern def Fl_File_Input_set_label_color(self: Fl_File_InputPtr, color: t.CUInt32T) +extern def Fl_File_Input_label_color(self: Fl_File_InputPtr) -> uint32 +extern def Fl_File_Input_set_label_color(self: Fl_File_InputPtr, color: uint32) extern def Fl_File_Input_label_font(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_set_label_font(self: Fl_File_InputPtr, font: int) extern def Fl_File_Input_label_size(self: Fl_File_InputPtr) -> int @@ -642,8 +642,8 @@ extern def Fl_File_Input_set_when(self: Fl_File_InputPtr, a1: int) extern def Fl_File_Input_when(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_image(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_parent(self: Fl_File_InputPtr) -> bytes -extern def Fl_File_Input_selection_color(self: Fl_File_InputPtr) -> t.CUInt32T -extern def Fl_File_Input_set_selection_color(self: Fl_File_InputPtr, color: t.CUInt32T) +extern def Fl_File_Input_selection_color(self: Fl_File_InputPtr) -> uint32 +extern def Fl_File_Input_set_selection_color(self: Fl_File_InputPtr, color: uint32) extern def Fl_File_Input_do_callback(self: Fl_File_InputPtr) extern def Fl_File_Input_inside(self: Fl_File_InputPtr, a1: bytes) -> int extern def Fl_File_Input_window(self: Fl_File_InputPtr) -> bytes @@ -654,15 +654,15 @@ extern def Fl_File_Input_take_focus(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_set_visible_focus(self: Fl_File_InputPtr) extern def Fl_File_Input_clear_visible_focus(self: Fl_File_InputPtr) extern def Fl_File_Input_visible_focus(self: Fl_File_InputPtr, v: int) -extern def Fl_File_Input_has_visible_focus(self: Fl_File_InputPtr) -> t.CUInt32T +extern def Fl_File_Input_has_visible_focus(self: Fl_File_InputPtr) -> uint32 extern def Fl_File_Input_set_user_data(self: Fl_File_InputPtr, data: bytes) extern def Fl_File_Input_draw_data(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_handle_data(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_set_draw_data(self: Fl_File_InputPtr, data: bytes) extern def Fl_File_Input_set_handle_data(self: Fl_File_InputPtr, data: bytes) -extern def Fl_File_Input_damage(self: Fl_File_InputPtr) -> t.CUInt8T -extern def Fl_File_Input_set_damage(self: Fl_File_InputPtr, flag: t.CUInt8T) -extern def Fl_File_Input_set_damage_area(self: Fl_File_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_File_Input_damage(self: Fl_File_InputPtr) -> uint8 +extern def Fl_File_Input_set_damage(self: Fl_File_InputPtr, flag: uint8) +extern def Fl_File_Input_set_damage_area(self: Fl_File_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_File_Input_clear_damage(self: Fl_File_InputPtr) extern def Fl_File_Input_as_window(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_as_group(self: Fl_File_InputPtr) -> bytes @@ -671,7 +671,7 @@ extern def Fl_File_Input_deimage(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_set_callback(self: Fl_File_InputPtr, a1: bytes, a2: bytes) extern def Fl_File_Input_visible(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_visible_r(self: Fl_File_InputPtr) -> int -extern def Fl_File_Input_active(self: Fl_File_InputPtr) -> t.CUInt32T +extern def Fl_File_Input_active(self: Fl_File_InputPtr) -> uint32 extern def Fl_File_Input_active_r(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_callback(self: Fl_File_InputPtr) -> bytes extern def Fl_File_Input_set_deletion_callback(self: Fl_File_InputPtr, cb1: bytes, data: bytes) @@ -696,12 +696,12 @@ extern def Fl_File_Input_append(self: Fl_File_InputPtr, t: str, l: int, keep_sel extern def Fl_File_Input_copy(self: Fl_File_InputPtr, clipboard: int) -> int extern def Fl_File_Input_undo(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_copy_cuts(self: Fl_File_InputPtr) -> int -extern def Fl_File_Input_cursor_color(self: Fl_File_InputPtr) -> t.CUInt32T -extern def Fl_File_Input_set_cursor_color(self: Fl_File_InputPtr, s: t.CUInt32T) +extern def Fl_File_Input_cursor_color(self: Fl_File_InputPtr) -> uint32 +extern def Fl_File_Input_set_cursor_color(self: Fl_File_InputPtr, s: uint32) extern def Fl_File_Input_text_font(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_set_text_font(self: Fl_File_InputPtr, s: int) -extern def Fl_File_Input_text_color(self: Fl_File_InputPtr) -> t.CUInt32T -extern def Fl_File_Input_set_text_color(self: Fl_File_InputPtr, s: t.CUInt32T) +extern def Fl_File_Input_text_color(self: Fl_File_InputPtr) -> uint32 +extern def Fl_File_Input_set_text_color(self: Fl_File_InputPtr, s: uint32) extern def Fl_File_Input_text_size(self: Fl_File_InputPtr) -> int extern def Fl_File_Input_set_text_size(self: Fl_File_InputPtr, s: int) extern def Fl_File_Input_readonly(self: Fl_File_InputPtr) -> int @@ -731,11 +731,11 @@ extern def Fl_Output_tooltip(self: Fl_OutputPtr) -> str extern def Fl_Output_set_tooltip(self: Fl_OutputPtr, txt: str) extern def Fl_Output_get_type(self: Fl_OutputPtr) -> int extern def Fl_Output_set_type(self: Fl_OutputPtr, typ: int) -extern def Fl_Output_color(self: Fl_OutputPtr) -> t.CUInt32T -extern def Fl_Output_set_color(self: Fl_OutputPtr, color: t.CUInt32T) +extern def Fl_Output_color(self: Fl_OutputPtr) -> uint32 +extern def Fl_Output_set_color(self: Fl_OutputPtr, color: uint32) extern def Fl_Output_measure_label(self: Fl_OutputPtr, a1: bytes, a2: bytes) -extern def Fl_Output_label_color(self: Fl_OutputPtr) -> t.CUInt32T -extern def Fl_Output_set_label_color(self: Fl_OutputPtr, color: t.CUInt32T) +extern def Fl_Output_label_color(self: Fl_OutputPtr) -> uint32 +extern def Fl_Output_set_label_color(self: Fl_OutputPtr, color: uint32) extern def Fl_Output_label_font(self: Fl_OutputPtr) -> int extern def Fl_Output_set_label_font(self: Fl_OutputPtr, font: int) extern def Fl_Output_label_size(self: Fl_OutputPtr) -> int @@ -759,8 +759,8 @@ extern def Fl_Output_set_when(self: Fl_OutputPtr, a1: int) extern def Fl_Output_when(self: Fl_OutputPtr) -> int extern def Fl_Output_image(self: Fl_OutputPtr) -> bytes extern def Fl_Output_parent(self: Fl_OutputPtr) -> bytes -extern def Fl_Output_selection_color(self: Fl_OutputPtr) -> t.CUInt32T -extern def Fl_Output_set_selection_color(self: Fl_OutputPtr, color: t.CUInt32T) +extern def Fl_Output_selection_color(self: Fl_OutputPtr) -> uint32 +extern def Fl_Output_set_selection_color(self: Fl_OutputPtr, color: uint32) extern def Fl_Output_do_callback(self: Fl_OutputPtr) extern def Fl_Output_inside(self: Fl_OutputPtr, a1: bytes) -> int extern def Fl_Output_window(self: Fl_OutputPtr) -> bytes @@ -771,15 +771,15 @@ extern def Fl_Output_take_focus(self: Fl_OutputPtr) -> int extern def Fl_Output_set_visible_focus(self: Fl_OutputPtr) extern def Fl_Output_clear_visible_focus(self: Fl_OutputPtr) extern def Fl_Output_visible_focus(self: Fl_OutputPtr, v: int) -extern def Fl_Output_has_visible_focus(self: Fl_OutputPtr) -> t.CUInt32T +extern def Fl_Output_has_visible_focus(self: Fl_OutputPtr) -> uint32 extern def Fl_Output_set_user_data(self: Fl_OutputPtr, data: bytes) extern def Fl_Output_draw_data(self: Fl_OutputPtr) -> bytes extern def Fl_Output_handle_data(self: Fl_OutputPtr) -> bytes extern def Fl_Output_set_draw_data(self: Fl_OutputPtr, data: bytes) extern def Fl_Output_set_handle_data(self: Fl_OutputPtr, data: bytes) -extern def Fl_Output_damage(self: Fl_OutputPtr) -> t.CUInt8T -extern def Fl_Output_set_damage(self: Fl_OutputPtr, flag: t.CUInt8T) -extern def Fl_Output_set_damage_area(self: Fl_OutputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Output_damage(self: Fl_OutputPtr) -> uint8 +extern def Fl_Output_set_damage(self: Fl_OutputPtr, flag: uint8) +extern def Fl_Output_set_damage_area(self: Fl_OutputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Output_clear_damage(self: Fl_OutputPtr) extern def Fl_Output_as_window(self: Fl_OutputPtr) -> bytes extern def Fl_Output_as_group(self: Fl_OutputPtr) -> bytes @@ -788,7 +788,7 @@ extern def Fl_Output_deimage(self: Fl_OutputPtr) -> bytes extern def Fl_Output_set_callback(self: Fl_OutputPtr, a1: bytes, a2: bytes) extern def Fl_Output_visible(self: Fl_OutputPtr) -> int extern def Fl_Output_visible_r(self: Fl_OutputPtr) -> int -extern def Fl_Output_active(self: Fl_OutputPtr) -> t.CUInt32T +extern def Fl_Output_active(self: Fl_OutputPtr) -> uint32 extern def Fl_Output_active_r(self: Fl_OutputPtr) -> int extern def Fl_Output_callback(self: Fl_OutputPtr) -> bytes extern def Fl_Output_set_deletion_callback(self: Fl_OutputPtr, cb1: bytes, data: bytes) @@ -813,12 +813,12 @@ extern def Fl_Output_append(self: Fl_OutputPtr, t: str, l: int, keep_selection: extern def Fl_Output_copy(self: Fl_OutputPtr, clipboard: int) -> int extern def Fl_Output_undo(self: Fl_OutputPtr) -> int extern def Fl_Output_copy_cuts(self: Fl_OutputPtr) -> int -extern def Fl_Output_cursor_color(self: Fl_OutputPtr) -> t.CUInt32T -extern def Fl_Output_set_cursor_color(self: Fl_OutputPtr, s: t.CUInt32T) +extern def Fl_Output_cursor_color(self: Fl_OutputPtr) -> uint32 +extern def Fl_Output_set_cursor_color(self: Fl_OutputPtr, s: uint32) extern def Fl_Output_text_font(self: Fl_OutputPtr) -> int extern def Fl_Output_set_text_font(self: Fl_OutputPtr, s: int) -extern def Fl_Output_text_color(self: Fl_OutputPtr) -> t.CUInt32T -extern def Fl_Output_set_text_color(self: Fl_OutputPtr, s: t.CUInt32T) +extern def Fl_Output_text_color(self: Fl_OutputPtr) -> uint32 +extern def Fl_Output_set_text_color(self: Fl_OutputPtr, s: uint32) extern def Fl_Output_text_size(self: Fl_OutputPtr) -> int extern def Fl_Output_set_text_size(self: Fl_OutputPtr, s: int) extern def Fl_Output_readonly(self: Fl_OutputPtr) -> int @@ -848,11 +848,11 @@ extern def Fl_Multiline_Output_tooltip(self: Fl_Multiline_OutputPtr) -> str extern def Fl_Multiline_Output_set_tooltip(self: Fl_Multiline_OutputPtr, txt: str) extern def Fl_Multiline_Output_get_type(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_set_type(self: Fl_Multiline_OutputPtr, typ: int) -extern def Fl_Multiline_Output_color(self: Fl_Multiline_OutputPtr) -> t.CUInt32T -extern def Fl_Multiline_Output_set_color(self: Fl_Multiline_OutputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Output_color(self: Fl_Multiline_OutputPtr) -> uint32 +extern def Fl_Multiline_Output_set_color(self: Fl_Multiline_OutputPtr, color: uint32) extern def Fl_Multiline_Output_measure_label(self: Fl_Multiline_OutputPtr, a1: bytes, a2: bytes) -extern def Fl_Multiline_Output_label_color(self: Fl_Multiline_OutputPtr) -> t.CUInt32T -extern def Fl_Multiline_Output_set_label_color(self: Fl_Multiline_OutputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Output_label_color(self: Fl_Multiline_OutputPtr) -> uint32 +extern def Fl_Multiline_Output_set_label_color(self: Fl_Multiline_OutputPtr, color: uint32) extern def Fl_Multiline_Output_label_font(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_set_label_font(self: Fl_Multiline_OutputPtr, font: int) extern def Fl_Multiline_Output_label_size(self: Fl_Multiline_OutputPtr) -> int @@ -876,8 +876,8 @@ extern def Fl_Multiline_Output_set_when(self: Fl_Multiline_OutputPtr, a1: int) extern def Fl_Multiline_Output_when(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_image(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_parent(self: Fl_Multiline_OutputPtr) -> bytes -extern def Fl_Multiline_Output_selection_color(self: Fl_Multiline_OutputPtr) -> t.CUInt32T -extern def Fl_Multiline_Output_set_selection_color(self: Fl_Multiline_OutputPtr, color: t.CUInt32T) +extern def Fl_Multiline_Output_selection_color(self: Fl_Multiline_OutputPtr) -> uint32 +extern def Fl_Multiline_Output_set_selection_color(self: Fl_Multiline_OutputPtr, color: uint32) extern def Fl_Multiline_Output_do_callback(self: Fl_Multiline_OutputPtr) extern def Fl_Multiline_Output_inside(self: Fl_Multiline_OutputPtr, a1: bytes) -> int extern def Fl_Multiline_Output_window(self: Fl_Multiline_OutputPtr) -> bytes @@ -888,15 +888,15 @@ extern def Fl_Multiline_Output_take_focus(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_set_visible_focus(self: Fl_Multiline_OutputPtr) extern def Fl_Multiline_Output_clear_visible_focus(self: Fl_Multiline_OutputPtr) extern def Fl_Multiline_Output_visible_focus(self: Fl_Multiline_OutputPtr, v: int) -extern def Fl_Multiline_Output_has_visible_focus(self: Fl_Multiline_OutputPtr) -> t.CUInt32T +extern def Fl_Multiline_Output_has_visible_focus(self: Fl_Multiline_OutputPtr) -> uint32 extern def Fl_Multiline_Output_set_user_data(self: Fl_Multiline_OutputPtr, data: bytes) extern def Fl_Multiline_Output_draw_data(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_handle_data(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_set_draw_data(self: Fl_Multiline_OutputPtr, data: bytes) extern def Fl_Multiline_Output_set_handle_data(self: Fl_Multiline_OutputPtr, data: bytes) -extern def Fl_Multiline_Output_damage(self: Fl_Multiline_OutputPtr) -> t.CUInt8T -extern def Fl_Multiline_Output_set_damage(self: Fl_Multiline_OutputPtr, flag: t.CUInt8T) -extern def Fl_Multiline_Output_set_damage_area(self: Fl_Multiline_OutputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Multiline_Output_damage(self: Fl_Multiline_OutputPtr) -> uint8 +extern def Fl_Multiline_Output_set_damage(self: Fl_Multiline_OutputPtr, flag: uint8) +extern def Fl_Multiline_Output_set_damage_area(self: Fl_Multiline_OutputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Multiline_Output_clear_damage(self: Fl_Multiline_OutputPtr) extern def Fl_Multiline_Output_as_window(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_as_group(self: Fl_Multiline_OutputPtr) -> bytes @@ -905,7 +905,7 @@ extern def Fl_Multiline_Output_deimage(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_set_callback(self: Fl_Multiline_OutputPtr, a1: bytes, a2: bytes) extern def Fl_Multiline_Output_visible(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_visible_r(self: Fl_Multiline_OutputPtr) -> int -extern def Fl_Multiline_Output_active(self: Fl_Multiline_OutputPtr) -> t.CUInt32T +extern def Fl_Multiline_Output_active(self: Fl_Multiline_OutputPtr) -> uint32 extern def Fl_Multiline_Output_active_r(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_callback(self: Fl_Multiline_OutputPtr) -> bytes extern def Fl_Multiline_Output_set_deletion_callback(self: Fl_Multiline_OutputPtr, cb1: bytes, data: bytes) @@ -930,12 +930,12 @@ extern def Fl_Multiline_Output_append(self: Fl_Multiline_OutputPtr, t: str, l: i extern def Fl_Multiline_Output_copy(self: Fl_Multiline_OutputPtr, clipboard: int) -> int extern def Fl_Multiline_Output_undo(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_copy_cuts(self: Fl_Multiline_OutputPtr) -> int -extern def Fl_Multiline_Output_cursor_color(self: Fl_Multiline_OutputPtr) -> t.CUInt32T -extern def Fl_Multiline_Output_set_cursor_color(self: Fl_Multiline_OutputPtr, s: t.CUInt32T) +extern def Fl_Multiline_Output_cursor_color(self: Fl_Multiline_OutputPtr) -> uint32 +extern def Fl_Multiline_Output_set_cursor_color(self: Fl_Multiline_OutputPtr, s: uint32) extern def Fl_Multiline_Output_text_font(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_set_text_font(self: Fl_Multiline_OutputPtr, s: int) -extern def Fl_Multiline_Output_text_color(self: Fl_Multiline_OutputPtr) -> t.CUInt32T -extern def Fl_Multiline_Output_set_text_color(self: Fl_Multiline_OutputPtr, s: t.CUInt32T) +extern def Fl_Multiline_Output_text_color(self: Fl_Multiline_OutputPtr) -> uint32 +extern def Fl_Multiline_Output_set_text_color(self: Fl_Multiline_OutputPtr, s: uint32) extern def Fl_Multiline_Output_text_size(self: Fl_Multiline_OutputPtr) -> int extern def Fl_Multiline_Output_set_text_size(self: Fl_Multiline_OutputPtr, s: int) extern def Fl_Multiline_Output_readonly(self: Fl_Multiline_OutputPtr) -> int diff --git a/fltk/_cfl_menu.vp b/fltk/_cfl_menu.vp index a43caf8..dd085c6 100644 --- a/fltk/_cfl_menu.vp +++ b/fltk/_cfl_menu.vp @@ -29,11 +29,11 @@ extern def Fl_Menu_Bar_tooltip(self: Fl_Menu_BarPtr) -> str extern def Fl_Menu_Bar_set_tooltip(self: Fl_Menu_BarPtr, txt: str) extern def Fl_Menu_Bar_get_type(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_set_type(self: Fl_Menu_BarPtr, typ: int) -extern def Fl_Menu_Bar_color(self: Fl_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Menu_Bar_set_color(self: Fl_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Menu_Bar_color(self: Fl_Menu_BarPtr) -> uint32 +extern def Fl_Menu_Bar_set_color(self: Fl_Menu_BarPtr, color: uint32) extern def Fl_Menu_Bar_measure_label(self: Fl_Menu_BarPtr, a1: bytes, a2: bytes) -extern def Fl_Menu_Bar_label_color(self: Fl_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Menu_Bar_set_label_color(self: Fl_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Menu_Bar_label_color(self: Fl_Menu_BarPtr) -> uint32 +extern def Fl_Menu_Bar_set_label_color(self: Fl_Menu_BarPtr, color: uint32) extern def Fl_Menu_Bar_label_font(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_set_label_font(self: Fl_Menu_BarPtr, font: int) extern def Fl_Menu_Bar_label_size(self: Fl_Menu_BarPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Menu_Bar_set_when(self: Fl_Menu_BarPtr, a1: int) extern def Fl_Menu_Bar_when(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_image(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_parent(self: Fl_Menu_BarPtr) -> bytes -extern def Fl_Menu_Bar_selection_color(self: Fl_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Menu_Bar_set_selection_color(self: Fl_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Menu_Bar_selection_color(self: Fl_Menu_BarPtr) -> uint32 +extern def Fl_Menu_Bar_set_selection_color(self: Fl_Menu_BarPtr, color: uint32) extern def Fl_Menu_Bar_do_callback(self: Fl_Menu_BarPtr) extern def Fl_Menu_Bar_inside(self: Fl_Menu_BarPtr, a1: bytes) -> int extern def Fl_Menu_Bar_window(self: Fl_Menu_BarPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Menu_Bar_take_focus(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_set_visible_focus(self: Fl_Menu_BarPtr) extern def Fl_Menu_Bar_clear_visible_focus(self: Fl_Menu_BarPtr) extern def Fl_Menu_Bar_visible_focus(self: Fl_Menu_BarPtr, v: int) -extern def Fl_Menu_Bar_has_visible_focus(self: Fl_Menu_BarPtr) -> t.CUInt32T +extern def Fl_Menu_Bar_has_visible_focus(self: Fl_Menu_BarPtr) -> uint32 extern def Fl_Menu_Bar_set_user_data(self: Fl_Menu_BarPtr, data: bytes) extern def Fl_Menu_Bar_draw_data(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_handle_data(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_set_draw_data(self: Fl_Menu_BarPtr, data: bytes) extern def Fl_Menu_Bar_set_handle_data(self: Fl_Menu_BarPtr, data: bytes) -extern def Fl_Menu_Bar_damage(self: Fl_Menu_BarPtr) -> t.CUInt8T -extern def Fl_Menu_Bar_set_damage(self: Fl_Menu_BarPtr, flag: t.CUInt8T) -extern def Fl_Menu_Bar_set_damage_area(self: Fl_Menu_BarPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Menu_Bar_damage(self: Fl_Menu_BarPtr) -> uint8 +extern def Fl_Menu_Bar_set_damage(self: Fl_Menu_BarPtr, flag: uint8) +extern def Fl_Menu_Bar_set_damage_area(self: Fl_Menu_BarPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Menu_Bar_clear_damage(self: Fl_Menu_BarPtr) extern def Fl_Menu_Bar_as_window(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_as_group(self: Fl_Menu_BarPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Menu_Bar_deimage(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_set_callback(self: Fl_Menu_BarPtr, a1: bytes, a2: bytes) extern def Fl_Menu_Bar_visible(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_visible_r(self: Fl_Menu_BarPtr) -> int -extern def Fl_Menu_Bar_active(self: Fl_Menu_BarPtr) -> t.CUInt32T +extern def Fl_Menu_Bar_active(self: Fl_Menu_BarPtr) -> uint32 extern def Fl_Menu_Bar_active_r(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_callback(self: Fl_Menu_BarPtr) -> bytes extern def Fl_Menu_Bar_set_deletion_callback(self: Fl_Menu_BarPtr, cb1: bytes, data: bytes) @@ -105,8 +105,8 @@ extern def Fl_Menu_Bar_text_font(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_set_text_font(self: Fl_Menu_BarPtr, c: int) extern def Fl_Menu_Bar_text_size(self: Fl_Menu_BarPtr) -> int extern def Fl_Menu_Bar_set_text_size(self: Fl_Menu_BarPtr, c: int) -extern def Fl_Menu_Bar_text_color(self: Fl_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Menu_Bar_set_text_color(self: Fl_Menu_BarPtr, c: t.CUInt32T) +extern def Fl_Menu_Bar_text_color(self: Fl_Menu_BarPtr) -> uint32 +extern def Fl_Menu_Bar_set_text_color(self: Fl_Menu_BarPtr, c: uint32) extern def Fl_Menu_Bar_add_choice(self: Fl_Menu_BarPtr, a1: str) -> int extern def Fl_Menu_Bar_get_choice(self: Fl_Menu_BarPtr) -> str extern def Fl_Menu_Bar_value(self: Fl_Menu_BarPtr) -> int @@ -151,11 +151,11 @@ extern def Fl_Menu_Button_tooltip(self: Fl_Menu_ButtonPtr) -> str extern def Fl_Menu_Button_set_tooltip(self: Fl_Menu_ButtonPtr, txt: str) extern def Fl_Menu_Button_get_type(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_set_type(self: Fl_Menu_ButtonPtr, typ: int) -extern def Fl_Menu_Button_color(self: Fl_Menu_ButtonPtr) -> t.CUInt32T -extern def Fl_Menu_Button_set_color(self: Fl_Menu_ButtonPtr, color: t.CUInt32T) +extern def Fl_Menu_Button_color(self: Fl_Menu_ButtonPtr) -> uint32 +extern def Fl_Menu_Button_set_color(self: Fl_Menu_ButtonPtr, color: uint32) extern def Fl_Menu_Button_measure_label(self: Fl_Menu_ButtonPtr, a1: bytes, a2: bytes) -extern def Fl_Menu_Button_label_color(self: Fl_Menu_ButtonPtr) -> t.CUInt32T -extern def Fl_Menu_Button_set_label_color(self: Fl_Menu_ButtonPtr, color: t.CUInt32T) +extern def Fl_Menu_Button_label_color(self: Fl_Menu_ButtonPtr) -> uint32 +extern def Fl_Menu_Button_set_label_color(self: Fl_Menu_ButtonPtr, color: uint32) extern def Fl_Menu_Button_label_font(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_set_label_font(self: Fl_Menu_ButtonPtr, font: int) extern def Fl_Menu_Button_label_size(self: Fl_Menu_ButtonPtr) -> int @@ -179,8 +179,8 @@ extern def Fl_Menu_Button_set_when(self: Fl_Menu_ButtonPtr, a1: int) extern def Fl_Menu_Button_when(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_image(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_parent(self: Fl_Menu_ButtonPtr) -> bytes -extern def Fl_Menu_Button_selection_color(self: Fl_Menu_ButtonPtr) -> t.CUInt32T -extern def Fl_Menu_Button_set_selection_color(self: Fl_Menu_ButtonPtr, color: t.CUInt32T) +extern def Fl_Menu_Button_selection_color(self: Fl_Menu_ButtonPtr) -> uint32 +extern def Fl_Menu_Button_set_selection_color(self: Fl_Menu_ButtonPtr, color: uint32) extern def Fl_Menu_Button_do_callback(self: Fl_Menu_ButtonPtr) extern def Fl_Menu_Button_inside(self: Fl_Menu_ButtonPtr, a1: bytes) -> int extern def Fl_Menu_Button_window(self: Fl_Menu_ButtonPtr) -> bytes @@ -191,15 +191,15 @@ extern def Fl_Menu_Button_take_focus(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_set_visible_focus(self: Fl_Menu_ButtonPtr) extern def Fl_Menu_Button_clear_visible_focus(self: Fl_Menu_ButtonPtr) extern def Fl_Menu_Button_visible_focus(self: Fl_Menu_ButtonPtr, v: int) -extern def Fl_Menu_Button_has_visible_focus(self: Fl_Menu_ButtonPtr) -> t.CUInt32T +extern def Fl_Menu_Button_has_visible_focus(self: Fl_Menu_ButtonPtr) -> uint32 extern def Fl_Menu_Button_set_user_data(self: Fl_Menu_ButtonPtr, data: bytes) extern def Fl_Menu_Button_draw_data(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_handle_data(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_set_draw_data(self: Fl_Menu_ButtonPtr, data: bytes) extern def Fl_Menu_Button_set_handle_data(self: Fl_Menu_ButtonPtr, data: bytes) -extern def Fl_Menu_Button_damage(self: Fl_Menu_ButtonPtr) -> t.CUInt8T -extern def Fl_Menu_Button_set_damage(self: Fl_Menu_ButtonPtr, flag: t.CUInt8T) -extern def Fl_Menu_Button_set_damage_area(self: Fl_Menu_ButtonPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Menu_Button_damage(self: Fl_Menu_ButtonPtr) -> uint8 +extern def Fl_Menu_Button_set_damage(self: Fl_Menu_ButtonPtr, flag: uint8) +extern def Fl_Menu_Button_set_damage_area(self: Fl_Menu_ButtonPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Menu_Button_clear_damage(self: Fl_Menu_ButtonPtr) extern def Fl_Menu_Button_as_window(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_as_group(self: Fl_Menu_ButtonPtr) -> bytes @@ -208,7 +208,7 @@ extern def Fl_Menu_Button_deimage(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_set_callback(self: Fl_Menu_ButtonPtr, a1: bytes, a2: bytes) extern def Fl_Menu_Button_visible(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_visible_r(self: Fl_Menu_ButtonPtr) -> int -extern def Fl_Menu_Button_active(self: Fl_Menu_ButtonPtr) -> t.CUInt32T +extern def Fl_Menu_Button_active(self: Fl_Menu_ButtonPtr) -> uint32 extern def Fl_Menu_Button_active_r(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_callback(self: Fl_Menu_ButtonPtr) -> bytes extern def Fl_Menu_Button_set_deletion_callback(self: Fl_Menu_ButtonPtr, cb1: bytes, data: bytes) @@ -227,8 +227,8 @@ extern def Fl_Menu_Button_text_font(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_set_text_font(self: Fl_Menu_ButtonPtr, c: int) extern def Fl_Menu_Button_text_size(self: Fl_Menu_ButtonPtr) -> int extern def Fl_Menu_Button_set_text_size(self: Fl_Menu_ButtonPtr, c: int) -extern def Fl_Menu_Button_text_color(self: Fl_Menu_ButtonPtr) -> t.CUInt32T -extern def Fl_Menu_Button_set_text_color(self: Fl_Menu_ButtonPtr, c: t.CUInt32T) +extern def Fl_Menu_Button_text_color(self: Fl_Menu_ButtonPtr) -> uint32 +extern def Fl_Menu_Button_set_text_color(self: Fl_Menu_ButtonPtr, c: uint32) extern def Fl_Menu_Button_add_choice(self: Fl_Menu_ButtonPtr, a1: str) -> int extern def Fl_Menu_Button_get_choice(self: Fl_Menu_ButtonPtr) -> str extern def Fl_Menu_Button_value(self: Fl_Menu_ButtonPtr) -> int @@ -273,11 +273,11 @@ extern def Fl_Choice_tooltip(self: Fl_ChoicePtr) -> str extern def Fl_Choice_set_tooltip(self: Fl_ChoicePtr, txt: str) extern def Fl_Choice_get_type(self: Fl_ChoicePtr) -> int extern def Fl_Choice_set_type(self: Fl_ChoicePtr, typ: int) -extern def Fl_Choice_color(self: Fl_ChoicePtr) -> t.CUInt32T -extern def Fl_Choice_set_color(self: Fl_ChoicePtr, color: t.CUInt32T) +extern def Fl_Choice_color(self: Fl_ChoicePtr) -> uint32 +extern def Fl_Choice_set_color(self: Fl_ChoicePtr, color: uint32) extern def Fl_Choice_measure_label(self: Fl_ChoicePtr, a1: bytes, a2: bytes) -extern def Fl_Choice_label_color(self: Fl_ChoicePtr) -> t.CUInt32T -extern def Fl_Choice_set_label_color(self: Fl_ChoicePtr, color: t.CUInt32T) +extern def Fl_Choice_label_color(self: Fl_ChoicePtr) -> uint32 +extern def Fl_Choice_set_label_color(self: Fl_ChoicePtr, color: uint32) extern def Fl_Choice_label_font(self: Fl_ChoicePtr) -> int extern def Fl_Choice_set_label_font(self: Fl_ChoicePtr, font: int) extern def Fl_Choice_label_size(self: Fl_ChoicePtr) -> int @@ -301,8 +301,8 @@ extern def Fl_Choice_set_when(self: Fl_ChoicePtr, a1: int) extern def Fl_Choice_when(self: Fl_ChoicePtr) -> int extern def Fl_Choice_image(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_parent(self: Fl_ChoicePtr) -> bytes -extern def Fl_Choice_selection_color(self: Fl_ChoicePtr) -> t.CUInt32T -extern def Fl_Choice_set_selection_color(self: Fl_ChoicePtr, color: t.CUInt32T) +extern def Fl_Choice_selection_color(self: Fl_ChoicePtr) -> uint32 +extern def Fl_Choice_set_selection_color(self: Fl_ChoicePtr, color: uint32) extern def Fl_Choice_do_callback(self: Fl_ChoicePtr) extern def Fl_Choice_inside(self: Fl_ChoicePtr, a1: bytes) -> int extern def Fl_Choice_window(self: Fl_ChoicePtr) -> bytes @@ -313,15 +313,15 @@ extern def Fl_Choice_take_focus(self: Fl_ChoicePtr) -> int extern def Fl_Choice_set_visible_focus(self: Fl_ChoicePtr) extern def Fl_Choice_clear_visible_focus(self: Fl_ChoicePtr) extern def Fl_Choice_visible_focus(self: Fl_ChoicePtr, v: int) -extern def Fl_Choice_has_visible_focus(self: Fl_ChoicePtr) -> t.CUInt32T +extern def Fl_Choice_has_visible_focus(self: Fl_ChoicePtr) -> uint32 extern def Fl_Choice_set_user_data(self: Fl_ChoicePtr, data: bytes) extern def Fl_Choice_draw_data(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_handle_data(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_set_draw_data(self: Fl_ChoicePtr, data: bytes) extern def Fl_Choice_set_handle_data(self: Fl_ChoicePtr, data: bytes) -extern def Fl_Choice_damage(self: Fl_ChoicePtr) -> t.CUInt8T -extern def Fl_Choice_set_damage(self: Fl_ChoicePtr, flag: t.CUInt8T) -extern def Fl_Choice_set_damage_area(self: Fl_ChoicePtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Choice_damage(self: Fl_ChoicePtr) -> uint8 +extern def Fl_Choice_set_damage(self: Fl_ChoicePtr, flag: uint8) +extern def Fl_Choice_set_damage_area(self: Fl_ChoicePtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Choice_clear_damage(self: Fl_ChoicePtr) extern def Fl_Choice_as_window(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_as_group(self: Fl_ChoicePtr) -> bytes @@ -330,7 +330,7 @@ extern def Fl_Choice_deimage(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_set_callback(self: Fl_ChoicePtr, a1: bytes, a2: bytes) extern def Fl_Choice_visible(self: Fl_ChoicePtr) -> int extern def Fl_Choice_visible_r(self: Fl_ChoicePtr) -> int -extern def Fl_Choice_active(self: Fl_ChoicePtr) -> t.CUInt32T +extern def Fl_Choice_active(self: Fl_ChoicePtr) -> uint32 extern def Fl_Choice_active_r(self: Fl_ChoicePtr) -> int extern def Fl_Choice_callback(self: Fl_ChoicePtr) -> bytes extern def Fl_Choice_set_deletion_callback(self: Fl_ChoicePtr, cb1: bytes, data: bytes) @@ -349,8 +349,8 @@ extern def Fl_Choice_text_font(self: Fl_ChoicePtr) -> int extern def Fl_Choice_set_text_font(self: Fl_ChoicePtr, c: int) extern def Fl_Choice_text_size(self: Fl_ChoicePtr) -> int extern def Fl_Choice_set_text_size(self: Fl_ChoicePtr, c: int) -extern def Fl_Choice_text_color(self: Fl_ChoicePtr) -> t.CUInt32T -extern def Fl_Choice_set_text_color(self: Fl_ChoicePtr, c: t.CUInt32T) +extern def Fl_Choice_text_color(self: Fl_ChoicePtr) -> uint32 +extern def Fl_Choice_set_text_color(self: Fl_ChoicePtr, c: uint32) extern def Fl_Choice_add_choice(self: Fl_ChoicePtr, a1: str) -> int extern def Fl_Choice_get_choice(self: Fl_ChoicePtr) -> str extern def Fl_Choice_value(self: Fl_ChoicePtr) -> int @@ -395,11 +395,11 @@ extern def Fl_Sys_Menu_Bar_tooltip(self: Fl_Sys_Menu_BarPtr) -> str extern def Fl_Sys_Menu_Bar_set_tooltip(self: Fl_Sys_Menu_BarPtr, txt: str) extern def Fl_Sys_Menu_Bar_get_type(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_set_type(self: Fl_Sys_Menu_BarPtr, typ: int) -extern def Fl_Sys_Menu_Bar_color(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Sys_Menu_Bar_set_color(self: Fl_Sys_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Sys_Menu_Bar_color(self: Fl_Sys_Menu_BarPtr) -> uint32 +extern def Fl_Sys_Menu_Bar_set_color(self: Fl_Sys_Menu_BarPtr, color: uint32) extern def Fl_Sys_Menu_Bar_measure_label(self: Fl_Sys_Menu_BarPtr, a1: bytes, a2: bytes) -extern def Fl_Sys_Menu_Bar_label_color(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Sys_Menu_Bar_set_label_color(self: Fl_Sys_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Sys_Menu_Bar_label_color(self: Fl_Sys_Menu_BarPtr) -> uint32 +extern def Fl_Sys_Menu_Bar_set_label_color(self: Fl_Sys_Menu_BarPtr, color: uint32) extern def Fl_Sys_Menu_Bar_label_font(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_set_label_font(self: Fl_Sys_Menu_BarPtr, font: int) extern def Fl_Sys_Menu_Bar_label_size(self: Fl_Sys_Menu_BarPtr) -> int @@ -423,8 +423,8 @@ extern def Fl_Sys_Menu_Bar_set_when(self: Fl_Sys_Menu_BarPtr, a1: int) extern def Fl_Sys_Menu_Bar_when(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_image(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_parent(self: Fl_Sys_Menu_BarPtr) -> bytes -extern def Fl_Sys_Menu_Bar_selection_color(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Sys_Menu_Bar_set_selection_color(self: Fl_Sys_Menu_BarPtr, color: t.CUInt32T) +extern def Fl_Sys_Menu_Bar_selection_color(self: Fl_Sys_Menu_BarPtr) -> uint32 +extern def Fl_Sys_Menu_Bar_set_selection_color(self: Fl_Sys_Menu_BarPtr, color: uint32) extern def Fl_Sys_Menu_Bar_do_callback(self: Fl_Sys_Menu_BarPtr) extern def Fl_Sys_Menu_Bar_inside(self: Fl_Sys_Menu_BarPtr, a1: bytes) -> int extern def Fl_Sys_Menu_Bar_window(self: Fl_Sys_Menu_BarPtr) -> bytes @@ -435,15 +435,15 @@ extern def Fl_Sys_Menu_Bar_take_focus(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_set_visible_focus(self: Fl_Sys_Menu_BarPtr) extern def Fl_Sys_Menu_Bar_clear_visible_focus(self: Fl_Sys_Menu_BarPtr) extern def Fl_Sys_Menu_Bar_visible_focus(self: Fl_Sys_Menu_BarPtr, v: int) -extern def Fl_Sys_Menu_Bar_has_visible_focus(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T +extern def Fl_Sys_Menu_Bar_has_visible_focus(self: Fl_Sys_Menu_BarPtr) -> uint32 extern def Fl_Sys_Menu_Bar_set_user_data(self: Fl_Sys_Menu_BarPtr, data: bytes) extern def Fl_Sys_Menu_Bar_draw_data(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_handle_data(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_set_draw_data(self: Fl_Sys_Menu_BarPtr, data: bytes) extern def Fl_Sys_Menu_Bar_set_handle_data(self: Fl_Sys_Menu_BarPtr, data: bytes) -extern def Fl_Sys_Menu_Bar_damage(self: Fl_Sys_Menu_BarPtr) -> t.CUInt8T -extern def Fl_Sys_Menu_Bar_set_damage(self: Fl_Sys_Menu_BarPtr, flag: t.CUInt8T) -extern def Fl_Sys_Menu_Bar_set_damage_area(self: Fl_Sys_Menu_BarPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Sys_Menu_Bar_damage(self: Fl_Sys_Menu_BarPtr) -> uint8 +extern def Fl_Sys_Menu_Bar_set_damage(self: Fl_Sys_Menu_BarPtr, flag: uint8) +extern def Fl_Sys_Menu_Bar_set_damage_area(self: Fl_Sys_Menu_BarPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Sys_Menu_Bar_clear_damage(self: Fl_Sys_Menu_BarPtr) extern def Fl_Sys_Menu_Bar_as_window(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_as_group(self: Fl_Sys_Menu_BarPtr) -> bytes @@ -452,7 +452,7 @@ extern def Fl_Sys_Menu_Bar_deimage(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_set_callback(self: Fl_Sys_Menu_BarPtr, a1: bytes, a2: bytes) extern def Fl_Sys_Menu_Bar_visible(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_visible_r(self: Fl_Sys_Menu_BarPtr) -> int -extern def Fl_Sys_Menu_Bar_active(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T +extern def Fl_Sys_Menu_Bar_active(self: Fl_Sys_Menu_BarPtr) -> uint32 extern def Fl_Sys_Menu_Bar_active_r(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_callback(self: Fl_Sys_Menu_BarPtr) -> bytes extern def Fl_Sys_Menu_Bar_set_deletion_callback(self: Fl_Sys_Menu_BarPtr, cb1: bytes, data: bytes) @@ -471,8 +471,8 @@ extern def Fl_Sys_Menu_Bar_text_font(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_set_text_font(self: Fl_Sys_Menu_BarPtr, c: int) extern def Fl_Sys_Menu_Bar_text_size(self: Fl_Sys_Menu_BarPtr) -> int extern def Fl_Sys_Menu_Bar_set_text_size(self: Fl_Sys_Menu_BarPtr, c: int) -extern def Fl_Sys_Menu_Bar_text_color(self: Fl_Sys_Menu_BarPtr) -> t.CUInt32T -extern def Fl_Sys_Menu_Bar_set_text_color(self: Fl_Sys_Menu_BarPtr, c: t.CUInt32T) +extern def Fl_Sys_Menu_Bar_text_color(self: Fl_Sys_Menu_BarPtr) -> uint32 +extern def Fl_Sys_Menu_Bar_set_text_color(self: Fl_Sys_Menu_BarPtr, c: uint32) extern def Fl_Sys_Menu_Bar_add_choice(self: Fl_Sys_Menu_BarPtr, a1: str) -> int extern def Fl_Sys_Menu_Bar_get_choice(self: Fl_Sys_Menu_BarPtr) -> str extern def Fl_Sys_Menu_Bar_value(self: Fl_Sys_Menu_BarPtr) -> int @@ -509,8 +509,8 @@ extern def Fl_Menu_Item_label(a0: Fl_Menu_ItemPtr) -> str extern def Fl_Menu_Item_set_label(a0: Fl_Menu_ItemPtr, a: str) extern def Fl_Menu_Item_label_type(a0: Fl_Menu_ItemPtr) -> int extern def Fl_Menu_Item_set_label_type(a0: Fl_Menu_ItemPtr, a: int) -extern def Fl_Menu_Item_label_color(a0: Fl_Menu_ItemPtr) -> t.CUInt32T -extern def Fl_Menu_Item_set_label_color(a0: Fl_Menu_ItemPtr, a: t.CUInt32T) +extern def Fl_Menu_Item_label_color(a0: Fl_Menu_ItemPtr) -> uint32 +extern def Fl_Menu_Item_set_label_color(a0: Fl_Menu_ItemPtr, a: uint32) extern def Fl_Menu_Item_label_font(a0: Fl_Menu_ItemPtr) -> int extern def Fl_Menu_Item_set_label_font(a0: Fl_Menu_ItemPtr, a: int) extern def Fl_Menu_Item_label_size(a0: Fl_Menu_ItemPtr) -> int diff --git a/fltk/_cfl_misc.vp b/fltk/_cfl_misc.vp index b2624a2..8c282bc 100644 --- a/fltk/_cfl_misc.vp +++ b/fltk/_cfl_misc.vp @@ -29,11 +29,11 @@ extern def Fl_Spinner_tooltip(self: Fl_SpinnerPtr) -> str extern def Fl_Spinner_set_tooltip(self: Fl_SpinnerPtr, txt: str) extern def Fl_Spinner_get_type(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_type(self: Fl_SpinnerPtr, typ: int) -extern def Fl_Spinner_color(self: Fl_SpinnerPtr) -> t.CUInt32T -extern def Fl_Spinner_set_color(self: Fl_SpinnerPtr, color: t.CUInt32T) +extern def Fl_Spinner_color(self: Fl_SpinnerPtr) -> uint32 +extern def Fl_Spinner_set_color(self: Fl_SpinnerPtr, color: uint32) extern def Fl_Spinner_measure_label(self: Fl_SpinnerPtr, a1: bytes, a2: bytes) -extern def Fl_Spinner_label_color(self: Fl_SpinnerPtr) -> t.CUInt32T -extern def Fl_Spinner_set_label_color(self: Fl_SpinnerPtr, color: t.CUInt32T) +extern def Fl_Spinner_label_color(self: Fl_SpinnerPtr) -> uint32 +extern def Fl_Spinner_set_label_color(self: Fl_SpinnerPtr, color: uint32) extern def Fl_Spinner_label_font(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_label_font(self: Fl_SpinnerPtr, font: int) extern def Fl_Spinner_label_size(self: Fl_SpinnerPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Spinner_set_when(self: Fl_SpinnerPtr, a1: int) extern def Fl_Spinner_when(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_image(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_parent(self: Fl_SpinnerPtr) -> bytes -extern def Fl_Spinner_selection_color(self: Fl_SpinnerPtr) -> t.CUInt32T -extern def Fl_Spinner_set_selection_color(self: Fl_SpinnerPtr, color: t.CUInt32T) +extern def Fl_Spinner_selection_color(self: Fl_SpinnerPtr) -> uint32 +extern def Fl_Spinner_set_selection_color(self: Fl_SpinnerPtr, color: uint32) extern def Fl_Spinner_do_callback(self: Fl_SpinnerPtr) extern def Fl_Spinner_inside(self: Fl_SpinnerPtr, a1: bytes) -> int extern def Fl_Spinner_window(self: Fl_SpinnerPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Spinner_take_focus(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_visible_focus(self: Fl_SpinnerPtr) extern def Fl_Spinner_clear_visible_focus(self: Fl_SpinnerPtr) extern def Fl_Spinner_visible_focus(self: Fl_SpinnerPtr, v: int) -extern def Fl_Spinner_has_visible_focus(self: Fl_SpinnerPtr) -> t.CUInt32T +extern def Fl_Spinner_has_visible_focus(self: Fl_SpinnerPtr) -> uint32 extern def Fl_Spinner_set_user_data(self: Fl_SpinnerPtr, data: bytes) extern def Fl_Spinner_draw_data(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_handle_data(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_set_draw_data(self: Fl_SpinnerPtr, data: bytes) extern def Fl_Spinner_set_handle_data(self: Fl_SpinnerPtr, data: bytes) -extern def Fl_Spinner_damage(self: Fl_SpinnerPtr) -> t.CUInt8T -extern def Fl_Spinner_set_damage(self: Fl_SpinnerPtr, flag: t.CUInt8T) -extern def Fl_Spinner_set_damage_area(self: Fl_SpinnerPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Spinner_damage(self: Fl_SpinnerPtr) -> uint8 +extern def Fl_Spinner_set_damage(self: Fl_SpinnerPtr, flag: uint8) +extern def Fl_Spinner_set_damage_area(self: Fl_SpinnerPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Spinner_clear_damage(self: Fl_SpinnerPtr) extern def Fl_Spinner_as_window(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_as_group(self: Fl_SpinnerPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Spinner_deimage(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_set_callback(self: Fl_SpinnerPtr, a1: bytes, a2: bytes) extern def Fl_Spinner_visible(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_visible_r(self: Fl_SpinnerPtr) -> int -extern def Fl_Spinner_active(self: Fl_SpinnerPtr) -> t.CUInt32T +extern def Fl_Spinner_active(self: Fl_SpinnerPtr) -> uint32 extern def Fl_Spinner_active_r(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_callback(self: Fl_SpinnerPtr) -> bytes extern def Fl_Spinner_set_deletion_callback(self: Fl_SpinnerPtr, cb1: bytes, data: bytes) @@ -116,11 +116,11 @@ extern def Fl_Clock_tooltip(self: Fl_ClockPtr) -> str extern def Fl_Clock_set_tooltip(self: Fl_ClockPtr, txt: str) extern def Fl_Clock_get_type(self: Fl_ClockPtr) -> int extern def Fl_Clock_set_type(self: Fl_ClockPtr, typ: int) -extern def Fl_Clock_color(self: Fl_ClockPtr) -> t.CUInt32T -extern def Fl_Clock_set_color(self: Fl_ClockPtr, color: t.CUInt32T) +extern def Fl_Clock_color(self: Fl_ClockPtr) -> uint32 +extern def Fl_Clock_set_color(self: Fl_ClockPtr, color: uint32) extern def Fl_Clock_measure_label(self: Fl_ClockPtr, a1: bytes, a2: bytes) -extern def Fl_Clock_label_color(self: Fl_ClockPtr) -> t.CUInt32T -extern def Fl_Clock_set_label_color(self: Fl_ClockPtr, color: t.CUInt32T) +extern def Fl_Clock_label_color(self: Fl_ClockPtr) -> uint32 +extern def Fl_Clock_set_label_color(self: Fl_ClockPtr, color: uint32) extern def Fl_Clock_label_font(self: Fl_ClockPtr) -> int extern def Fl_Clock_set_label_font(self: Fl_ClockPtr, font: int) extern def Fl_Clock_label_size(self: Fl_ClockPtr) -> int @@ -144,8 +144,8 @@ extern def Fl_Clock_set_when(self: Fl_ClockPtr, a1: int) extern def Fl_Clock_when(self: Fl_ClockPtr) -> int extern def Fl_Clock_image(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_parent(self: Fl_ClockPtr) -> bytes -extern def Fl_Clock_selection_color(self: Fl_ClockPtr) -> t.CUInt32T -extern def Fl_Clock_set_selection_color(self: Fl_ClockPtr, color: t.CUInt32T) +extern def Fl_Clock_selection_color(self: Fl_ClockPtr) -> uint32 +extern def Fl_Clock_set_selection_color(self: Fl_ClockPtr, color: uint32) extern def Fl_Clock_do_callback(self: Fl_ClockPtr) extern def Fl_Clock_inside(self: Fl_ClockPtr, a1: bytes) -> int extern def Fl_Clock_window(self: Fl_ClockPtr) -> bytes @@ -156,15 +156,15 @@ extern def Fl_Clock_take_focus(self: Fl_ClockPtr) -> int extern def Fl_Clock_set_visible_focus(self: Fl_ClockPtr) extern def Fl_Clock_clear_visible_focus(self: Fl_ClockPtr) extern def Fl_Clock_visible_focus(self: Fl_ClockPtr, v: int) -extern def Fl_Clock_has_visible_focus(self: Fl_ClockPtr) -> t.CUInt32T +extern def Fl_Clock_has_visible_focus(self: Fl_ClockPtr) -> uint32 extern def Fl_Clock_set_user_data(self: Fl_ClockPtr, data: bytes) extern def Fl_Clock_draw_data(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_handle_data(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_set_draw_data(self: Fl_ClockPtr, data: bytes) extern def Fl_Clock_set_handle_data(self: Fl_ClockPtr, data: bytes) -extern def Fl_Clock_damage(self: Fl_ClockPtr) -> t.CUInt8T -extern def Fl_Clock_set_damage(self: Fl_ClockPtr, flag: t.CUInt8T) -extern def Fl_Clock_set_damage_area(self: Fl_ClockPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Clock_damage(self: Fl_ClockPtr) -> uint8 +extern def Fl_Clock_set_damage(self: Fl_ClockPtr, flag: uint8) +extern def Fl_Clock_set_damage_area(self: Fl_ClockPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Clock_clear_damage(self: Fl_ClockPtr) extern def Fl_Clock_as_window(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_as_group(self: Fl_ClockPtr) -> bytes @@ -173,7 +173,7 @@ extern def Fl_Clock_deimage(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_set_callback(self: Fl_ClockPtr, a1: bytes, a2: bytes) extern def Fl_Clock_visible(self: Fl_ClockPtr) -> int extern def Fl_Clock_visible_r(self: Fl_ClockPtr) -> int -extern def Fl_Clock_active(self: Fl_ClockPtr) -> t.CUInt32T +extern def Fl_Clock_active(self: Fl_ClockPtr) -> uint32 extern def Fl_Clock_active_r(self: Fl_ClockPtr) -> int extern def Fl_Clock_callback(self: Fl_ClockPtr) -> bytes extern def Fl_Clock_set_deletion_callback(self: Fl_ClockPtr, cb1: bytes, data: bytes) @@ -203,11 +203,11 @@ extern def Fl_Chart_tooltip(self: Fl_ChartPtr) -> str extern def Fl_Chart_set_tooltip(self: Fl_ChartPtr, txt: str) extern def Fl_Chart_get_type(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_type(self: Fl_ChartPtr, typ: int) -extern def Fl_Chart_color(self: Fl_ChartPtr) -> t.CUInt32T -extern def Fl_Chart_set_color(self: Fl_ChartPtr, color: t.CUInt32T) +extern def Fl_Chart_color(self: Fl_ChartPtr) -> uint32 +extern def Fl_Chart_set_color(self: Fl_ChartPtr, color: uint32) extern def Fl_Chart_measure_label(self: Fl_ChartPtr, a1: bytes, a2: bytes) -extern def Fl_Chart_label_color(self: Fl_ChartPtr) -> t.CUInt32T -extern def Fl_Chart_set_label_color(self: Fl_ChartPtr, color: t.CUInt32T) +extern def Fl_Chart_label_color(self: Fl_ChartPtr) -> uint32 +extern def Fl_Chart_set_label_color(self: Fl_ChartPtr, color: uint32) extern def Fl_Chart_label_font(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_label_font(self: Fl_ChartPtr, font: int) extern def Fl_Chart_label_size(self: Fl_ChartPtr) -> int @@ -231,8 +231,8 @@ extern def Fl_Chart_set_when(self: Fl_ChartPtr, a1: int) extern def Fl_Chart_when(self: Fl_ChartPtr) -> int extern def Fl_Chart_image(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_parent(self: Fl_ChartPtr) -> bytes -extern def Fl_Chart_selection_color(self: Fl_ChartPtr) -> t.CUInt32T -extern def Fl_Chart_set_selection_color(self: Fl_ChartPtr, color: t.CUInt32T) +extern def Fl_Chart_selection_color(self: Fl_ChartPtr) -> uint32 +extern def Fl_Chart_set_selection_color(self: Fl_ChartPtr, color: uint32) extern def Fl_Chart_do_callback(self: Fl_ChartPtr) extern def Fl_Chart_inside(self: Fl_ChartPtr, a1: bytes) -> int extern def Fl_Chart_window(self: Fl_ChartPtr) -> bytes @@ -243,15 +243,15 @@ extern def Fl_Chart_take_focus(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_visible_focus(self: Fl_ChartPtr) extern def Fl_Chart_clear_visible_focus(self: Fl_ChartPtr) extern def Fl_Chart_visible_focus(self: Fl_ChartPtr, v: int) -extern def Fl_Chart_has_visible_focus(self: Fl_ChartPtr) -> t.CUInt32T +extern def Fl_Chart_has_visible_focus(self: Fl_ChartPtr) -> uint32 extern def Fl_Chart_set_user_data(self: Fl_ChartPtr, data: bytes) extern def Fl_Chart_draw_data(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_handle_data(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_set_draw_data(self: Fl_ChartPtr, data: bytes) extern def Fl_Chart_set_handle_data(self: Fl_ChartPtr, data: bytes) -extern def Fl_Chart_damage(self: Fl_ChartPtr) -> t.CUInt8T -extern def Fl_Chart_set_damage(self: Fl_ChartPtr, flag: t.CUInt8T) -extern def Fl_Chart_set_damage_area(self: Fl_ChartPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Chart_damage(self: Fl_ChartPtr) -> uint8 +extern def Fl_Chart_set_damage(self: Fl_ChartPtr, flag: uint8) +extern def Fl_Chart_set_damage_area(self: Fl_ChartPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Chart_clear_damage(self: Fl_ChartPtr) extern def Fl_Chart_as_window(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_as_group(self: Fl_ChartPtr) -> bytes @@ -260,7 +260,7 @@ extern def Fl_Chart_deimage(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_set_callback(self: Fl_ChartPtr, a1: bytes, a2: bytes) extern def Fl_Chart_visible(self: Fl_ChartPtr) -> int extern def Fl_Chart_visible_r(self: Fl_ChartPtr) -> int -extern def Fl_Chart_active(self: Fl_ChartPtr) -> t.CUInt32T +extern def Fl_Chart_active(self: Fl_ChartPtr) -> uint32 extern def Fl_Chart_active_r(self: Fl_ChartPtr) -> int extern def Fl_Chart_callback(self: Fl_ChartPtr) -> bytes extern def Fl_Chart_set_deletion_callback(self: Fl_ChartPtr, cb1: bytes, data: bytes) @@ -290,11 +290,11 @@ extern def Fl_Progress_tooltip(self: Fl_ProgressPtr) -> str extern def Fl_Progress_set_tooltip(self: Fl_ProgressPtr, txt: str) extern def Fl_Progress_get_type(self: Fl_ProgressPtr) -> int extern def Fl_Progress_set_type(self: Fl_ProgressPtr, typ: int) -extern def Fl_Progress_color(self: Fl_ProgressPtr) -> t.CUInt32T -extern def Fl_Progress_set_color(self: Fl_ProgressPtr, color: t.CUInt32T) +extern def Fl_Progress_color(self: Fl_ProgressPtr) -> uint32 +extern def Fl_Progress_set_color(self: Fl_ProgressPtr, color: uint32) extern def Fl_Progress_measure_label(self: Fl_ProgressPtr, a1: bytes, a2: bytes) -extern def Fl_Progress_label_color(self: Fl_ProgressPtr) -> t.CUInt32T -extern def Fl_Progress_set_label_color(self: Fl_ProgressPtr, color: t.CUInt32T) +extern def Fl_Progress_label_color(self: Fl_ProgressPtr) -> uint32 +extern def Fl_Progress_set_label_color(self: Fl_ProgressPtr, color: uint32) extern def Fl_Progress_label_font(self: Fl_ProgressPtr) -> int extern def Fl_Progress_set_label_font(self: Fl_ProgressPtr, font: int) extern def Fl_Progress_label_size(self: Fl_ProgressPtr) -> int @@ -318,8 +318,8 @@ extern def Fl_Progress_set_when(self: Fl_ProgressPtr, a1: int) extern def Fl_Progress_when(self: Fl_ProgressPtr) -> int extern def Fl_Progress_image(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_parent(self: Fl_ProgressPtr) -> bytes -extern def Fl_Progress_selection_color(self: Fl_ProgressPtr) -> t.CUInt32T -extern def Fl_Progress_set_selection_color(self: Fl_ProgressPtr, color: t.CUInt32T) +extern def Fl_Progress_selection_color(self: Fl_ProgressPtr) -> uint32 +extern def Fl_Progress_set_selection_color(self: Fl_ProgressPtr, color: uint32) extern def Fl_Progress_do_callback(self: Fl_ProgressPtr) extern def Fl_Progress_inside(self: Fl_ProgressPtr, a1: bytes) -> int extern def Fl_Progress_window(self: Fl_ProgressPtr) -> bytes @@ -330,15 +330,15 @@ extern def Fl_Progress_take_focus(self: Fl_ProgressPtr) -> int extern def Fl_Progress_set_visible_focus(self: Fl_ProgressPtr) extern def Fl_Progress_clear_visible_focus(self: Fl_ProgressPtr) extern def Fl_Progress_visible_focus(self: Fl_ProgressPtr, v: int) -extern def Fl_Progress_has_visible_focus(self: Fl_ProgressPtr) -> t.CUInt32T +extern def Fl_Progress_has_visible_focus(self: Fl_ProgressPtr) -> uint32 extern def Fl_Progress_set_user_data(self: Fl_ProgressPtr, data: bytes) extern def Fl_Progress_draw_data(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_handle_data(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_set_draw_data(self: Fl_ProgressPtr, data: bytes) extern def Fl_Progress_set_handle_data(self: Fl_ProgressPtr, data: bytes) -extern def Fl_Progress_damage(self: Fl_ProgressPtr) -> t.CUInt8T -extern def Fl_Progress_set_damage(self: Fl_ProgressPtr, flag: t.CUInt8T) -extern def Fl_Progress_set_damage_area(self: Fl_ProgressPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Progress_damage(self: Fl_ProgressPtr) -> uint8 +extern def Fl_Progress_set_damage(self: Fl_ProgressPtr, flag: uint8) +extern def Fl_Progress_set_damage_area(self: Fl_ProgressPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Progress_clear_damage(self: Fl_ProgressPtr) extern def Fl_Progress_as_window(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_as_group(self: Fl_ProgressPtr) -> bytes @@ -347,7 +347,7 @@ extern def Fl_Progress_deimage(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_set_callback(self: Fl_ProgressPtr, a1: bytes, a2: bytes) extern def Fl_Progress_visible(self: Fl_ProgressPtr) -> int extern def Fl_Progress_visible_r(self: Fl_ProgressPtr) -> int -extern def Fl_Progress_active(self: Fl_ProgressPtr) -> t.CUInt32T +extern def Fl_Progress_active(self: Fl_ProgressPtr) -> uint32 extern def Fl_Progress_active_r(self: Fl_ProgressPtr) -> int extern def Fl_Progress_callback(self: Fl_ProgressPtr) -> bytes extern def Fl_Progress_set_deletion_callback(self: Fl_ProgressPtr, cb1: bytes, data: bytes) @@ -377,11 +377,11 @@ extern def Fl_Help_View_tooltip(self: Fl_Help_ViewPtr) -> str extern def Fl_Help_View_set_tooltip(self: Fl_Help_ViewPtr, txt: str) extern def Fl_Help_View_get_type(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_set_type(self: Fl_Help_ViewPtr, typ: int) -extern def Fl_Help_View_color(self: Fl_Help_ViewPtr) -> t.CUInt32T -extern def Fl_Help_View_set_color(self: Fl_Help_ViewPtr, color: t.CUInt32T) +extern def Fl_Help_View_color(self: Fl_Help_ViewPtr) -> uint32 +extern def Fl_Help_View_set_color(self: Fl_Help_ViewPtr, color: uint32) extern def Fl_Help_View_measure_label(self: Fl_Help_ViewPtr, a1: bytes, a2: bytes) -extern def Fl_Help_View_label_color(self: Fl_Help_ViewPtr) -> t.CUInt32T -extern def Fl_Help_View_set_label_color(self: Fl_Help_ViewPtr, color: t.CUInt32T) +extern def Fl_Help_View_label_color(self: Fl_Help_ViewPtr) -> uint32 +extern def Fl_Help_View_set_label_color(self: Fl_Help_ViewPtr, color: uint32) extern def Fl_Help_View_label_font(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_set_label_font(self: Fl_Help_ViewPtr, font: int) extern def Fl_Help_View_label_size(self: Fl_Help_ViewPtr) -> int @@ -405,8 +405,8 @@ extern def Fl_Help_View_set_when(self: Fl_Help_ViewPtr, a1: int) extern def Fl_Help_View_when(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_image(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_parent(self: Fl_Help_ViewPtr) -> bytes -extern def Fl_Help_View_selection_color(self: Fl_Help_ViewPtr) -> t.CUInt32T -extern def Fl_Help_View_set_selection_color(self: Fl_Help_ViewPtr, color: t.CUInt32T) +extern def Fl_Help_View_selection_color(self: Fl_Help_ViewPtr) -> uint32 +extern def Fl_Help_View_set_selection_color(self: Fl_Help_ViewPtr, color: uint32) extern def Fl_Help_View_do_callback(self: Fl_Help_ViewPtr) extern def Fl_Help_View_inside(self: Fl_Help_ViewPtr, a1: bytes) -> int extern def Fl_Help_View_window(self: Fl_Help_ViewPtr) -> bytes @@ -417,15 +417,15 @@ extern def Fl_Help_View_take_focus(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_set_visible_focus(self: Fl_Help_ViewPtr) extern def Fl_Help_View_clear_visible_focus(self: Fl_Help_ViewPtr) extern def Fl_Help_View_visible_focus(self: Fl_Help_ViewPtr, v: int) -extern def Fl_Help_View_has_visible_focus(self: Fl_Help_ViewPtr) -> t.CUInt32T +extern def Fl_Help_View_has_visible_focus(self: Fl_Help_ViewPtr) -> uint32 extern def Fl_Help_View_set_user_data(self: Fl_Help_ViewPtr, data: bytes) extern def Fl_Help_View_draw_data(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_handle_data(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_set_draw_data(self: Fl_Help_ViewPtr, data: bytes) extern def Fl_Help_View_set_handle_data(self: Fl_Help_ViewPtr, data: bytes) -extern def Fl_Help_View_damage(self: Fl_Help_ViewPtr) -> t.CUInt8T -extern def Fl_Help_View_set_damage(self: Fl_Help_ViewPtr, flag: t.CUInt8T) -extern def Fl_Help_View_set_damage_area(self: Fl_Help_ViewPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Help_View_damage(self: Fl_Help_ViewPtr) -> uint8 +extern def Fl_Help_View_set_damage(self: Fl_Help_ViewPtr, flag: uint8) +extern def Fl_Help_View_set_damage_area(self: Fl_Help_ViewPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Help_View_clear_damage(self: Fl_Help_ViewPtr) extern def Fl_Help_View_as_window(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_as_group(self: Fl_Help_ViewPtr) -> bytes @@ -434,7 +434,7 @@ extern def Fl_Help_View_deimage(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_set_callback(self: Fl_Help_ViewPtr, a1: bytes, a2: bytes) extern def Fl_Help_View_visible(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_visible_r(self: Fl_Help_ViewPtr) -> int -extern def Fl_Help_View_active(self: Fl_Help_ViewPtr) -> t.CUInt32T +extern def Fl_Help_View_active(self: Fl_Help_ViewPtr) -> uint32 extern def Fl_Help_View_active_r(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_callback(self: Fl_Help_ViewPtr) -> bytes extern def Fl_Help_View_set_deletion_callback(self: Fl_Help_ViewPtr, cb1: bytes, data: bytes) @@ -464,11 +464,11 @@ extern def Fl_Input_Choice_tooltip(self: Fl_Input_ChoicePtr) -> str extern def Fl_Input_Choice_set_tooltip(self: Fl_Input_ChoicePtr, txt: str) extern def Fl_Input_Choice_get_type(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_set_type(self: Fl_Input_ChoicePtr, typ: int) -extern def Fl_Input_Choice_color(self: Fl_Input_ChoicePtr) -> t.CUInt32T -extern def Fl_Input_Choice_set_color(self: Fl_Input_ChoicePtr, color: t.CUInt32T) +extern def Fl_Input_Choice_color(self: Fl_Input_ChoicePtr) -> uint32 +extern def Fl_Input_Choice_set_color(self: Fl_Input_ChoicePtr, color: uint32) extern def Fl_Input_Choice_measure_label(self: Fl_Input_ChoicePtr, a1: bytes, a2: bytes) -extern def Fl_Input_Choice_label_color(self: Fl_Input_ChoicePtr) -> t.CUInt32T -extern def Fl_Input_Choice_set_label_color(self: Fl_Input_ChoicePtr, color: t.CUInt32T) +extern def Fl_Input_Choice_label_color(self: Fl_Input_ChoicePtr) -> uint32 +extern def Fl_Input_Choice_set_label_color(self: Fl_Input_ChoicePtr, color: uint32) extern def Fl_Input_Choice_label_font(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_set_label_font(self: Fl_Input_ChoicePtr, font: int) extern def Fl_Input_Choice_label_size(self: Fl_Input_ChoicePtr) -> int @@ -492,8 +492,8 @@ extern def Fl_Input_Choice_set_when(self: Fl_Input_ChoicePtr, a1: int) extern def Fl_Input_Choice_when(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_image(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_parent(self: Fl_Input_ChoicePtr) -> bytes -extern def Fl_Input_Choice_selection_color(self: Fl_Input_ChoicePtr) -> t.CUInt32T -extern def Fl_Input_Choice_set_selection_color(self: Fl_Input_ChoicePtr, color: t.CUInt32T) +extern def Fl_Input_Choice_selection_color(self: Fl_Input_ChoicePtr) -> uint32 +extern def Fl_Input_Choice_set_selection_color(self: Fl_Input_ChoicePtr, color: uint32) extern def Fl_Input_Choice_do_callback(self: Fl_Input_ChoicePtr) extern def Fl_Input_Choice_inside(self: Fl_Input_ChoicePtr, a1: bytes) -> int extern def Fl_Input_Choice_window(self: Fl_Input_ChoicePtr) -> bytes @@ -504,15 +504,15 @@ extern def Fl_Input_Choice_take_focus(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_set_visible_focus(self: Fl_Input_ChoicePtr) extern def Fl_Input_Choice_clear_visible_focus(self: Fl_Input_ChoicePtr) extern def Fl_Input_Choice_visible_focus(self: Fl_Input_ChoicePtr, v: int) -extern def Fl_Input_Choice_has_visible_focus(self: Fl_Input_ChoicePtr) -> t.CUInt32T +extern def Fl_Input_Choice_has_visible_focus(self: Fl_Input_ChoicePtr) -> uint32 extern def Fl_Input_Choice_set_user_data(self: Fl_Input_ChoicePtr, data: bytes) extern def Fl_Input_Choice_draw_data(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_handle_data(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_set_draw_data(self: Fl_Input_ChoicePtr, data: bytes) extern def Fl_Input_Choice_set_handle_data(self: Fl_Input_ChoicePtr, data: bytes) -extern def Fl_Input_Choice_damage(self: Fl_Input_ChoicePtr) -> t.CUInt8T -extern def Fl_Input_Choice_set_damage(self: Fl_Input_ChoicePtr, flag: t.CUInt8T) -extern def Fl_Input_Choice_set_damage_area(self: Fl_Input_ChoicePtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Input_Choice_damage(self: Fl_Input_ChoicePtr) -> uint8 +extern def Fl_Input_Choice_set_damage(self: Fl_Input_ChoicePtr, flag: uint8) +extern def Fl_Input_Choice_set_damage_area(self: Fl_Input_ChoicePtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Input_Choice_clear_damage(self: Fl_Input_ChoicePtr) extern def Fl_Input_Choice_as_window(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_as_group(self: Fl_Input_ChoicePtr) -> bytes @@ -521,7 +521,7 @@ extern def Fl_Input_Choice_deimage(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_set_callback(self: Fl_Input_ChoicePtr, a1: bytes, a2: bytes) extern def Fl_Input_Choice_visible(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_visible_r(self: Fl_Input_ChoicePtr) -> int -extern def Fl_Input_Choice_active(self: Fl_Input_ChoicePtr) -> t.CUInt32T +extern def Fl_Input_Choice_active(self: Fl_Input_ChoicePtr) -> uint32 extern def Fl_Input_Choice_active_r(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_callback(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_set_deletion_callback(self: Fl_Input_ChoicePtr, cb1: bytes, data: bytes) @@ -531,30 +531,30 @@ extern def Fl_Input_Choice_super_draw(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Input_Choice_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Input_Choice_super_handle_first(ptr: Fl_WidgetPtr, flag: int) -extern def Fl_Spinner_minimum(a0: Fl_SpinnerPtr) -> t.CDouble -extern def Fl_Spinner_set_minimum(a0: Fl_SpinnerPtr, a: t.CDouble) -extern def Fl_Spinner_maximum(a0: Fl_SpinnerPtr) -> t.CDouble -extern def Fl_Spinner_set_maximum(a0: Fl_SpinnerPtr, a: t.CDouble) -extern def Fl_Spinner_set_range(a0: Fl_SpinnerPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Spinner_set_step(a0: Fl_SpinnerPtr, a: t.CDouble) -extern def Fl_Spinner_step(a0: Fl_SpinnerPtr) -> t.CDouble +extern def Fl_Spinner_minimum(a0: Fl_SpinnerPtr) -> double +extern def Fl_Spinner_set_minimum(a0: Fl_SpinnerPtr, a: double) +extern def Fl_Spinner_maximum(a0: Fl_SpinnerPtr) -> double +extern def Fl_Spinner_set_maximum(a0: Fl_SpinnerPtr, a: double) +extern def Fl_Spinner_set_range(a0: Fl_SpinnerPtr, a: double, b: double) +extern def Fl_Spinner_set_step(a0: Fl_SpinnerPtr, a: double) +extern def Fl_Spinner_step(a0: Fl_SpinnerPtr) -> double extern def Fl_Spinner_maxsize(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_maxsize(self: Fl_SpinnerPtr, m: int) extern def Fl_Spinner_text_font(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_text_font(self: Fl_SpinnerPtr, s: int) extern def Fl_Spinner_text_size(self: Fl_SpinnerPtr) -> int extern def Fl_Spinner_set_text_size(self: Fl_SpinnerPtr, s: int) -extern def Fl_Spinner_text_color(self: Fl_SpinnerPtr) -> t.CUInt32T -extern def Fl_Spinner_set_text_color(self: Fl_SpinnerPtr, n: t.CUInt32T) -extern def Fl_Spinner_value(a0: Fl_SpinnerPtr) -> t.CDouble -extern def Fl_Spinner_set_value(a0: Fl_SpinnerPtr, a1: t.CDouble) +extern def Fl_Spinner_text_color(self: Fl_SpinnerPtr) -> uint32 +extern def Fl_Spinner_set_text_color(self: Fl_SpinnerPtr, n: uint32) +extern def Fl_Spinner_value(a0: Fl_SpinnerPtr) -> double +extern def Fl_Spinner_set_value(a0: Fl_SpinnerPtr, a1: double) extern def Fl_Spinner_set_wrap(self: Fl_SpinnerPtr, flag: int) extern def Fl_Spinner_wrap(self: Fl_SpinnerPtr) -> int extern def Fl_Chart_clear(self: Fl_ChartPtr) -extern def Fl_Chart_add(self: Fl_ChartPtr, val: t.CDouble, str_: str, col: bytes) -extern def Fl_Chart_insert(self: Fl_ChartPtr, ind: int, val: t.CDouble, str_: str, col: bytes) -extern def Fl_Chart_replace(self: Fl_ChartPtr, ind: int, val: t.CDouble, str_: str, col: bytes) -extern def Fl_Chart_set_bounds(self: Fl_ChartPtr, a: t.CDouble, b: t.CDouble) +extern def Fl_Chart_add(self: Fl_ChartPtr, val: double, str_: str, col: bytes) +extern def Fl_Chart_insert(self: Fl_ChartPtr, ind: int, val: double, str_: str, col: bytes) +extern def Fl_Chart_replace(self: Fl_ChartPtr, ind: int, val: double, str_: str, col: bytes) +extern def Fl_Chart_set_bounds(self: Fl_ChartPtr, a: double, b: double) extern def Fl_Chart_size(self: Fl_ChartPtr) -> int extern def Fl_Chart_maxsize(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_maxsize(self: Fl_ChartPtr, m: int) @@ -562,23 +562,23 @@ extern def Fl_Chart_text_font(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_text_font(self: Fl_ChartPtr, s: int) extern def Fl_Chart_text_size(self: Fl_ChartPtr) -> int extern def Fl_Chart_set_text_size(self: Fl_ChartPtr, s: int) -extern def Fl_Chart_text_color(self: Fl_ChartPtr) -> t.CUInt32T -extern def Fl_Chart_set_text_color(self: Fl_ChartPtr, n: t.CUInt32T) +extern def Fl_Chart_text_color(self: Fl_ChartPtr) -> uint32 +extern def Fl_Chart_set_text_color(self: Fl_ChartPtr, n: uint32) extern def Fl_Chart_is_autosize(self: Fl_ChartPtr) -> int extern def Fl_Chart_make_autosize(self: Fl_ChartPtr, n: int) extern def Fl_Chart_bounds(self: Fl_ChartPtr, a: bytes, b: bytes) -extern def Fl_Progress_minimum(a0: Fl_ProgressPtr) -> t.CDouble -extern def Fl_Progress_set_minimum(a0: Fl_ProgressPtr, a: t.CDouble) -extern def Fl_Progress_maximum(a0: Fl_ProgressPtr) -> t.CDouble -extern def Fl_Progress_set_maximum(a0: Fl_ProgressPtr, a: t.CDouble) -extern def Fl_Progress_value(a0: Fl_ProgressPtr) -> t.CDouble -extern def Fl_Progress_set_value(a0: Fl_ProgressPtr, a1: t.CDouble) -extern def Fl_Tooltip_delay() -> t.CFloat -extern def Fl_Tooltip_set_delay(f: t.CFloat) -extern def Fl_Tooltip_hidedelay() -> t.CFloat -extern def Fl_Tooltip_set_hidedelay(f: t.CFloat) -extern def Fl_Tooltip_hoverdelay() -> t.CFloat -extern def Fl_Tooltip_set_hoverdelay(f: t.CFloat) +extern def Fl_Progress_minimum(a0: Fl_ProgressPtr) -> double +extern def Fl_Progress_set_minimum(a0: Fl_ProgressPtr, a: double) +extern def Fl_Progress_maximum(a0: Fl_ProgressPtr) -> double +extern def Fl_Progress_set_maximum(a0: Fl_ProgressPtr, a: double) +extern def Fl_Progress_value(a0: Fl_ProgressPtr) -> double +extern def Fl_Progress_set_value(a0: Fl_ProgressPtr, a1: double) +extern def Fl_Tooltip_delay() -> float +extern def Fl_Tooltip_set_delay(f: float) +extern def Fl_Tooltip_hidedelay() -> float +extern def Fl_Tooltip_set_hidedelay(f: float) +extern def Fl_Tooltip_hoverdelay() -> float +extern def Fl_Tooltip_set_hoverdelay(f: float) extern def Fl_Tooltip_enabled() -> int extern def Fl_Tooltip_enable(b: int) extern def Fl_Tooltip_disable() @@ -592,9 +592,9 @@ extern def Fl_Tooltip_set_font(i: int) extern def Fl_Tooltip_font_size() -> int extern def Fl_Tooltip_set_font_size(s: int) extern def Fl_Tooltip_color() -> int -extern def Fl_Tooltip_set_color(c: t.CUInt32T) +extern def Fl_Tooltip_set_color(c: uint32) extern def Fl_Tooltip_text_color() -> int -extern def Fl_Tooltip_set_text_color(c: t.CUInt32T) +extern def Fl_Tooltip_set_text_color(c: uint32) extern def Fl_Tooltip_margin_width() -> int extern def Fl_Tooltip_set_margin_width(v: int) extern def Fl_Tooltip_margin_height() -> int @@ -614,8 +614,8 @@ extern def Fl_Help_View_set_topline(self: Fl_Help_ViewPtr, a1: int) extern def Fl_Help_View_topline(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_set_leftline(self: Fl_Help_ViewPtr, a1: int) extern def Fl_Help_View_leftline(self: Fl_Help_ViewPtr) -> int -extern def Fl_Help_View_set_text_color(self: Fl_Help_ViewPtr, c: t.CUInt32T) -extern def Fl_Help_View_text_color(self: Fl_Help_ViewPtr) -> t.CUInt32T +extern def Fl_Help_View_set_text_color(self: Fl_Help_ViewPtr, c: uint32) +extern def Fl_Help_View_text_color(self: Fl_Help_ViewPtr) -> uint32 extern def Fl_Help_View_set_text_font(self: Fl_Help_ViewPtr, f: int) extern def Fl_Help_View_text_font(self: Fl_Help_ViewPtr) -> int extern def Fl_Help_View_set_text_size(self: Fl_Help_ViewPtr, s: int) @@ -633,8 +633,8 @@ extern def Fl_Input_Choice_set_value(self: Fl_Input_ChoicePtr, val: str) extern def Fl_Input_Choice_set_value_index(self: Fl_Input_ChoicePtr, val: int) extern def Fl_Input_Choice_input(self: Fl_Input_ChoicePtr) -> bytes extern def Fl_Input_Choice_menu_button(self: Fl_Input_ChoicePtr) -> bytes -extern def Fl_Input_Choice_set_text_color(self: Fl_Input_ChoicePtr, c: t.CUInt32T) -extern def Fl_Input_Choice_text_color(self: Fl_Input_ChoicePtr) -> t.CUInt32T +extern def Fl_Input_Choice_set_text_color(self: Fl_Input_ChoicePtr, c: uint32) +extern def Fl_Input_Choice_text_color(self: Fl_Input_ChoicePtr) -> uint32 extern def Fl_Input_Choice_set_text_font(self: Fl_Input_ChoicePtr, f: int) extern def Fl_Input_Choice_text_font(self: Fl_Input_ChoicePtr) -> int extern def Fl_Input_Choice_set_text_size(self: Fl_Input_ChoicePtr, s: int) diff --git a/fltk/_cfl_prefs.vp b/fltk/_cfl_prefs.vp index 7112436..9d53157 100644 --- a/fltk/_cfl_prefs.vp +++ b/fltk/_cfl_prefs.vp @@ -9,8 +9,8 @@ from fltk._types import * # 类型约定: Fl_* 对象均为不透明指针 (Fl_XxxPtr)；const char* → str； # 函数指针/void* → bytes（Viper 端传 0/NULL 或不使用）。 -extern def Fl_Preferences_set_file_access(flags: t.CUInt32T) -extern def Fl_Preferences_file_access() -> t.CUInt32T +extern def Fl_Preferences_set_file_access(flags: uint32) +extern def Fl_Preferences_file_access() -> uint32 extern def Fl_Preferences_remove(id_: bytes) -> char extern def Fl_Preferences_new(root: int, vendor: str, application: str) -> Fl_PreferencesPtr extern def Fl_Preferences_from_path(path: str, vendor: str, application: str) -> Fl_PreferencesPtr @@ -19,7 +19,7 @@ extern def Fl_Preferences_from_parent_idx(parent: Fl_PreferencesPtr, groupIndex: extern def Fl_Preferences_copy(a0: Fl_PreferencesPtr) -> Fl_PreferencesPtr extern def Fl_Preferences_delete(a0: Fl_PreferencesPtr) extern def Fl_Preferences_from_id(id: bytes) -> Fl_PreferencesPtr -extern def Fl_Preferences_filename(prefs: Fl_PreferencesPtr, buffer: str, buffer_size: t.CUInt32T) -> int +extern def Fl_Preferences_filename(prefs: Fl_PreferencesPtr, buffer: str, buffer_size: uint32) -> int extern def Fl_Preferences_get_userdata_path(prefs: Fl_PreferencesPtr, path: str, pathlen: int) -> char extern def Fl_Preferences_id(prefs: Fl_PreferencesPtr) -> bytes extern def Fl_Preferences_name(prefs: Fl_PreferencesPtr) -> str @@ -36,15 +36,15 @@ extern def Fl_Preferences_delete_entry(prefs: Fl_PreferencesPtr, entry: str) -> extern def Fl_Preferences_delete_all_entries(prefs: Fl_PreferencesPtr) -> char extern def Fl_Preferences_clear(prefs: Fl_PreferencesPtr) -> char extern def Fl_Preferences_seti(prefs: Fl_PreferencesPtr, entry: str, value: int) -> char -extern def Fl_Preferences_setf(prefs: Fl_PreferencesPtr, entry: str, value: t.CFloat) -> char -extern def Fl_Preferences_setfp(prefs: Fl_PreferencesPtr, entry: str, value: t.CFloat, precision: int) -> char -extern def Fl_Preferences_setd(prefs: Fl_PreferencesPtr, entry: str, value: t.CDouble) -> char -extern def Fl_Preferences_setdp(prefs: Fl_PreferencesPtr, entry: str, value: t.CDouble, precision: int) -> char +extern def Fl_Preferences_setf(prefs: Fl_PreferencesPtr, entry: str, value: float) -> char +extern def Fl_Preferences_setfp(prefs: Fl_PreferencesPtr, entry: str, value: float, precision: int) -> char +extern def Fl_Preferences_setd(prefs: Fl_PreferencesPtr, entry: str, value: double) -> char +extern def Fl_Preferences_setdp(prefs: Fl_PreferencesPtr, entry: str, value: double, precision: int) -> char extern def Fl_Preferences_sets(prefs: Fl_PreferencesPtr, entry: str, value: str) -> char extern def Fl_Preferences_setv(prefs: Fl_PreferencesPtr, entry: str, value: bytes, size: int) -> char extern def Fl_Preferences_geti(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: int) -> char -extern def Fl_Preferences_getf(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: t.CFloat) -> char -extern def Fl_Preferences_getd(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: t.CDouble) -> char +extern def Fl_Preferences_getf(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: float) -> char +extern def Fl_Preferences_getd(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: double) -> char extern def Fl_Preferences_gets(prefs: Fl_PreferencesPtr, entry: str, value: str, defaultValue: str, maxSize: int) -> char extern def Fl_Preferences_getv(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: bytes, defaultSize: int, maxSize: int) -> char extern def Fl_Preferences_getv2(prefs: Fl_PreferencesPtr, entry: str, value: bytes, defaultValue: bytes, defaultSize: int, size: bytes) -> char diff --git a/fltk/_cfl_printer.vp b/fltk/_cfl_printer.vp index a4af8bf..3ba8bf7 100644 --- a/fltk/_cfl_printer.vp +++ b/fltk/_cfl_printer.vp @@ -17,8 +17,8 @@ extern def Fl_Printer_printable_rect(self: Fl_PrinterPtr, w: bytes, h: bytes) -> extern def Fl_Printer_margins(self: Fl_PrinterPtr, left: bytes, top: bytes, right: bytes, bottom: bytes) extern def Fl_Printer_origin(self: Fl_PrinterPtr, x: bytes, y: bytes) extern def Fl_Printer_set_origin(self: Fl_PrinterPtr, x: int, y: int) -extern def Fl_Printer_scale(self: Fl_PrinterPtr, scale_x: t.CFloat, scale_y: t.CFloat) -extern def Fl_Printer_rotate(self: Fl_PrinterPtr, angle: t.CFloat) +extern def Fl_Printer_scale(self: Fl_PrinterPtr, scale_x: float, scale_y: float) +extern def Fl_Printer_rotate(self: Fl_PrinterPtr, angle: float) extern def Fl_Printer_translate(self: Fl_PrinterPtr, x: int, y: int) extern def Fl_Printer_untranslate(self: Fl_PrinterPtr) extern def Fl_Printer_end_page(self: Fl_PrinterPtr) -> int diff --git a/fltk/_cfl_table.vp b/fltk/_cfl_table.vp index f90174d..3bdff99 100644 --- a/fltk/_cfl_table.vp +++ b/fltk/_cfl_table.vp @@ -29,11 +29,11 @@ extern def Fl_Table_tooltip(self: Fl_TablePtr) -> str extern def Fl_Table_set_tooltip(self: Fl_TablePtr, txt: str) extern def Fl_Table_get_type(self: Fl_TablePtr) -> int extern def Fl_Table_set_type(self: Fl_TablePtr, typ: int) -extern def Fl_Table_color(self: Fl_TablePtr) -> t.CUInt32T -extern def Fl_Table_set_color(self: Fl_TablePtr, color: t.CUInt32T) +extern def Fl_Table_color(self: Fl_TablePtr) -> uint32 +extern def Fl_Table_set_color(self: Fl_TablePtr, color: uint32) extern def Fl_Table_measure_label(self: Fl_TablePtr, a1: bytes, a2: bytes) -extern def Fl_Table_label_color(self: Fl_TablePtr) -> t.CUInt32T -extern def Fl_Table_set_label_color(self: Fl_TablePtr, color: t.CUInt32T) +extern def Fl_Table_label_color(self: Fl_TablePtr) -> uint32 +extern def Fl_Table_set_label_color(self: Fl_TablePtr, color: uint32) extern def Fl_Table_label_font(self: Fl_TablePtr) -> int extern def Fl_Table_set_label_font(self: Fl_TablePtr, font: int) extern def Fl_Table_label_size(self: Fl_TablePtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Table_set_when(self: Fl_TablePtr, a1: int) extern def Fl_Table_when(self: Fl_TablePtr) -> int extern def Fl_Table_image(self: Fl_TablePtr) -> bytes extern def Fl_Table_parent(self: Fl_TablePtr) -> bytes -extern def Fl_Table_selection_color(self: Fl_TablePtr) -> t.CUInt32T -extern def Fl_Table_set_selection_color(self: Fl_TablePtr, color: t.CUInt32T) +extern def Fl_Table_selection_color(self: Fl_TablePtr) -> uint32 +extern def Fl_Table_set_selection_color(self: Fl_TablePtr, color: uint32) extern def Fl_Table_do_callback(self: Fl_TablePtr) extern def Fl_Table_inside(self: Fl_TablePtr, a1: bytes) -> int extern def Fl_Table_window(self: Fl_TablePtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Table_take_focus(self: Fl_TablePtr) -> int extern def Fl_Table_set_visible_focus(self: Fl_TablePtr) extern def Fl_Table_clear_visible_focus(self: Fl_TablePtr) extern def Fl_Table_visible_focus(self: Fl_TablePtr, v: int) -extern def Fl_Table_has_visible_focus(self: Fl_TablePtr) -> t.CUInt32T +extern def Fl_Table_has_visible_focus(self: Fl_TablePtr) -> uint32 extern def Fl_Table_set_user_data(self: Fl_TablePtr, data: bytes) extern def Fl_Table_draw_data(self: Fl_TablePtr) -> bytes extern def Fl_Table_handle_data(self: Fl_TablePtr) -> bytes extern def Fl_Table_set_draw_data(self: Fl_TablePtr, data: bytes) extern def Fl_Table_set_handle_data(self: Fl_TablePtr, data: bytes) -extern def Fl_Table_damage(self: Fl_TablePtr) -> t.CUInt8T -extern def Fl_Table_set_damage(self: Fl_TablePtr, flag: t.CUInt8T) -extern def Fl_Table_set_damage_area(self: Fl_TablePtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Table_damage(self: Fl_TablePtr) -> uint8 +extern def Fl_Table_set_damage(self: Fl_TablePtr, flag: uint8) +extern def Fl_Table_set_damage_area(self: Fl_TablePtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Table_clear_damage(self: Fl_TablePtr) extern def Fl_Table_as_window(self: Fl_TablePtr) -> bytes extern def Fl_Table_as_group(self: Fl_TablePtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Table_deimage(self: Fl_TablePtr) -> bytes extern def Fl_Table_set_callback(self: Fl_TablePtr, a1: bytes, a2: bytes) extern def Fl_Table_visible(self: Fl_TablePtr) -> int extern def Fl_Table_visible_r(self: Fl_TablePtr) -> int -extern def Fl_Table_active(self: Fl_TablePtr) -> t.CUInt32T +extern def Fl_Table_active(self: Fl_TablePtr) -> uint32 extern def Fl_Table_active_r(self: Fl_TablePtr) -> int extern def Fl_Table_callback(self: Fl_TablePtr) -> bytes extern def Fl_Table_set_deletion_callback(self: Fl_TablePtr, cb1: bytes, data: bytes) @@ -141,10 +141,10 @@ extern def Fl_Table_set_col_header_height(self: Fl_TablePtr, height: int) extern def Fl_Table_col_header_height(self: Fl_TablePtr) -> int extern def Fl_Table_set_row_header_width(self: Fl_TablePtr, width: int) extern def Fl_Table_row_header_width(self: Fl_TablePtr) -> int -extern def Fl_Table_set_row_header_color(self: Fl_TablePtr, val: t.CUInt32T) -extern def Fl_Table_row_header_color(self: Fl_TablePtr) -> t.CUInt32T -extern def Fl_Table_set_col_header_color(self: Fl_TablePtr, val: t.CUInt32T) -extern def Fl_Table_col_header_color(self: Fl_TablePtr) -> t.CUInt32T +extern def Fl_Table_set_row_header_color(self: Fl_TablePtr, val: uint32) +extern def Fl_Table_row_header_color(self: Fl_TablePtr) -> uint32 +extern def Fl_Table_set_col_header_color(self: Fl_TablePtr, val: uint32) +extern def Fl_Table_col_header_color(self: Fl_TablePtr) -> uint32 extern def Fl_Table_set_row_height(self: Fl_TablePtr, row: int, height: int) extern def Fl_Table_row_height(self: Fl_TablePtr, row: int) -> int extern def Fl_Table_set_col_width(self: Fl_TablePtr, col: int, width: int) @@ -198,11 +198,11 @@ extern def Fl_Table_Row_tooltip(self: Fl_Table_RowPtr) -> str extern def Fl_Table_Row_set_tooltip(self: Fl_Table_RowPtr, txt: str) extern def Fl_Table_Row_get_type(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_set_type(self: Fl_Table_RowPtr, typ: int) -extern def Fl_Table_Row_color(self: Fl_Table_RowPtr) -> t.CUInt32T -extern def Fl_Table_Row_set_color(self: Fl_Table_RowPtr, color: t.CUInt32T) +extern def Fl_Table_Row_color(self: Fl_Table_RowPtr) -> uint32 +extern def Fl_Table_Row_set_color(self: Fl_Table_RowPtr, color: uint32) extern def Fl_Table_Row_measure_label(self: Fl_Table_RowPtr, a1: bytes, a2: bytes) -extern def Fl_Table_Row_label_color(self: Fl_Table_RowPtr) -> t.CUInt32T -extern def Fl_Table_Row_set_label_color(self: Fl_Table_RowPtr, color: t.CUInt32T) +extern def Fl_Table_Row_label_color(self: Fl_Table_RowPtr) -> uint32 +extern def Fl_Table_Row_set_label_color(self: Fl_Table_RowPtr, color: uint32) extern def Fl_Table_Row_label_font(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_set_label_font(self: Fl_Table_RowPtr, font: int) extern def Fl_Table_Row_label_size(self: Fl_Table_RowPtr) -> int @@ -226,8 +226,8 @@ extern def Fl_Table_Row_set_when(self: Fl_Table_RowPtr, a1: int) extern def Fl_Table_Row_when(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_image(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_parent(self: Fl_Table_RowPtr) -> bytes -extern def Fl_Table_Row_selection_color(self: Fl_Table_RowPtr) -> t.CUInt32T -extern def Fl_Table_Row_set_selection_color(self: Fl_Table_RowPtr, color: t.CUInt32T) +extern def Fl_Table_Row_selection_color(self: Fl_Table_RowPtr) -> uint32 +extern def Fl_Table_Row_set_selection_color(self: Fl_Table_RowPtr, color: uint32) extern def Fl_Table_Row_do_callback(self: Fl_Table_RowPtr) extern def Fl_Table_Row_inside(self: Fl_Table_RowPtr, a1: bytes) -> int extern def Fl_Table_Row_window(self: Fl_Table_RowPtr) -> bytes @@ -238,15 +238,15 @@ extern def Fl_Table_Row_take_focus(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_set_visible_focus(self: Fl_Table_RowPtr) extern def Fl_Table_Row_clear_visible_focus(self: Fl_Table_RowPtr) extern def Fl_Table_Row_visible_focus(self: Fl_Table_RowPtr, v: int) -extern def Fl_Table_Row_has_visible_focus(self: Fl_Table_RowPtr) -> t.CUInt32T +extern def Fl_Table_Row_has_visible_focus(self: Fl_Table_RowPtr) -> uint32 extern def Fl_Table_Row_set_user_data(self: Fl_Table_RowPtr, data: bytes) extern def Fl_Table_Row_draw_data(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_handle_data(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_set_draw_data(self: Fl_Table_RowPtr, data: bytes) extern def Fl_Table_Row_set_handle_data(self: Fl_Table_RowPtr, data: bytes) -extern def Fl_Table_Row_damage(self: Fl_Table_RowPtr) -> t.CUInt8T -extern def Fl_Table_Row_set_damage(self: Fl_Table_RowPtr, flag: t.CUInt8T) -extern def Fl_Table_Row_set_damage_area(self: Fl_Table_RowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Table_Row_damage(self: Fl_Table_RowPtr) -> uint8 +extern def Fl_Table_Row_set_damage(self: Fl_Table_RowPtr, flag: uint8) +extern def Fl_Table_Row_set_damage_area(self: Fl_Table_RowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Table_Row_clear_damage(self: Fl_Table_RowPtr) extern def Fl_Table_Row_as_window(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_as_group(self: Fl_Table_RowPtr) -> bytes @@ -255,7 +255,7 @@ extern def Fl_Table_Row_deimage(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_set_callback(self: Fl_Table_RowPtr, a1: bytes, a2: bytes) extern def Fl_Table_Row_visible(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_visible_r(self: Fl_Table_RowPtr) -> int -extern def Fl_Table_Row_active(self: Fl_Table_RowPtr) -> t.CUInt32T +extern def Fl_Table_Row_active(self: Fl_Table_RowPtr) -> uint32 extern def Fl_Table_Row_active_r(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_callback(self: Fl_Table_RowPtr) -> bytes extern def Fl_Table_Row_set_deletion_callback(self: Fl_Table_RowPtr, cb1: bytes, data: bytes) @@ -310,10 +310,10 @@ extern def Fl_Table_Row_set_col_header_height(self: Fl_Table_RowPtr, height: int extern def Fl_Table_Row_col_header_height(self: Fl_Table_RowPtr) -> int extern def Fl_Table_Row_set_row_header_width(self: Fl_Table_RowPtr, width: int) extern def Fl_Table_Row_row_header_width(self: Fl_Table_RowPtr) -> int -extern def Fl_Table_Row_set_row_header_color(self: Fl_Table_RowPtr, val: t.CUInt32T) -extern def Fl_Table_Row_row_header_color(self: Fl_Table_RowPtr) -> t.CUInt32T -extern def Fl_Table_Row_set_col_header_color(self: Fl_Table_RowPtr, val: t.CUInt32T) -extern def Fl_Table_Row_col_header_color(self: Fl_Table_RowPtr) -> t.CUInt32T +extern def Fl_Table_Row_set_row_header_color(self: Fl_Table_RowPtr, val: uint32) +extern def Fl_Table_Row_row_header_color(self: Fl_Table_RowPtr) -> uint32 +extern def Fl_Table_Row_set_col_header_color(self: Fl_Table_RowPtr, val: uint32) +extern def Fl_Table_Row_col_header_color(self: Fl_Table_RowPtr) -> uint32 extern def Fl_Table_Row_set_row_height(self: Fl_Table_RowPtr, row: int, height: int) extern def Fl_Table_Row_row_height(self: Fl_Table_RowPtr, row: int) -> int extern def Fl_Table_Row_set_col_width(self: Fl_Table_RowPtr, col: int, width: int) diff --git a/fltk/_cfl_term.vp b/fltk/_cfl_term.vp index 4dad868..1ccb3c7 100644 --- a/fltk/_cfl_term.vp +++ b/fltk/_cfl_term.vp @@ -29,11 +29,11 @@ extern def Fl_Terminal_tooltip(self: Fl_TerminalPtr) -> str extern def Fl_Terminal_set_tooltip(self: Fl_TerminalPtr, txt: str) extern def Fl_Terminal_get_type(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_type(self: Fl_TerminalPtr, typ: int) -extern def Fl_Terminal_color(self: Fl_TerminalPtr) -> t.CUInt32T -extern def Fl_Terminal_set_color(self: Fl_TerminalPtr, color: t.CUInt32T) +extern def Fl_Terminal_color(self: Fl_TerminalPtr) -> uint32 +extern def Fl_Terminal_set_color(self: Fl_TerminalPtr, color: uint32) extern def Fl_Terminal_measure_label(self: Fl_TerminalPtr, a1: bytes, a2: bytes) -extern def Fl_Terminal_label_color(self: Fl_TerminalPtr) -> t.CUInt32T -extern def Fl_Terminal_set_label_color(self: Fl_TerminalPtr, color: t.CUInt32T) +extern def Fl_Terminal_label_color(self: Fl_TerminalPtr) -> uint32 +extern def Fl_Terminal_set_label_color(self: Fl_TerminalPtr, color: uint32) extern def Fl_Terminal_label_font(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_label_font(self: Fl_TerminalPtr, font: int) extern def Fl_Terminal_label_size(self: Fl_TerminalPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Terminal_set_when(self: Fl_TerminalPtr, a1: int) extern def Fl_Terminal_when(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_image(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_parent(self: Fl_TerminalPtr) -> bytes -extern def Fl_Terminal_selection_color(self: Fl_TerminalPtr) -> t.CUInt32T -extern def Fl_Terminal_set_selection_color(self: Fl_TerminalPtr, color: t.CUInt32T) +extern def Fl_Terminal_selection_color(self: Fl_TerminalPtr) -> uint32 +extern def Fl_Terminal_set_selection_color(self: Fl_TerminalPtr, color: uint32) extern def Fl_Terminal_do_callback(self: Fl_TerminalPtr) extern def Fl_Terminal_inside(self: Fl_TerminalPtr, a1: bytes) -> int extern def Fl_Terminal_window(self: Fl_TerminalPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Terminal_take_focus(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_visible_focus(self: Fl_TerminalPtr) extern def Fl_Terminal_clear_visible_focus(self: Fl_TerminalPtr) extern def Fl_Terminal_visible_focus(self: Fl_TerminalPtr, v: int) -extern def Fl_Terminal_has_visible_focus(self: Fl_TerminalPtr) -> t.CUInt32T +extern def Fl_Terminal_has_visible_focus(self: Fl_TerminalPtr) -> uint32 extern def Fl_Terminal_set_user_data(self: Fl_TerminalPtr, data: bytes) extern def Fl_Terminal_draw_data(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_handle_data(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_draw_data(self: Fl_TerminalPtr, data: bytes) extern def Fl_Terminal_set_handle_data(self: Fl_TerminalPtr, data: bytes) -extern def Fl_Terminal_damage(self: Fl_TerminalPtr) -> t.CUInt8T -extern def Fl_Terminal_set_damage(self: Fl_TerminalPtr, flag: t.CUInt8T) -extern def Fl_Terminal_set_damage_area(self: Fl_TerminalPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Terminal_damage(self: Fl_TerminalPtr) -> uint8 +extern def Fl_Terminal_set_damage(self: Fl_TerminalPtr, flag: uint8) +extern def Fl_Terminal_set_damage_area(self: Fl_TerminalPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Terminal_clear_damage(self: Fl_TerminalPtr) extern def Fl_Terminal_as_window(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_as_group(self: Fl_TerminalPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Terminal_deimage(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_callback(self: Fl_TerminalPtr, a1: bytes, a2: bytes) extern def Fl_Terminal_visible(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_visible_r(self: Fl_TerminalPtr) -> int -extern def Fl_Terminal_active(self: Fl_TerminalPtr) -> t.CUInt32T +extern def Fl_Terminal_active(self: Fl_TerminalPtr) -> uint32 extern def Fl_Terminal_active_r(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_callback(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_deletion_callback(self: Fl_TerminalPtr, cb1: bytes, data: bytes) @@ -176,8 +176,8 @@ extern def Fl_Terminal_print_char_utf8(self: Fl_TerminalPtr, txt: str, len_: int extern def Fl_Terminal_printf(self: Fl_TerminalPtr, fmt: str, a2: bytes) -> bytes extern def Fl_Terminal_plot_char(self: Fl_TerminalPtr, c: char, row: int, col: int) extern def Fl_Terminal_plot_char_utf8(self: Fl_TerminalPtr, txt: str, len_: int, row: int, col: int) -extern def Fl_Terminal_redraw_rate(self: Fl_TerminalPtr) -> t.CFloat -extern def Fl_Terminal_set_redraw_rate(self: Fl_TerminalPtr, set: t.CFloat) +extern def Fl_Terminal_redraw_rate(self: Fl_TerminalPtr) -> float +extern def Fl_Terminal_set_redraw_rate(self: Fl_TerminalPtr, set: float) extern def Fl_Terminal_redraw_style(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_redraw_style(self: Fl_TerminalPtr, set: int) -> bytes extern def Fl_Terminal_reset_terminal(self: Fl_TerminalPtr) @@ -197,19 +197,19 @@ extern def Fl_Terminal_selection_fg_color(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_selection_fg_color(self: Fl_TerminalPtr, set: bytes) -> bytes extern def Fl_Terminal_show_unknown(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_show_unknown(self: Fl_TerminalPtr, boolean: int) -extern def Fl_Terminal_text_attrib(self: Fl_TerminalPtr) -> t.CUInt8T -extern def Fl_Terminal_set_text_attrib(self: Fl_TerminalPtr, set: t.CUInt8T) -> bytes +extern def Fl_Terminal_text_attrib(self: Fl_TerminalPtr) -> uint8 +extern def Fl_Terminal_set_text_attrib(self: Fl_TerminalPtr, set: uint8) -> bytes extern def Fl_Terminal_text_bg_color(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_text_bg_color(self: Fl_TerminalPtr, set: bytes) -> bytes extern def Fl_Terminal_text_bg_color_default(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_text_bg_color_default(self: Fl_TerminalPtr, set: bytes) -> bytes -extern def Fl_Terminal_set_text_bg_color_xterm(self: Fl_TerminalPtr, set: t.CUInt8T) +extern def Fl_Terminal_set_text_bg_color_xterm(self: Fl_TerminalPtr, set: uint8) extern def Fl_Terminal_set_text_color(self: Fl_TerminalPtr, set: bytes) extern def Fl_Terminal_text_fg_color(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_text_fg_color(self: Fl_TerminalPtr, set: bytes) -> bytes extern def Fl_Terminal_text_fg_color_default(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_set_text_fg_color_default(self: Fl_TerminalPtr, set: bytes) -> bytes -extern def Fl_Terminal_set_text_fg_color_xterm(self: Fl_TerminalPtr, set: t.CUInt8T) +extern def Fl_Terminal_set_text_fg_color_xterm(self: Fl_TerminalPtr, set: uint8) extern def Fl_Terminal_text_font(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_set_text_font(self: Fl_TerminalPtr, set: int) -> bytes extern def Fl_Terminal_text_size(self: Fl_TerminalPtr) -> int @@ -227,12 +227,12 @@ extern def Fl_Terminal_Utf8Char_fgcolor(self: Fl_Terminal_Utf8CharPtr) -> bytes extern def Fl_Terminal_Utf8Char_is_char(self: Fl_Terminal_Utf8CharPtr, c: char) -> bytes extern def Fl_Terminal_Utf8Char_length(self: Fl_Terminal_Utf8CharPtr) -> bytes extern def Fl_Terminal_Utf8Char_max_utf8(self: Fl_Terminal_Utf8CharPtr) -> int -extern def Fl_Terminal_Utf8Char_pwidth(self: Fl_Terminal_Utf8CharPtr) -> t.CDouble +extern def Fl_Terminal_Utf8Char_pwidth(self: Fl_Terminal_Utf8CharPtr) -> double extern def Fl_Terminal_Utf8Char_pwidth_int(self: Fl_Terminal_Utf8CharPtr) -> int extern def Fl_Terminal_Utf8Char_text_utf8(self: Fl_Terminal_Utf8CharPtr) -> bytes -extern def Fl_Terminal_Utf8Char_charflags(self: Fl_Terminal_Utf8CharPtr) -> t.CUInt8T +extern def Fl_Terminal_Utf8Char_charflags(self: Fl_Terminal_Utf8CharPtr) -> uint8 extern def Fl_Terminal_Utf8Char_length(self: Fl_Terminal_Utf8CharPtr) -> int -extern def Fl_Terminal_Utf8Char_new_obj(c: t.CUInt8T) -> bytes +extern def Fl_Terminal_Utf8Char_new_obj(c: uint8) -> bytes extern def Fl_Terminal_disp_erow(self: Fl_TerminalPtr) -> bytes extern def Fl_Terminal_disp_srow(self: Fl_TerminalPtr) -> int extern def Fl_Terminal_hist_erow(self: Fl_TerminalPtr) -> int diff --git a/fltk/_cfl_text.vp b/fltk/_cfl_text.vp index 66d44d6..8a331f4 100644 --- a/fltk/_cfl_text.vp +++ b/fltk/_cfl_text.vp @@ -29,11 +29,11 @@ extern def Fl_Text_Display_tooltip(self: Fl_Text_DisplayPtr) -> str extern def Fl_Text_Display_set_tooltip(self: Fl_Text_DisplayPtr, txt: str) extern def Fl_Text_Display_get_type(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_type(self: Fl_Text_DisplayPtr, typ: int) -extern def Fl_Text_Display_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) +extern def Fl_Text_Display_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_color(self: Fl_Text_DisplayPtr, color: uint32) extern def Fl_Text_Display_measure_label(self: Fl_Text_DisplayPtr, a1: bytes, a2: bytes) -extern def Fl_Text_Display_label_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_label_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) +extern def Fl_Text_Display_label_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_label_color(self: Fl_Text_DisplayPtr, color: uint32) extern def Fl_Text_Display_label_font(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_label_font(self: Fl_Text_DisplayPtr, font: int) extern def Fl_Text_Display_label_size(self: Fl_Text_DisplayPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Text_Display_set_when(self: Fl_Text_DisplayPtr, a1: int) extern def Fl_Text_Display_when(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_image(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_parent(self: Fl_Text_DisplayPtr) -> bytes -extern def Fl_Text_Display_selection_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_selection_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) +extern def Fl_Text_Display_selection_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_selection_color(self: Fl_Text_DisplayPtr, color: uint32) extern def Fl_Text_Display_do_callback(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_inside(self: Fl_Text_DisplayPtr, a1: bytes) -> int extern def Fl_Text_Display_window(self: Fl_Text_DisplayPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Text_Display_take_focus(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_visible_focus(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_clear_visible_focus(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_visible_focus(self: Fl_Text_DisplayPtr, v: int) -extern def Fl_Text_Display_has_visible_focus(self: Fl_Text_DisplayPtr) -> t.CUInt32T +extern def Fl_Text_Display_has_visible_focus(self: Fl_Text_DisplayPtr) -> uint32 extern def Fl_Text_Display_set_user_data(self: Fl_Text_DisplayPtr, data: bytes) extern def Fl_Text_Display_draw_data(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_handle_data(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_set_draw_data(self: Fl_Text_DisplayPtr, data: bytes) extern def Fl_Text_Display_set_handle_data(self: Fl_Text_DisplayPtr, data: bytes) -extern def Fl_Text_Display_damage(self: Fl_Text_DisplayPtr) -> t.CUInt8T -extern def Fl_Text_Display_set_damage(self: Fl_Text_DisplayPtr, flag: t.CUInt8T) -extern def Fl_Text_Display_set_damage_area(self: Fl_Text_DisplayPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Text_Display_damage(self: Fl_Text_DisplayPtr) -> uint8 +extern def Fl_Text_Display_set_damage(self: Fl_Text_DisplayPtr, flag: uint8) +extern def Fl_Text_Display_set_damage_area(self: Fl_Text_DisplayPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Text_Display_clear_damage(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_as_window(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_as_group(self: Fl_Text_DisplayPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Text_Display_deimage(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_set_callback(self: Fl_Text_DisplayPtr, a1: bytes, a2: bytes) extern def Fl_Text_Display_visible(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_visible_r(self: Fl_Text_DisplayPtr) -> int -extern def Fl_Text_Display_active(self: Fl_Text_DisplayPtr) -> t.CUInt32T +extern def Fl_Text_Display_active(self: Fl_Text_DisplayPtr) -> uint32 extern def Fl_Text_Display_active_r(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_callback(self: Fl_Text_DisplayPtr) -> bytes extern def Fl_Text_Display_set_deletion_callback(self: Fl_Text_DisplayPtr, cb1: bytes, data: bytes) @@ -101,8 +101,8 @@ extern def Fl_Text_Display_text_font(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_text_font(self: Fl_Text_DisplayPtr, s: int) extern def Fl_Text_Display_text_size(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_text_size(self: Fl_Text_DisplayPtr, s: int) -extern def Fl_Text_Display_text_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_text_color(self: Fl_Text_DisplayPtr, n: t.CUInt32T) +extern def Fl_Text_Display_text_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_text_color(self: Fl_Text_DisplayPtr, n: uint32) extern def Fl_Text_Display_scroll(self: Fl_Text_DisplayPtr, topLineNum: int, horizOffset: int) extern def Fl_Text_Display_insert(self: Fl_Text_DisplayPtr, text: str) extern def Fl_Text_Display_set_insert_position(self: Fl_Text_DisplayPtr, newPos: int) @@ -116,11 +116,11 @@ extern def Fl_Text_Display_move_down(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_show_cursor(self: Fl_Text_DisplayPtr, boolean: int) extern def Fl_Text_Display_set_highlight_data(self: Fl_Text_DisplayPtr, sbuff: bytes, color: bytes, font: bytes, fontsz: bytes, attr: bytes, bgcolor: bytes, sz: int) extern def Fl_Text_Display_set_cursor_style(self: Fl_Text_DisplayPtr, style: int) -extern def Fl_Text_Display_set_cursor_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) +extern def Fl_Text_Display_set_cursor_color(self: Fl_Text_DisplayPtr, color: uint32) extern def Fl_Text_Display_set_scrollbar_size(self: Fl_Text_DisplayPtr, newSize: int) extern def Fl_Text_Display_set_scrollbar_align(self: Fl_Text_DisplayPtr, align: int) extern def Fl_Text_Display_cursor_style(self: Fl_Text_DisplayPtr) -> int -extern def Fl_Text_Display_cursor_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T +extern def Fl_Text_Display_cursor_color(self: Fl_Text_DisplayPtr) -> uint32 extern def Fl_Text_Display_scrollbar_size(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_scrollbar_align(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_line_start(self: Fl_Text_DisplayPtr, pos: int) -> int @@ -131,30 +131,30 @@ extern def Fl_Text_Display_next_word(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_previous_word(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_word_start(self: Fl_Text_DisplayPtr, pos: int) -> int extern def Fl_Text_Display_word_end(self: Fl_Text_DisplayPtr, pos: int) -> int -extern def Fl_Text_Display_x_to_col(self: Fl_Text_DisplayPtr, x: t.CDouble) -> t.CDouble -extern def Fl_Text_Display_col_to_x(self: Fl_Text_DisplayPtr, col: t.CDouble) -> t.CDouble +extern def Fl_Text_Display_x_to_col(self: Fl_Text_DisplayPtr, x: double) -> double +extern def Fl_Text_Display_col_to_x(self: Fl_Text_DisplayPtr, col: double) -> double extern def Fl_Text_Display_set_linenumber_width(self: Fl_Text_DisplayPtr, width: int) extern def Fl_Text_Display_linenumber_width(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_linenumber_font(self: Fl_Text_DisplayPtr, val: int) extern def Fl_Text_Display_linenumber_font(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_set_linenumber_size(self: Fl_Text_DisplayPtr, val: int) extern def Fl_Text_Display_linenumber_size(self: Fl_Text_DisplayPtr) -> int -extern def Fl_Text_Display_set_linenumber_fgcolor(self: Fl_Text_DisplayPtr, val: t.CUInt32T) -extern def Fl_Text_Display_linenumber_fgcolor(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_linenumber_bgcolor(self: Fl_Text_DisplayPtr, val: t.CUInt32T) -extern def Fl_Text_Display_linenumber_bgcolor(self: Fl_Text_DisplayPtr) -> t.CUInt32T +extern def Fl_Text_Display_set_linenumber_fgcolor(self: Fl_Text_DisplayPtr, val: uint32) +extern def Fl_Text_Display_linenumber_fgcolor(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_linenumber_bgcolor(self: Fl_Text_DisplayPtr, val: uint32) +extern def Fl_Text_Display_linenumber_bgcolor(self: Fl_Text_DisplayPtr) -> uint32 extern def Fl_Text_Display_set_linenumber_align(self: Fl_Text_DisplayPtr, val: int) extern def Fl_Text_Display_linenumber_align(self: Fl_Text_DisplayPtr) -> int extern def Fl_Text_Display_in_selection(self: Fl_Text_DisplayPtr, x: int, y: int) -> int extern def Fl_Text_Display_wrap_mode(self: Fl_Text_DisplayPtr, wrap: int, wrap_margin: int) extern def Fl_Text_Display_wrapped_column(self: Fl_Text_DisplayPtr, row: int, column: int) -> int extern def Fl_Text_Display_wrapped_row(self: Fl_Text_DisplayPtr, row: int) -> int -extern def Fl_Text_Display_set_grammar_underline_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) -extern def Fl_Text_Display_grammar_underline_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_spelling_underline_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) -extern def Fl_Text_Display_spelling_underline_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T -extern def Fl_Text_Display_set_secondary_selection_color(self: Fl_Text_DisplayPtr, color: t.CUInt32T) -extern def Fl_Text_Display_secondary_selection_color(self: Fl_Text_DisplayPtr) -> t.CUInt32T +extern def Fl_Text_Display_set_grammar_underline_color(self: Fl_Text_DisplayPtr, color: uint32) +extern def Fl_Text_Display_grammar_underline_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_spelling_underline_color(self: Fl_Text_DisplayPtr, color: uint32) +extern def Fl_Text_Display_spelling_underline_color(self: Fl_Text_DisplayPtr) -> uint32 +extern def Fl_Text_Display_set_secondary_selection_color(self: Fl_Text_DisplayPtr, color: uint32) +extern def Fl_Text_Display_secondary_selection_color(self: Fl_Text_DisplayPtr) -> uint32 extern def Fl_Text_Display_show_insert_position(self: Fl_Text_DisplayPtr) extern def Fl_Text_Display_overstrike(self: Fl_Text_DisplayPtr, text: str) extern def Fl_Text_Display_redisplay_range(self: Fl_Text_DisplayPtr, start: int, end: int) @@ -191,11 +191,11 @@ extern def Fl_Text_Editor_tooltip(self: Fl_Text_EditorPtr) -> str extern def Fl_Text_Editor_set_tooltip(self: Fl_Text_EditorPtr, txt: str) extern def Fl_Text_Editor_get_type(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_type(self: Fl_Text_EditorPtr, typ: int) -extern def Fl_Text_Editor_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) +extern def Fl_Text_Editor_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_color(self: Fl_Text_EditorPtr, color: uint32) extern def Fl_Text_Editor_measure_label(self: Fl_Text_EditorPtr, a1: bytes, a2: bytes) -extern def Fl_Text_Editor_label_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_label_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) +extern def Fl_Text_Editor_label_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_label_color(self: Fl_Text_EditorPtr, color: uint32) extern def Fl_Text_Editor_label_font(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_label_font(self: Fl_Text_EditorPtr, font: int) extern def Fl_Text_Editor_label_size(self: Fl_Text_EditorPtr) -> int @@ -219,8 +219,8 @@ extern def Fl_Text_Editor_set_when(self: Fl_Text_EditorPtr, a1: int) extern def Fl_Text_Editor_when(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_image(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_parent(self: Fl_Text_EditorPtr) -> bytes -extern def Fl_Text_Editor_selection_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_selection_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) +extern def Fl_Text_Editor_selection_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_selection_color(self: Fl_Text_EditorPtr, color: uint32) extern def Fl_Text_Editor_do_callback(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_inside(self: Fl_Text_EditorPtr, a1: bytes) -> int extern def Fl_Text_Editor_window(self: Fl_Text_EditorPtr) -> bytes @@ -231,15 +231,15 @@ extern def Fl_Text_Editor_take_focus(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_visible_focus(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_clear_visible_focus(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_visible_focus(self: Fl_Text_EditorPtr, v: int) -extern def Fl_Text_Editor_has_visible_focus(self: Fl_Text_EditorPtr) -> t.CUInt32T +extern def Fl_Text_Editor_has_visible_focus(self: Fl_Text_EditorPtr) -> uint32 extern def Fl_Text_Editor_set_user_data(self: Fl_Text_EditorPtr, data: bytes) extern def Fl_Text_Editor_draw_data(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_handle_data(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_set_draw_data(self: Fl_Text_EditorPtr, data: bytes) extern def Fl_Text_Editor_set_handle_data(self: Fl_Text_EditorPtr, data: bytes) -extern def Fl_Text_Editor_damage(self: Fl_Text_EditorPtr) -> t.CUInt8T -extern def Fl_Text_Editor_set_damage(self: Fl_Text_EditorPtr, flag: t.CUInt8T) -extern def Fl_Text_Editor_set_damage_area(self: Fl_Text_EditorPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Text_Editor_damage(self: Fl_Text_EditorPtr) -> uint8 +extern def Fl_Text_Editor_set_damage(self: Fl_Text_EditorPtr, flag: uint8) +extern def Fl_Text_Editor_set_damage_area(self: Fl_Text_EditorPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Text_Editor_clear_damage(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_as_window(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_as_group(self: Fl_Text_EditorPtr) -> bytes @@ -248,7 +248,7 @@ extern def Fl_Text_Editor_deimage(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_set_callback(self: Fl_Text_EditorPtr, a1: bytes, a2: bytes) extern def Fl_Text_Editor_visible(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_visible_r(self: Fl_Text_EditorPtr) -> int -extern def Fl_Text_Editor_active(self: Fl_Text_EditorPtr) -> t.CUInt32T +extern def Fl_Text_Editor_active(self: Fl_Text_EditorPtr) -> uint32 extern def Fl_Text_Editor_active_r(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_callback(self: Fl_Text_EditorPtr) -> bytes extern def Fl_Text_Editor_set_deletion_callback(self: Fl_Text_EditorPtr, cb1: bytes, data: bytes) @@ -263,8 +263,8 @@ extern def Fl_Text_Editor_text_font(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_text_font(self: Fl_Text_EditorPtr, s: int) extern def Fl_Text_Editor_text_size(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_text_size(self: Fl_Text_EditorPtr, s: int) -extern def Fl_Text_Editor_text_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_text_color(self: Fl_Text_EditorPtr, n: t.CUInt32T) +extern def Fl_Text_Editor_text_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_text_color(self: Fl_Text_EditorPtr, n: uint32) extern def Fl_Text_Editor_scroll(self: Fl_Text_EditorPtr, topLineNum: int, horizOffset: int) extern def Fl_Text_Editor_insert(self: Fl_Text_EditorPtr, text: str) extern def Fl_Text_Editor_set_insert_position(self: Fl_Text_EditorPtr, newPos: int) @@ -278,11 +278,11 @@ extern def Fl_Text_Editor_move_down(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_show_cursor(self: Fl_Text_EditorPtr, boolean: int) extern def Fl_Text_Editor_set_highlight_data(self: Fl_Text_EditorPtr, sbuff: bytes, color: bytes, font: bytes, fontsz: bytes, attr: bytes, bgcolor: bytes, sz: int) extern def Fl_Text_Editor_set_cursor_style(self: Fl_Text_EditorPtr, style: int) -extern def Fl_Text_Editor_set_cursor_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) +extern def Fl_Text_Editor_set_cursor_color(self: Fl_Text_EditorPtr, color: uint32) extern def Fl_Text_Editor_set_scrollbar_size(self: Fl_Text_EditorPtr, newSize: int) extern def Fl_Text_Editor_set_scrollbar_align(self: Fl_Text_EditorPtr, align: int) extern def Fl_Text_Editor_cursor_style(self: Fl_Text_EditorPtr) -> int -extern def Fl_Text_Editor_cursor_color(self: Fl_Text_EditorPtr) -> t.CUInt32T +extern def Fl_Text_Editor_cursor_color(self: Fl_Text_EditorPtr) -> uint32 extern def Fl_Text_Editor_scrollbar_size(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_scrollbar_align(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_line_start(self: Fl_Text_EditorPtr, pos: int) -> int @@ -293,30 +293,30 @@ extern def Fl_Text_Editor_next_word(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_previous_word(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_word_start(self: Fl_Text_EditorPtr, pos: int) -> int extern def Fl_Text_Editor_word_end(self: Fl_Text_EditorPtr, pos: int) -> int -extern def Fl_Text_Editor_x_to_col(self: Fl_Text_EditorPtr, x: t.CDouble) -> t.CDouble -extern def Fl_Text_Editor_col_to_x(self: Fl_Text_EditorPtr, col: t.CDouble) -> t.CDouble +extern def Fl_Text_Editor_x_to_col(self: Fl_Text_EditorPtr, x: double) -> double +extern def Fl_Text_Editor_col_to_x(self: Fl_Text_EditorPtr, col: double) -> double extern def Fl_Text_Editor_set_linenumber_width(self: Fl_Text_EditorPtr, width: int) extern def Fl_Text_Editor_linenumber_width(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_linenumber_font(self: Fl_Text_EditorPtr, val: int) extern def Fl_Text_Editor_linenumber_font(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_set_linenumber_size(self: Fl_Text_EditorPtr, val: int) extern def Fl_Text_Editor_linenumber_size(self: Fl_Text_EditorPtr) -> int -extern def Fl_Text_Editor_set_linenumber_fgcolor(self: Fl_Text_EditorPtr, val: t.CUInt32T) -extern def Fl_Text_Editor_linenumber_fgcolor(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_linenumber_bgcolor(self: Fl_Text_EditorPtr, val: t.CUInt32T) -extern def Fl_Text_Editor_linenumber_bgcolor(self: Fl_Text_EditorPtr) -> t.CUInt32T +extern def Fl_Text_Editor_set_linenumber_fgcolor(self: Fl_Text_EditorPtr, val: uint32) +extern def Fl_Text_Editor_linenumber_fgcolor(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_linenumber_bgcolor(self: Fl_Text_EditorPtr, val: uint32) +extern def Fl_Text_Editor_linenumber_bgcolor(self: Fl_Text_EditorPtr) -> uint32 extern def Fl_Text_Editor_set_linenumber_align(self: Fl_Text_EditorPtr, val: int) extern def Fl_Text_Editor_linenumber_align(self: Fl_Text_EditorPtr) -> int extern def Fl_Text_Editor_in_selection(self: Fl_Text_EditorPtr, x: int, y: int) -> int extern def Fl_Text_Editor_wrap_mode(self: Fl_Text_EditorPtr, wrap: int, wrap_margin: int) extern def Fl_Text_Editor_wrapped_column(self: Fl_Text_EditorPtr, row: int, column: int) -> int extern def Fl_Text_Editor_wrapped_row(self: Fl_Text_EditorPtr, row: int) -> int -extern def Fl_Text_Editor_set_grammar_underline_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) -extern def Fl_Text_Editor_grammar_underline_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_spelling_underline_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) -extern def Fl_Text_Editor_spelling_underline_color(self: Fl_Text_EditorPtr) -> t.CUInt32T -extern def Fl_Text_Editor_set_secondary_selection_color(self: Fl_Text_EditorPtr, color: t.CUInt32T) -extern def Fl_Text_Editor_secondary_selection_color(self: Fl_Text_EditorPtr) -> t.CUInt32T +extern def Fl_Text_Editor_set_grammar_underline_color(self: Fl_Text_EditorPtr, color: uint32) +extern def Fl_Text_Editor_grammar_underline_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_spelling_underline_color(self: Fl_Text_EditorPtr, color: uint32) +extern def Fl_Text_Editor_spelling_underline_color(self: Fl_Text_EditorPtr) -> uint32 +extern def Fl_Text_Editor_set_secondary_selection_color(self: Fl_Text_EditorPtr, color: uint32) +extern def Fl_Text_Editor_secondary_selection_color(self: Fl_Text_EditorPtr) -> uint32 extern def Fl_Text_Editor_show_insert_position(self: Fl_Text_EditorPtr) extern def Fl_Text_Editor_overstrike(self: Fl_Text_EditorPtr, text: str) extern def Fl_Text_Editor_redisplay_range(self: Fl_Text_EditorPtr, start: int, end: int) @@ -353,11 +353,11 @@ extern def Fl_Simple_Terminal_tooltip(self: Fl_Simple_TerminalPtr) -> str extern def Fl_Simple_Terminal_set_tooltip(self: Fl_Simple_TerminalPtr, txt: str) extern def Fl_Simple_Terminal_get_type(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_type(self: Fl_Simple_TerminalPtr, typ: int) -extern def Fl_Simple_Terminal_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) +extern def Fl_Simple_Terminal_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_color(self: Fl_Simple_TerminalPtr, color: uint32) extern def Fl_Simple_Terminal_measure_label(self: Fl_Simple_TerminalPtr, a1: bytes, a2: bytes) -extern def Fl_Simple_Terminal_label_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_label_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) +extern def Fl_Simple_Terminal_label_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_label_color(self: Fl_Simple_TerminalPtr, color: uint32) extern def Fl_Simple_Terminal_label_font(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_label_font(self: Fl_Simple_TerminalPtr, font: int) extern def Fl_Simple_Terminal_label_size(self: Fl_Simple_TerminalPtr) -> int @@ -381,8 +381,8 @@ extern def Fl_Simple_Terminal_set_when(self: Fl_Simple_TerminalPtr, a1: int) extern def Fl_Simple_Terminal_when(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_image(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_parent(self: Fl_Simple_TerminalPtr) -> bytes -extern def Fl_Simple_Terminal_selection_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_selection_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) +extern def Fl_Simple_Terminal_selection_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_selection_color(self: Fl_Simple_TerminalPtr, color: uint32) extern def Fl_Simple_Terminal_do_callback(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_inside(self: Fl_Simple_TerminalPtr, a1: bytes) -> int extern def Fl_Simple_Terminal_window(self: Fl_Simple_TerminalPtr) -> bytes @@ -393,15 +393,15 @@ extern def Fl_Simple_Terminal_take_focus(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_visible_focus(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_clear_visible_focus(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_visible_focus(self: Fl_Simple_TerminalPtr, v: int) -extern def Fl_Simple_Terminal_has_visible_focus(self: Fl_Simple_TerminalPtr) -> t.CUInt32T +extern def Fl_Simple_Terminal_has_visible_focus(self: Fl_Simple_TerminalPtr) -> uint32 extern def Fl_Simple_Terminal_set_user_data(self: Fl_Simple_TerminalPtr, data: bytes) extern def Fl_Simple_Terminal_draw_data(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_handle_data(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_set_draw_data(self: Fl_Simple_TerminalPtr, data: bytes) extern def Fl_Simple_Terminal_set_handle_data(self: Fl_Simple_TerminalPtr, data: bytes) -extern def Fl_Simple_Terminal_damage(self: Fl_Simple_TerminalPtr) -> t.CUInt8T -extern def Fl_Simple_Terminal_set_damage(self: Fl_Simple_TerminalPtr, flag: t.CUInt8T) -extern def Fl_Simple_Terminal_set_damage_area(self: Fl_Simple_TerminalPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Simple_Terminal_damage(self: Fl_Simple_TerminalPtr) -> uint8 +extern def Fl_Simple_Terminal_set_damage(self: Fl_Simple_TerminalPtr, flag: uint8) +extern def Fl_Simple_Terminal_set_damage_area(self: Fl_Simple_TerminalPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Simple_Terminal_clear_damage(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_as_window(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_as_group(self: Fl_Simple_TerminalPtr) -> bytes @@ -410,7 +410,7 @@ extern def Fl_Simple_Terminal_deimage(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_set_callback(self: Fl_Simple_TerminalPtr, a1: bytes, a2: bytes) extern def Fl_Simple_Terminal_visible(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_visible_r(self: Fl_Simple_TerminalPtr) -> int -extern def Fl_Simple_Terminal_active(self: Fl_Simple_TerminalPtr) -> t.CUInt32T +extern def Fl_Simple_Terminal_active(self: Fl_Simple_TerminalPtr) -> uint32 extern def Fl_Simple_Terminal_active_r(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_callback(self: Fl_Simple_TerminalPtr) -> bytes extern def Fl_Simple_Terminal_set_deletion_callback(self: Fl_Simple_TerminalPtr, cb1: bytes, data: bytes) @@ -425,8 +425,8 @@ extern def Fl_Simple_Terminal_text_font(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_text_font(self: Fl_Simple_TerminalPtr, s: int) extern def Fl_Simple_Terminal_text_size(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_text_size(self: Fl_Simple_TerminalPtr, s: int) -extern def Fl_Simple_Terminal_text_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_text_color(self: Fl_Simple_TerminalPtr, n: t.CUInt32T) +extern def Fl_Simple_Terminal_text_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_text_color(self: Fl_Simple_TerminalPtr, n: uint32) extern def Fl_Simple_Terminal_scroll(self: Fl_Simple_TerminalPtr, topLineNum: int, horizOffset: int) extern def Fl_Simple_Terminal_insert(self: Fl_Simple_TerminalPtr, text: str) extern def Fl_Simple_Terminal_set_insert_position(self: Fl_Simple_TerminalPtr, newPos: int) @@ -440,11 +440,11 @@ extern def Fl_Simple_Terminal_move_down(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_show_cursor(self: Fl_Simple_TerminalPtr, boolean: int) extern def Fl_Simple_Terminal_set_highlight_data(self: Fl_Simple_TerminalPtr, sbuff: bytes, color: bytes, font: bytes, fontsz: bytes, attr: bytes, bgcolor: bytes, sz: int) extern def Fl_Simple_Terminal_set_cursor_style(self: Fl_Simple_TerminalPtr, style: int) -extern def Fl_Simple_Terminal_set_cursor_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) +extern def Fl_Simple_Terminal_set_cursor_color(self: Fl_Simple_TerminalPtr, color: uint32) extern def Fl_Simple_Terminal_set_scrollbar_size(self: Fl_Simple_TerminalPtr, newSize: int) extern def Fl_Simple_Terminal_set_scrollbar_align(self: Fl_Simple_TerminalPtr, align: int) extern def Fl_Simple_Terminal_cursor_style(self: Fl_Simple_TerminalPtr) -> int -extern def Fl_Simple_Terminal_cursor_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T +extern def Fl_Simple_Terminal_cursor_color(self: Fl_Simple_TerminalPtr) -> uint32 extern def Fl_Simple_Terminal_scrollbar_size(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_scrollbar_align(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_line_start(self: Fl_Simple_TerminalPtr, pos: int) -> int @@ -455,30 +455,30 @@ extern def Fl_Simple_Terminal_next_word(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_previous_word(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_word_start(self: Fl_Simple_TerminalPtr, pos: int) -> int extern def Fl_Simple_Terminal_word_end(self: Fl_Simple_TerminalPtr, pos: int) -> int -extern def Fl_Simple_Terminal_x_to_col(self: Fl_Simple_TerminalPtr, x: t.CDouble) -> t.CDouble -extern def Fl_Simple_Terminal_col_to_x(self: Fl_Simple_TerminalPtr, col: t.CDouble) -> t.CDouble +extern def Fl_Simple_Terminal_x_to_col(self: Fl_Simple_TerminalPtr, x: double) -> double +extern def Fl_Simple_Terminal_col_to_x(self: Fl_Simple_TerminalPtr, col: double) -> double extern def Fl_Simple_Terminal_set_linenumber_width(self: Fl_Simple_TerminalPtr, width: int) extern def Fl_Simple_Terminal_linenumber_width(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_linenumber_font(self: Fl_Simple_TerminalPtr, val: int) extern def Fl_Simple_Terminal_linenumber_font(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_set_linenumber_size(self: Fl_Simple_TerminalPtr, val: int) extern def Fl_Simple_Terminal_linenumber_size(self: Fl_Simple_TerminalPtr) -> int -extern def Fl_Simple_Terminal_set_linenumber_fgcolor(self: Fl_Simple_TerminalPtr, val: t.CUInt32T) -extern def Fl_Simple_Terminal_linenumber_fgcolor(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_linenumber_bgcolor(self: Fl_Simple_TerminalPtr, val: t.CUInt32T) -extern def Fl_Simple_Terminal_linenumber_bgcolor(self: Fl_Simple_TerminalPtr) -> t.CUInt32T +extern def Fl_Simple_Terminal_set_linenumber_fgcolor(self: Fl_Simple_TerminalPtr, val: uint32) +extern def Fl_Simple_Terminal_linenumber_fgcolor(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_linenumber_bgcolor(self: Fl_Simple_TerminalPtr, val: uint32) +extern def Fl_Simple_Terminal_linenumber_bgcolor(self: Fl_Simple_TerminalPtr) -> uint32 extern def Fl_Simple_Terminal_set_linenumber_align(self: Fl_Simple_TerminalPtr, val: int) extern def Fl_Simple_Terminal_linenumber_align(self: Fl_Simple_TerminalPtr) -> int extern def Fl_Simple_Terminal_in_selection(self: Fl_Simple_TerminalPtr, x: int, y: int) -> int extern def Fl_Simple_Terminal_wrap_mode(self: Fl_Simple_TerminalPtr, wrap: int, wrap_margin: int) extern def Fl_Simple_Terminal_wrapped_column(self: Fl_Simple_TerminalPtr, row: int, column: int) -> int extern def Fl_Simple_Terminal_wrapped_row(self: Fl_Simple_TerminalPtr, row: int) -> int -extern def Fl_Simple_Terminal_set_grammar_underline_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) -extern def Fl_Simple_Terminal_grammar_underline_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_spelling_underline_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) -extern def Fl_Simple_Terminal_spelling_underline_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T -extern def Fl_Simple_Terminal_set_secondary_selection_color(self: Fl_Simple_TerminalPtr, color: t.CUInt32T) -extern def Fl_Simple_Terminal_secondary_selection_color(self: Fl_Simple_TerminalPtr) -> t.CUInt32T +extern def Fl_Simple_Terminal_set_grammar_underline_color(self: Fl_Simple_TerminalPtr, color: uint32) +extern def Fl_Simple_Terminal_grammar_underline_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_spelling_underline_color(self: Fl_Simple_TerminalPtr, color: uint32) +extern def Fl_Simple_Terminal_spelling_underline_color(self: Fl_Simple_TerminalPtr) -> uint32 +extern def Fl_Simple_Terminal_set_secondary_selection_color(self: Fl_Simple_TerminalPtr, color: uint32) +extern def Fl_Simple_Terminal_secondary_selection_color(self: Fl_Simple_TerminalPtr) -> uint32 extern def Fl_Simple_Terminal_show_insert_position(self: Fl_Simple_TerminalPtr) extern def Fl_Simple_Terminal_overstrike(self: Fl_Simple_TerminalPtr, text: str) extern def Fl_Simple_Terminal_redisplay_range(self: Fl_Simple_TerminalPtr, start: int, end: int) @@ -539,8 +539,8 @@ extern def Fl_Text_Buffer_line_end(self: Fl_Text_BufferPtr, pos: int) -> int extern def Fl_Text_Buffer_word_start(self: Fl_Text_BufferPtr, pos: int) -> int extern def Fl_Text_Buffer_word_end(self: Fl_Text_BufferPtr, pos: int) -> int extern def Fl_Text_Buffer_count_lines(self: Fl_Text_BufferPtr, startPos: int, endPos: int) -> int -extern def Fl_Text_Buffer_char_at(self: Fl_Text_BufferPtr, pos: int) -> t.CUInt32T -extern def Fl_Text_Buffer_byte_at(self: Fl_Text_BufferPtr, pos: int) -> t.CUInt8T +extern def Fl_Text_Buffer_char_at(self: Fl_Text_BufferPtr, pos: int) -> uint32 +extern def Fl_Text_Buffer_byte_at(self: Fl_Text_BufferPtr, pos: int) -> uint8 extern def Fl_Text_Buffer_address(self: Fl_Text_BufferPtr, pos: int) -> str extern def Fl_Text_Buffer_address2(self: Fl_Text_BufferPtr, pos: int) -> str extern def Fl_Text_Buffer_utf8_align(self: Fl_Text_BufferPtr, pos: int) -> int @@ -550,8 +550,8 @@ extern def Fl_Text_Buffer_remove_modify_callback(self: Fl_Text_BufferPtr, bufMod extern def Fl_Text_Buffer_call_modify_callbacks(self: Fl_Text_BufferPtr) extern def Fl_Text_Buffer_search_forward(self: Fl_Text_BufferPtr, start_pos: int, search_string: str, found_pos: bytes, match_case: int) -> int extern def Fl_Text_Buffer_search_backward(self: Fl_Text_BufferPtr, start_pos: int, search_string: str, found_pos: bytes, match_case: int) -> int -extern def Fl_Text_Buffer_findchar_forward(self: Fl_Text_BufferPtr, start_pos: int, search_char: t.CUInt32T, found_pos: bytes) -> int -extern def Fl_Text_Buffer_findchar_backward(self: Fl_Text_BufferPtr, start_pos: int, search_char: t.CUInt32T, found_pos: bytes) -> int +extern def Fl_Text_Buffer_findchar_forward(self: Fl_Text_BufferPtr, start_pos: int, search_char: uint32, found_pos: bytes) -> int +extern def Fl_Text_Buffer_findchar_backward(self: Fl_Text_BufferPtr, start_pos: int, search_char: uint32, found_pos: bytes) -> int extern def Fl_Text_Buffer_redo(self: Fl_Text_BufferPtr, cp: bytes) -> int extern def Fl_Text_Buffer_can_redo(self: Fl_Text_BufferPtr) -> int extern def Fl_Text_Buffer_insertfile(self: Fl_Text_BufferPtr, file: str, pos: int, buflen: int) -> int diff --git a/fltk/_cfl_tree.vp b/fltk/_cfl_tree.vp index 98b88f5..24c2466 100644 --- a/fltk/_cfl_tree.vp +++ b/fltk/_cfl_tree.vp @@ -29,11 +29,11 @@ extern def Fl_Tree_tooltip(self: Fl_TreePtr) -> str extern def Fl_Tree_set_tooltip(self: Fl_TreePtr, txt: str) extern def Fl_Tree_get_type(self: Fl_TreePtr) -> int extern def Fl_Tree_set_type(self: Fl_TreePtr, typ: int) -extern def Fl_Tree_color(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_color(self: Fl_TreePtr, color: t.CUInt32T) +extern def Fl_Tree_color(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_color(self: Fl_TreePtr, color: uint32) extern def Fl_Tree_measure_label(self: Fl_TreePtr, a1: bytes, a2: bytes) -extern def Fl_Tree_label_color(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_label_color(self: Fl_TreePtr, color: t.CUInt32T) +extern def Fl_Tree_label_color(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_label_color(self: Fl_TreePtr, color: uint32) extern def Fl_Tree_label_font(self: Fl_TreePtr) -> int extern def Fl_Tree_set_label_font(self: Fl_TreePtr, font: int) extern def Fl_Tree_label_size(self: Fl_TreePtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Tree_set_when(self: Fl_TreePtr, a1: int) extern def Fl_Tree_when(self: Fl_TreePtr) -> int extern def Fl_Tree_image(self: Fl_TreePtr) -> bytes extern def Fl_Tree_parent(self: Fl_TreePtr) -> bytes -extern def Fl_Tree_selection_color(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_selection_color(self: Fl_TreePtr, color: t.CUInt32T) +extern def Fl_Tree_selection_color(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_selection_color(self: Fl_TreePtr, color: uint32) extern def Fl_Tree_do_callback(self: Fl_TreePtr) extern def Fl_Tree_inside(self: Fl_TreePtr, a1: bytes) -> int extern def Fl_Tree_window(self: Fl_TreePtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Tree_take_focus(self: Fl_TreePtr) -> int extern def Fl_Tree_set_visible_focus(self: Fl_TreePtr) extern def Fl_Tree_clear_visible_focus(self: Fl_TreePtr) extern def Fl_Tree_visible_focus(self: Fl_TreePtr, v: int) -extern def Fl_Tree_has_visible_focus(self: Fl_TreePtr) -> t.CUInt32T +extern def Fl_Tree_has_visible_focus(self: Fl_TreePtr) -> uint32 extern def Fl_Tree_set_user_data(self: Fl_TreePtr, data: bytes) extern def Fl_Tree_draw_data(self: Fl_TreePtr) -> bytes extern def Fl_Tree_handle_data(self: Fl_TreePtr) -> bytes extern def Fl_Tree_set_draw_data(self: Fl_TreePtr, data: bytes) extern def Fl_Tree_set_handle_data(self: Fl_TreePtr, data: bytes) -extern def Fl_Tree_damage(self: Fl_TreePtr) -> t.CUInt8T -extern def Fl_Tree_set_damage(self: Fl_TreePtr, flag: t.CUInt8T) -extern def Fl_Tree_set_damage_area(self: Fl_TreePtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Tree_damage(self: Fl_TreePtr) -> uint8 +extern def Fl_Tree_set_damage(self: Fl_TreePtr, flag: uint8) +extern def Fl_Tree_set_damage_area(self: Fl_TreePtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Tree_clear_damage(self: Fl_TreePtr) extern def Fl_Tree_as_window(self: Fl_TreePtr) -> bytes extern def Fl_Tree_as_group(self: Fl_TreePtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Tree_deimage(self: Fl_TreePtr) -> bytes extern def Fl_Tree_set_callback(self: Fl_TreePtr, a1: bytes, a2: bytes) extern def Fl_Tree_visible(self: Fl_TreePtr) -> int extern def Fl_Tree_visible_r(self: Fl_TreePtr) -> int -extern def Fl_Tree_active(self: Fl_TreePtr) -> t.CUInt32T +extern def Fl_Tree_active(self: Fl_TreePtr) -> uint32 extern def Fl_Tree_active_r(self: Fl_TreePtr) -> int extern def Fl_Tree_callback(self: Fl_TreePtr) -> bytes extern def Fl_Tree_set_deletion_callback(self: Fl_TreePtr, cb1: bytes, data: bytes) @@ -146,12 +146,12 @@ extern def Fl_Tree_item_labelfont(self: Fl_TreePtr) -> int extern def Fl_Tree_set_item_labelfont(self: Fl_TreePtr, val: int) extern def Fl_Tree_item_labelsize(self: Fl_TreePtr) -> int extern def Fl_Tree_set_item_labelsize(self: Fl_TreePtr, val: int) -extern def Fl_Tree_item_labelfgcolor(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_item_labelfgcolor(self: Fl_TreePtr, val: t.CUInt32T) -extern def Fl_Tree_item_labelbgcolor(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_item_labelbgcolor(self: Fl_TreePtr, val: t.CUInt32T) -extern def Fl_Tree_connectorcolor(self: Fl_TreePtr) -> t.CUInt32T -extern def Fl_Tree_set_connectorcolor(self: Fl_TreePtr, val: t.CUInt32T) +extern def Fl_Tree_item_labelfgcolor(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_item_labelfgcolor(self: Fl_TreePtr, val: uint32) +extern def Fl_Tree_item_labelbgcolor(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_item_labelbgcolor(self: Fl_TreePtr, val: uint32) +extern def Fl_Tree_connectorcolor(self: Fl_TreePtr) -> uint32 +extern def Fl_Tree_set_connectorcolor(self: Fl_TreePtr, val: uint32) extern def Fl_Tree_marginleft(self: Fl_TreePtr) -> int extern def Fl_Tree_set_marginleft(self: Fl_TreePtr, val: int) extern def Fl_Tree_margintop(self: Fl_TreePtr) -> int @@ -234,12 +234,12 @@ extern def Fl_Tree_Item_set_labelfont(self: Fl_Tree_ItemPtr, val: int) extern def Fl_Tree_Item_labelfont(self: Fl_Tree_ItemPtr) -> int extern def Fl_Tree_Item_set_labelsize(self: Fl_Tree_ItemPtr, val: int) extern def Fl_Tree_Item_labelsize(self: Fl_Tree_ItemPtr) -> int -extern def Fl_Tree_Item_set_labelfgcolor(self: Fl_Tree_ItemPtr, val: t.CUInt32T) -extern def Fl_Tree_Item_labelfgcolor(self: Fl_Tree_ItemPtr) -> t.CUInt32T -extern def Fl_Tree_Item_set_labelcolor(self: Fl_Tree_ItemPtr, val: t.CUInt32T) -extern def Fl_Tree_Item_labelcolor(self: Fl_Tree_ItemPtr) -> t.CUInt32T -extern def Fl_Tree_Item_set_labelbgcolor(self: Fl_Tree_ItemPtr, val: t.CUInt32T) -extern def Fl_Tree_Item_labelbgcolor(self: Fl_Tree_ItemPtr) -> t.CUInt32T +extern def Fl_Tree_Item_set_labelfgcolor(self: Fl_Tree_ItemPtr, val: uint32) +extern def Fl_Tree_Item_labelfgcolor(self: Fl_Tree_ItemPtr) -> uint32 +extern def Fl_Tree_Item_set_labelcolor(self: Fl_Tree_ItemPtr, val: uint32) +extern def Fl_Tree_Item_labelcolor(self: Fl_Tree_ItemPtr) -> uint32 +extern def Fl_Tree_Item_set_labelbgcolor(self: Fl_Tree_ItemPtr, val: uint32) +extern def Fl_Tree_Item_labelbgcolor(self: Fl_Tree_ItemPtr) -> uint32 extern def Fl_Tree_Item_set_widget(self: Fl_Tree_ItemPtr, val: Fl_WidgetPtr) extern def Fl_Tree_Item_widget(self: Fl_Tree_ItemPtr) -> Fl_WidgetPtr extern def Fl_Tree_Item_children(self: Fl_Tree_ItemPtr) -> int diff --git a/fltk/_cfl_valuator.vp b/fltk/_cfl_valuator.vp index 5a4bd7b..eb122b4 100644 --- a/fltk/_cfl_valuator.vp +++ b/fltk/_cfl_valuator.vp @@ -29,11 +29,11 @@ extern def Fl_Slider_tooltip(self: Fl_SliderPtr) -> str extern def Fl_Slider_set_tooltip(self: Fl_SliderPtr, txt: str) extern def Fl_Slider_get_type(self: Fl_SliderPtr) -> int extern def Fl_Slider_set_type(self: Fl_SliderPtr, typ: int) -extern def Fl_Slider_color(self: Fl_SliderPtr) -> t.CUInt32T -extern def Fl_Slider_set_color(self: Fl_SliderPtr, color: t.CUInt32T) +extern def Fl_Slider_color(self: Fl_SliderPtr) -> uint32 +extern def Fl_Slider_set_color(self: Fl_SliderPtr, color: uint32) extern def Fl_Slider_measure_label(self: Fl_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Slider_label_color(self: Fl_SliderPtr) -> t.CUInt32T -extern def Fl_Slider_set_label_color(self: Fl_SliderPtr, color: t.CUInt32T) +extern def Fl_Slider_label_color(self: Fl_SliderPtr) -> uint32 +extern def Fl_Slider_set_label_color(self: Fl_SliderPtr, color: uint32) extern def Fl_Slider_label_font(self: Fl_SliderPtr) -> int extern def Fl_Slider_set_label_font(self: Fl_SliderPtr, font: int) extern def Fl_Slider_label_size(self: Fl_SliderPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Slider_set_when(self: Fl_SliderPtr, a1: int) extern def Fl_Slider_when(self: Fl_SliderPtr) -> int extern def Fl_Slider_image(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_parent(self: Fl_SliderPtr) -> bytes -extern def Fl_Slider_selection_color(self: Fl_SliderPtr) -> t.CUInt32T -extern def Fl_Slider_set_selection_color(self: Fl_SliderPtr, color: t.CUInt32T) +extern def Fl_Slider_selection_color(self: Fl_SliderPtr) -> uint32 +extern def Fl_Slider_set_selection_color(self: Fl_SliderPtr, color: uint32) extern def Fl_Slider_do_callback(self: Fl_SliderPtr) extern def Fl_Slider_inside(self: Fl_SliderPtr, a1: bytes) -> int extern def Fl_Slider_window(self: Fl_SliderPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Slider_take_focus(self: Fl_SliderPtr) -> int extern def Fl_Slider_set_visible_focus(self: Fl_SliderPtr) extern def Fl_Slider_clear_visible_focus(self: Fl_SliderPtr) extern def Fl_Slider_visible_focus(self: Fl_SliderPtr, v: int) -extern def Fl_Slider_has_visible_focus(self: Fl_SliderPtr) -> t.CUInt32T +extern def Fl_Slider_has_visible_focus(self: Fl_SliderPtr) -> uint32 extern def Fl_Slider_set_user_data(self: Fl_SliderPtr, data: bytes) extern def Fl_Slider_draw_data(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_handle_data(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_set_draw_data(self: Fl_SliderPtr, data: bytes) extern def Fl_Slider_set_handle_data(self: Fl_SliderPtr, data: bytes) -extern def Fl_Slider_damage(self: Fl_SliderPtr) -> t.CUInt8T -extern def Fl_Slider_set_damage(self: Fl_SliderPtr, flag: t.CUInt8T) -extern def Fl_Slider_set_damage_area(self: Fl_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Slider_damage(self: Fl_SliderPtr) -> uint8 +extern def Fl_Slider_set_damage(self: Fl_SliderPtr, flag: uint8) +extern def Fl_Slider_set_damage_area(self: Fl_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Slider_clear_damage(self: Fl_SliderPtr) extern def Fl_Slider_as_window(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_as_group(self: Fl_SliderPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Slider_deimage(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_set_callback(self: Fl_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Slider_visible(self: Fl_SliderPtr) -> int extern def Fl_Slider_visible_r(self: Fl_SliderPtr) -> int -extern def Fl_Slider_active(self: Fl_SliderPtr) -> t.CUInt32T +extern def Fl_Slider_active(self: Fl_SliderPtr) -> uint32 extern def Fl_Slider_active_r(self: Fl_SliderPtr) -> int extern def Fl_Slider_callback(self: Fl_SliderPtr) -> bytes extern def Fl_Slider_set_deletion_callback(self: Fl_SliderPtr, cb1: bytes, data: bytes) @@ -97,21 +97,21 @@ extern def Fl_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Slider (valuator_declare) ----- -extern def Fl_Slider_set_bounds(self: Fl_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Slider_minimum(self: Fl_SliderPtr) -> t.CDouble -extern def Fl_Slider_set_minimum(self: Fl_SliderPtr, a: t.CDouble) -extern def Fl_Slider_maximum(self: Fl_SliderPtr) -> t.CDouble -extern def Fl_Slider_set_maximum(self: Fl_SliderPtr, a: t.CDouble) -extern def Fl_Slider_set_range(self: Fl_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Slider_set_step(self: Fl_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Slider_step(self: Fl_SliderPtr) -> t.CDouble +extern def Fl_Slider_set_bounds(self: Fl_SliderPtr, a: double, b: double) +extern def Fl_Slider_minimum(self: Fl_SliderPtr) -> double +extern def Fl_Slider_set_minimum(self: Fl_SliderPtr, a: double) +extern def Fl_Slider_maximum(self: Fl_SliderPtr) -> double +extern def Fl_Slider_set_maximum(self: Fl_SliderPtr, a: double) +extern def Fl_Slider_set_range(self: Fl_SliderPtr, a: double, b: double) +extern def Fl_Slider_set_step(self: Fl_SliderPtr, a: double, b: int) +extern def Fl_Slider_step(self: Fl_SliderPtr) -> double extern def Fl_Slider_set_precision(self: Fl_SliderPtr, digits: int) -extern def Fl_Slider_value(self: Fl_SliderPtr) -> t.CDouble -extern def Fl_Slider_set_value(self: Fl_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Slider_value(self: Fl_SliderPtr) -> double +extern def Fl_Slider_set_value(self: Fl_SliderPtr, a1: double) -> int extern def Fl_Slider_format(self: Fl_SliderPtr, a1: str) -> int -extern def Fl_Slider_round(self: Fl_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Slider_clamp(self: Fl_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Slider_increment(self: Fl_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Slider_round(self: Fl_SliderPtr, a1: double) -> double +extern def Fl_Slider_clamp(self: Fl_SliderPtr, a1: double) -> double +extern def Fl_Slider_increment(self: Fl_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Nice_Slider (widget_declare) ----- extern def Fl_Nice_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Nice_SliderPtr @@ -133,11 +133,11 @@ extern def Fl_Nice_Slider_tooltip(self: Fl_Nice_SliderPtr) -> str extern def Fl_Nice_Slider_set_tooltip(self: Fl_Nice_SliderPtr, txt: str) extern def Fl_Nice_Slider_get_type(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_set_type(self: Fl_Nice_SliderPtr, typ: int) -extern def Fl_Nice_Slider_color(self: Fl_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Nice_Slider_set_color(self: Fl_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Nice_Slider_color(self: Fl_Nice_SliderPtr) -> uint32 +extern def Fl_Nice_Slider_set_color(self: Fl_Nice_SliderPtr, color: uint32) extern def Fl_Nice_Slider_measure_label(self: Fl_Nice_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Nice_Slider_label_color(self: Fl_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Nice_Slider_set_label_color(self: Fl_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Nice_Slider_label_color(self: Fl_Nice_SliderPtr) -> uint32 +extern def Fl_Nice_Slider_set_label_color(self: Fl_Nice_SliderPtr, color: uint32) extern def Fl_Nice_Slider_label_font(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_set_label_font(self: Fl_Nice_SliderPtr, font: int) extern def Fl_Nice_Slider_label_size(self: Fl_Nice_SliderPtr) -> int @@ -161,8 +161,8 @@ extern def Fl_Nice_Slider_set_when(self: Fl_Nice_SliderPtr, a1: int) extern def Fl_Nice_Slider_when(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_image(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_parent(self: Fl_Nice_SliderPtr) -> bytes -extern def Fl_Nice_Slider_selection_color(self: Fl_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Nice_Slider_set_selection_color(self: Fl_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Nice_Slider_selection_color(self: Fl_Nice_SliderPtr) -> uint32 +extern def Fl_Nice_Slider_set_selection_color(self: Fl_Nice_SliderPtr, color: uint32) extern def Fl_Nice_Slider_do_callback(self: Fl_Nice_SliderPtr) extern def Fl_Nice_Slider_inside(self: Fl_Nice_SliderPtr, a1: bytes) -> int extern def Fl_Nice_Slider_window(self: Fl_Nice_SliderPtr) -> bytes @@ -173,15 +173,15 @@ extern def Fl_Nice_Slider_take_focus(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_set_visible_focus(self: Fl_Nice_SliderPtr) extern def Fl_Nice_Slider_clear_visible_focus(self: Fl_Nice_SliderPtr) extern def Fl_Nice_Slider_visible_focus(self: Fl_Nice_SliderPtr, v: int) -extern def Fl_Nice_Slider_has_visible_focus(self: Fl_Nice_SliderPtr) -> t.CUInt32T +extern def Fl_Nice_Slider_has_visible_focus(self: Fl_Nice_SliderPtr) -> uint32 extern def Fl_Nice_Slider_set_user_data(self: Fl_Nice_SliderPtr, data: bytes) extern def Fl_Nice_Slider_draw_data(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_handle_data(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_set_draw_data(self: Fl_Nice_SliderPtr, data: bytes) extern def Fl_Nice_Slider_set_handle_data(self: Fl_Nice_SliderPtr, data: bytes) -extern def Fl_Nice_Slider_damage(self: Fl_Nice_SliderPtr) -> t.CUInt8T -extern def Fl_Nice_Slider_set_damage(self: Fl_Nice_SliderPtr, flag: t.CUInt8T) -extern def Fl_Nice_Slider_set_damage_area(self: Fl_Nice_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Nice_Slider_damage(self: Fl_Nice_SliderPtr) -> uint8 +extern def Fl_Nice_Slider_set_damage(self: Fl_Nice_SliderPtr, flag: uint8) +extern def Fl_Nice_Slider_set_damage_area(self: Fl_Nice_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Nice_Slider_clear_damage(self: Fl_Nice_SliderPtr) extern def Fl_Nice_Slider_as_window(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_as_group(self: Fl_Nice_SliderPtr) -> bytes @@ -190,7 +190,7 @@ extern def Fl_Nice_Slider_deimage(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_set_callback(self: Fl_Nice_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Nice_Slider_visible(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_visible_r(self: Fl_Nice_SliderPtr) -> int -extern def Fl_Nice_Slider_active(self: Fl_Nice_SliderPtr) -> t.CUInt32T +extern def Fl_Nice_Slider_active(self: Fl_Nice_SliderPtr) -> uint32 extern def Fl_Nice_Slider_active_r(self: Fl_Nice_SliderPtr) -> int extern def Fl_Nice_Slider_callback(self: Fl_Nice_SliderPtr) -> bytes extern def Fl_Nice_Slider_set_deletion_callback(self: Fl_Nice_SliderPtr, cb1: bytes, data: bytes) @@ -201,21 +201,21 @@ extern def Fl_Nice_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Nice_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Nice_Slider (valuator_declare) ----- -extern def Fl_Nice_Slider_set_bounds(self: Fl_Nice_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Nice_Slider_minimum(self: Fl_Nice_SliderPtr) -> t.CDouble -extern def Fl_Nice_Slider_set_minimum(self: Fl_Nice_SliderPtr, a: t.CDouble) -extern def Fl_Nice_Slider_maximum(self: Fl_Nice_SliderPtr) -> t.CDouble -extern def Fl_Nice_Slider_set_maximum(self: Fl_Nice_SliderPtr, a: t.CDouble) -extern def Fl_Nice_Slider_set_range(self: Fl_Nice_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Nice_Slider_set_step(self: Fl_Nice_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Nice_Slider_step(self: Fl_Nice_SliderPtr) -> t.CDouble +extern def Fl_Nice_Slider_set_bounds(self: Fl_Nice_SliderPtr, a: double, b: double) +extern def Fl_Nice_Slider_minimum(self: Fl_Nice_SliderPtr) -> double +extern def Fl_Nice_Slider_set_minimum(self: Fl_Nice_SliderPtr, a: double) +extern def Fl_Nice_Slider_maximum(self: Fl_Nice_SliderPtr) -> double +extern def Fl_Nice_Slider_set_maximum(self: Fl_Nice_SliderPtr, a: double) +extern def Fl_Nice_Slider_set_range(self: Fl_Nice_SliderPtr, a: double, b: double) +extern def Fl_Nice_Slider_set_step(self: Fl_Nice_SliderPtr, a: double, b: int) +extern def Fl_Nice_Slider_step(self: Fl_Nice_SliderPtr) -> double extern def Fl_Nice_Slider_set_precision(self: Fl_Nice_SliderPtr, digits: int) -extern def Fl_Nice_Slider_value(self: Fl_Nice_SliderPtr) -> t.CDouble -extern def Fl_Nice_Slider_set_value(self: Fl_Nice_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Nice_Slider_value(self: Fl_Nice_SliderPtr) -> double +extern def Fl_Nice_Slider_set_value(self: Fl_Nice_SliderPtr, a1: double) -> int extern def Fl_Nice_Slider_format(self: Fl_Nice_SliderPtr, a1: str) -> int -extern def Fl_Nice_Slider_round(self: Fl_Nice_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Nice_Slider_clamp(self: Fl_Nice_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Nice_Slider_increment(self: Fl_Nice_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Nice_Slider_round(self: Fl_Nice_SliderPtr, a1: double) -> double +extern def Fl_Nice_Slider_clamp(self: Fl_Nice_SliderPtr, a1: double) -> double +extern def Fl_Nice_Slider_increment(self: Fl_Nice_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Counter (widget_declare) ----- extern def Fl_Counter_new(x: int, y: int, width: int, height: int, title: str) -> Fl_CounterPtr @@ -237,11 +237,11 @@ extern def Fl_Counter_tooltip(self: Fl_CounterPtr) -> str extern def Fl_Counter_set_tooltip(self: Fl_CounterPtr, txt: str) extern def Fl_Counter_get_type(self: Fl_CounterPtr) -> int extern def Fl_Counter_set_type(self: Fl_CounterPtr, typ: int) -extern def Fl_Counter_color(self: Fl_CounterPtr) -> t.CUInt32T -extern def Fl_Counter_set_color(self: Fl_CounterPtr, color: t.CUInt32T) +extern def Fl_Counter_color(self: Fl_CounterPtr) -> uint32 +extern def Fl_Counter_set_color(self: Fl_CounterPtr, color: uint32) extern def Fl_Counter_measure_label(self: Fl_CounterPtr, a1: bytes, a2: bytes) -extern def Fl_Counter_label_color(self: Fl_CounterPtr) -> t.CUInt32T -extern def Fl_Counter_set_label_color(self: Fl_CounterPtr, color: t.CUInt32T) +extern def Fl_Counter_label_color(self: Fl_CounterPtr) -> uint32 +extern def Fl_Counter_set_label_color(self: Fl_CounterPtr, color: uint32) extern def Fl_Counter_label_font(self: Fl_CounterPtr) -> int extern def Fl_Counter_set_label_font(self: Fl_CounterPtr, font: int) extern def Fl_Counter_label_size(self: Fl_CounterPtr) -> int @@ -265,8 +265,8 @@ extern def Fl_Counter_set_when(self: Fl_CounterPtr, a1: int) extern def Fl_Counter_when(self: Fl_CounterPtr) -> int extern def Fl_Counter_image(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_parent(self: Fl_CounterPtr) -> bytes -extern def Fl_Counter_selection_color(self: Fl_CounterPtr) -> t.CUInt32T -extern def Fl_Counter_set_selection_color(self: Fl_CounterPtr, color: t.CUInt32T) +extern def Fl_Counter_selection_color(self: Fl_CounterPtr) -> uint32 +extern def Fl_Counter_set_selection_color(self: Fl_CounterPtr, color: uint32) extern def Fl_Counter_do_callback(self: Fl_CounterPtr) extern def Fl_Counter_inside(self: Fl_CounterPtr, a1: bytes) -> int extern def Fl_Counter_window(self: Fl_CounterPtr) -> bytes @@ -277,15 +277,15 @@ extern def Fl_Counter_take_focus(self: Fl_CounterPtr) -> int extern def Fl_Counter_set_visible_focus(self: Fl_CounterPtr) extern def Fl_Counter_clear_visible_focus(self: Fl_CounterPtr) extern def Fl_Counter_visible_focus(self: Fl_CounterPtr, v: int) -extern def Fl_Counter_has_visible_focus(self: Fl_CounterPtr) -> t.CUInt32T +extern def Fl_Counter_has_visible_focus(self: Fl_CounterPtr) -> uint32 extern def Fl_Counter_set_user_data(self: Fl_CounterPtr, data: bytes) extern def Fl_Counter_draw_data(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_handle_data(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_set_draw_data(self: Fl_CounterPtr, data: bytes) extern def Fl_Counter_set_handle_data(self: Fl_CounterPtr, data: bytes) -extern def Fl_Counter_damage(self: Fl_CounterPtr) -> t.CUInt8T -extern def Fl_Counter_set_damage(self: Fl_CounterPtr, flag: t.CUInt8T) -extern def Fl_Counter_set_damage_area(self: Fl_CounterPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Counter_damage(self: Fl_CounterPtr) -> uint8 +extern def Fl_Counter_set_damage(self: Fl_CounterPtr, flag: uint8) +extern def Fl_Counter_set_damage_area(self: Fl_CounterPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Counter_clear_damage(self: Fl_CounterPtr) extern def Fl_Counter_as_window(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_as_group(self: Fl_CounterPtr) -> bytes @@ -294,7 +294,7 @@ extern def Fl_Counter_deimage(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_set_callback(self: Fl_CounterPtr, a1: bytes, a2: bytes) extern def Fl_Counter_visible(self: Fl_CounterPtr) -> int extern def Fl_Counter_visible_r(self: Fl_CounterPtr) -> int -extern def Fl_Counter_active(self: Fl_CounterPtr) -> t.CUInt32T +extern def Fl_Counter_active(self: Fl_CounterPtr) -> uint32 extern def Fl_Counter_active_r(self: Fl_CounterPtr) -> int extern def Fl_Counter_callback(self: Fl_CounterPtr) -> bytes extern def Fl_Counter_set_deletion_callback(self: Fl_CounterPtr, cb1: bytes, data: bytes) @@ -305,21 +305,21 @@ extern def Fl_Counter_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Counter_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Counter (valuator_declare) ----- -extern def Fl_Counter_set_bounds(self: Fl_CounterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Counter_minimum(self: Fl_CounterPtr) -> t.CDouble -extern def Fl_Counter_set_minimum(self: Fl_CounterPtr, a: t.CDouble) -extern def Fl_Counter_maximum(self: Fl_CounterPtr) -> t.CDouble -extern def Fl_Counter_set_maximum(self: Fl_CounterPtr, a: t.CDouble) -extern def Fl_Counter_set_range(self: Fl_CounterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Counter_set_step(self: Fl_CounterPtr, a: t.CDouble, b: int) -extern def Fl_Counter_step(self: Fl_CounterPtr) -> t.CDouble +extern def Fl_Counter_set_bounds(self: Fl_CounterPtr, a: double, b: double) +extern def Fl_Counter_minimum(self: Fl_CounterPtr) -> double +extern def Fl_Counter_set_minimum(self: Fl_CounterPtr, a: double) +extern def Fl_Counter_maximum(self: Fl_CounterPtr) -> double +extern def Fl_Counter_set_maximum(self: Fl_CounterPtr, a: double) +extern def Fl_Counter_set_range(self: Fl_CounterPtr, a: double, b: double) +extern def Fl_Counter_set_step(self: Fl_CounterPtr, a: double, b: int) +extern def Fl_Counter_step(self: Fl_CounterPtr) -> double extern def Fl_Counter_set_precision(self: Fl_CounterPtr, digits: int) -extern def Fl_Counter_value(self: Fl_CounterPtr) -> t.CDouble -extern def Fl_Counter_set_value(self: Fl_CounterPtr, a1: t.CDouble) -> int +extern def Fl_Counter_value(self: Fl_CounterPtr) -> double +extern def Fl_Counter_set_value(self: Fl_CounterPtr, a1: double) -> int extern def Fl_Counter_format(self: Fl_CounterPtr, a1: str) -> int -extern def Fl_Counter_round(self: Fl_CounterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Counter_clamp(self: Fl_CounterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Counter_increment(self: Fl_CounterPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Counter_round(self: Fl_CounterPtr, a1: double) -> double +extern def Fl_Counter_clamp(self: Fl_CounterPtr, a1: double) -> double +extern def Fl_Counter_increment(self: Fl_CounterPtr, a1: double, a2: int) -> double # ----- Fl_Dial (widget_declare) ----- extern def Fl_Dial_new(x: int, y: int, width: int, height: int, title: str) -> Fl_DialPtr @@ -341,11 +341,11 @@ extern def Fl_Dial_tooltip(self: Fl_DialPtr) -> str extern def Fl_Dial_set_tooltip(self: Fl_DialPtr, txt: str) extern def Fl_Dial_get_type(self: Fl_DialPtr) -> int extern def Fl_Dial_set_type(self: Fl_DialPtr, typ: int) -extern def Fl_Dial_color(self: Fl_DialPtr) -> t.CUInt32T -extern def Fl_Dial_set_color(self: Fl_DialPtr, color: t.CUInt32T) +extern def Fl_Dial_color(self: Fl_DialPtr) -> uint32 +extern def Fl_Dial_set_color(self: Fl_DialPtr, color: uint32) extern def Fl_Dial_measure_label(self: Fl_DialPtr, a1: bytes, a2: bytes) -extern def Fl_Dial_label_color(self: Fl_DialPtr) -> t.CUInt32T -extern def Fl_Dial_set_label_color(self: Fl_DialPtr, color: t.CUInt32T) +extern def Fl_Dial_label_color(self: Fl_DialPtr) -> uint32 +extern def Fl_Dial_set_label_color(self: Fl_DialPtr, color: uint32) extern def Fl_Dial_label_font(self: Fl_DialPtr) -> int extern def Fl_Dial_set_label_font(self: Fl_DialPtr, font: int) extern def Fl_Dial_label_size(self: Fl_DialPtr) -> int @@ -369,8 +369,8 @@ extern def Fl_Dial_set_when(self: Fl_DialPtr, a1: int) extern def Fl_Dial_when(self: Fl_DialPtr) -> int extern def Fl_Dial_image(self: Fl_DialPtr) -> bytes extern def Fl_Dial_parent(self: Fl_DialPtr) -> bytes -extern def Fl_Dial_selection_color(self: Fl_DialPtr) -> t.CUInt32T -extern def Fl_Dial_set_selection_color(self: Fl_DialPtr, color: t.CUInt32T) +extern def Fl_Dial_selection_color(self: Fl_DialPtr) -> uint32 +extern def Fl_Dial_set_selection_color(self: Fl_DialPtr, color: uint32) extern def Fl_Dial_do_callback(self: Fl_DialPtr) extern def Fl_Dial_inside(self: Fl_DialPtr, a1: bytes) -> int extern def Fl_Dial_window(self: Fl_DialPtr) -> bytes @@ -381,15 +381,15 @@ extern def Fl_Dial_take_focus(self: Fl_DialPtr) -> int extern def Fl_Dial_set_visible_focus(self: Fl_DialPtr) extern def Fl_Dial_clear_visible_focus(self: Fl_DialPtr) extern def Fl_Dial_visible_focus(self: Fl_DialPtr, v: int) -extern def Fl_Dial_has_visible_focus(self: Fl_DialPtr) -> t.CUInt32T +extern def Fl_Dial_has_visible_focus(self: Fl_DialPtr) -> uint32 extern def Fl_Dial_set_user_data(self: Fl_DialPtr, data: bytes) extern def Fl_Dial_draw_data(self: Fl_DialPtr) -> bytes extern def Fl_Dial_handle_data(self: Fl_DialPtr) -> bytes extern def Fl_Dial_set_draw_data(self: Fl_DialPtr, data: bytes) extern def Fl_Dial_set_handle_data(self: Fl_DialPtr, data: bytes) -extern def Fl_Dial_damage(self: Fl_DialPtr) -> t.CUInt8T -extern def Fl_Dial_set_damage(self: Fl_DialPtr, flag: t.CUInt8T) -extern def Fl_Dial_set_damage_area(self: Fl_DialPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Dial_damage(self: Fl_DialPtr) -> uint8 +extern def Fl_Dial_set_damage(self: Fl_DialPtr, flag: uint8) +extern def Fl_Dial_set_damage_area(self: Fl_DialPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Dial_clear_damage(self: Fl_DialPtr) extern def Fl_Dial_as_window(self: Fl_DialPtr) -> bytes extern def Fl_Dial_as_group(self: Fl_DialPtr) -> bytes @@ -398,7 +398,7 @@ extern def Fl_Dial_deimage(self: Fl_DialPtr) -> bytes extern def Fl_Dial_set_callback(self: Fl_DialPtr, a1: bytes, a2: bytes) extern def Fl_Dial_visible(self: Fl_DialPtr) -> int extern def Fl_Dial_visible_r(self: Fl_DialPtr) -> int -extern def Fl_Dial_active(self: Fl_DialPtr) -> t.CUInt32T +extern def Fl_Dial_active(self: Fl_DialPtr) -> uint32 extern def Fl_Dial_active_r(self: Fl_DialPtr) -> int extern def Fl_Dial_callback(self: Fl_DialPtr) -> bytes extern def Fl_Dial_set_deletion_callback(self: Fl_DialPtr, cb1: bytes, data: bytes) @@ -409,21 +409,21 @@ extern def Fl_Dial_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Dial_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Dial (valuator_declare) ----- -extern def Fl_Dial_set_bounds(self: Fl_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Dial_minimum(self: Fl_DialPtr) -> t.CDouble -extern def Fl_Dial_set_minimum(self: Fl_DialPtr, a: t.CDouble) -extern def Fl_Dial_maximum(self: Fl_DialPtr) -> t.CDouble -extern def Fl_Dial_set_maximum(self: Fl_DialPtr, a: t.CDouble) -extern def Fl_Dial_set_range(self: Fl_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Dial_set_step(self: Fl_DialPtr, a: t.CDouble, b: int) -extern def Fl_Dial_step(self: Fl_DialPtr) -> t.CDouble +extern def Fl_Dial_set_bounds(self: Fl_DialPtr, a: double, b: double) +extern def Fl_Dial_minimum(self: Fl_DialPtr) -> double +extern def Fl_Dial_set_minimum(self: Fl_DialPtr, a: double) +extern def Fl_Dial_maximum(self: Fl_DialPtr) -> double +extern def Fl_Dial_set_maximum(self: Fl_DialPtr, a: double) +extern def Fl_Dial_set_range(self: Fl_DialPtr, a: double, b: double) +extern def Fl_Dial_set_step(self: Fl_DialPtr, a: double, b: int) +extern def Fl_Dial_step(self: Fl_DialPtr) -> double extern def Fl_Dial_set_precision(self: Fl_DialPtr, digits: int) -extern def Fl_Dial_value(self: Fl_DialPtr) -> t.CDouble -extern def Fl_Dial_set_value(self: Fl_DialPtr, a1: t.CDouble) -> int +extern def Fl_Dial_value(self: Fl_DialPtr) -> double +extern def Fl_Dial_set_value(self: Fl_DialPtr, a1: double) -> int extern def Fl_Dial_format(self: Fl_DialPtr, a1: str) -> int -extern def Fl_Dial_round(self: Fl_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Dial_clamp(self: Fl_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Dial_increment(self: Fl_DialPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Dial_round(self: Fl_DialPtr, a1: double) -> double +extern def Fl_Dial_clamp(self: Fl_DialPtr, a1: double) -> double +extern def Fl_Dial_increment(self: Fl_DialPtr, a1: double, a2: int) -> double # ----- Fl_Line_Dial (widget_declare) ----- extern def Fl_Line_Dial_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Line_DialPtr @@ -445,11 +445,11 @@ extern def Fl_Line_Dial_tooltip(self: Fl_Line_DialPtr) -> str extern def Fl_Line_Dial_set_tooltip(self: Fl_Line_DialPtr, txt: str) extern def Fl_Line_Dial_get_type(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_set_type(self: Fl_Line_DialPtr, typ: int) -extern def Fl_Line_Dial_color(self: Fl_Line_DialPtr) -> t.CUInt32T -extern def Fl_Line_Dial_set_color(self: Fl_Line_DialPtr, color: t.CUInt32T) +extern def Fl_Line_Dial_color(self: Fl_Line_DialPtr) -> uint32 +extern def Fl_Line_Dial_set_color(self: Fl_Line_DialPtr, color: uint32) extern def Fl_Line_Dial_measure_label(self: Fl_Line_DialPtr, a1: bytes, a2: bytes) -extern def Fl_Line_Dial_label_color(self: Fl_Line_DialPtr) -> t.CUInt32T -extern def Fl_Line_Dial_set_label_color(self: Fl_Line_DialPtr, color: t.CUInt32T) +extern def Fl_Line_Dial_label_color(self: Fl_Line_DialPtr) -> uint32 +extern def Fl_Line_Dial_set_label_color(self: Fl_Line_DialPtr, color: uint32) extern def Fl_Line_Dial_label_font(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_set_label_font(self: Fl_Line_DialPtr, font: int) extern def Fl_Line_Dial_label_size(self: Fl_Line_DialPtr) -> int @@ -473,8 +473,8 @@ extern def Fl_Line_Dial_set_when(self: Fl_Line_DialPtr, a1: int) extern def Fl_Line_Dial_when(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_image(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_parent(self: Fl_Line_DialPtr) -> bytes -extern def Fl_Line_Dial_selection_color(self: Fl_Line_DialPtr) -> t.CUInt32T -extern def Fl_Line_Dial_set_selection_color(self: Fl_Line_DialPtr, color: t.CUInt32T) +extern def Fl_Line_Dial_selection_color(self: Fl_Line_DialPtr) -> uint32 +extern def Fl_Line_Dial_set_selection_color(self: Fl_Line_DialPtr, color: uint32) extern def Fl_Line_Dial_do_callback(self: Fl_Line_DialPtr) extern def Fl_Line_Dial_inside(self: Fl_Line_DialPtr, a1: bytes) -> int extern def Fl_Line_Dial_window(self: Fl_Line_DialPtr) -> bytes @@ -485,15 +485,15 @@ extern def Fl_Line_Dial_take_focus(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_set_visible_focus(self: Fl_Line_DialPtr) extern def Fl_Line_Dial_clear_visible_focus(self: Fl_Line_DialPtr) extern def Fl_Line_Dial_visible_focus(self: Fl_Line_DialPtr, v: int) -extern def Fl_Line_Dial_has_visible_focus(self: Fl_Line_DialPtr) -> t.CUInt32T +extern def Fl_Line_Dial_has_visible_focus(self: Fl_Line_DialPtr) -> uint32 extern def Fl_Line_Dial_set_user_data(self: Fl_Line_DialPtr, data: bytes) extern def Fl_Line_Dial_draw_data(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_handle_data(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_set_draw_data(self: Fl_Line_DialPtr, data: bytes) extern def Fl_Line_Dial_set_handle_data(self: Fl_Line_DialPtr, data: bytes) -extern def Fl_Line_Dial_damage(self: Fl_Line_DialPtr) -> t.CUInt8T -extern def Fl_Line_Dial_set_damage(self: Fl_Line_DialPtr, flag: t.CUInt8T) -extern def Fl_Line_Dial_set_damage_area(self: Fl_Line_DialPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Line_Dial_damage(self: Fl_Line_DialPtr) -> uint8 +extern def Fl_Line_Dial_set_damage(self: Fl_Line_DialPtr, flag: uint8) +extern def Fl_Line_Dial_set_damage_area(self: Fl_Line_DialPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Line_Dial_clear_damage(self: Fl_Line_DialPtr) extern def Fl_Line_Dial_as_window(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_as_group(self: Fl_Line_DialPtr) -> bytes @@ -502,7 +502,7 @@ extern def Fl_Line_Dial_deimage(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_set_callback(self: Fl_Line_DialPtr, a1: bytes, a2: bytes) extern def Fl_Line_Dial_visible(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_visible_r(self: Fl_Line_DialPtr) -> int -extern def Fl_Line_Dial_active(self: Fl_Line_DialPtr) -> t.CUInt32T +extern def Fl_Line_Dial_active(self: Fl_Line_DialPtr) -> uint32 extern def Fl_Line_Dial_active_r(self: Fl_Line_DialPtr) -> int extern def Fl_Line_Dial_callback(self: Fl_Line_DialPtr) -> bytes extern def Fl_Line_Dial_set_deletion_callback(self: Fl_Line_DialPtr, cb1: bytes, data: bytes) @@ -513,21 +513,21 @@ extern def Fl_Line_Dial_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Line_Dial_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Line_Dial (valuator_declare) ----- -extern def Fl_Line_Dial_set_bounds(self: Fl_Line_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Line_Dial_minimum(self: Fl_Line_DialPtr) -> t.CDouble -extern def Fl_Line_Dial_set_minimum(self: Fl_Line_DialPtr, a: t.CDouble) -extern def Fl_Line_Dial_maximum(self: Fl_Line_DialPtr) -> t.CDouble -extern def Fl_Line_Dial_set_maximum(self: Fl_Line_DialPtr, a: t.CDouble) -extern def Fl_Line_Dial_set_range(self: Fl_Line_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Line_Dial_set_step(self: Fl_Line_DialPtr, a: t.CDouble, b: int) -extern def Fl_Line_Dial_step(self: Fl_Line_DialPtr) -> t.CDouble +extern def Fl_Line_Dial_set_bounds(self: Fl_Line_DialPtr, a: double, b: double) +extern def Fl_Line_Dial_minimum(self: Fl_Line_DialPtr) -> double +extern def Fl_Line_Dial_set_minimum(self: Fl_Line_DialPtr, a: double) +extern def Fl_Line_Dial_maximum(self: Fl_Line_DialPtr) -> double +extern def Fl_Line_Dial_set_maximum(self: Fl_Line_DialPtr, a: double) +extern def Fl_Line_Dial_set_range(self: Fl_Line_DialPtr, a: double, b: double) +extern def Fl_Line_Dial_set_step(self: Fl_Line_DialPtr, a: double, b: int) +extern def Fl_Line_Dial_step(self: Fl_Line_DialPtr) -> double extern def Fl_Line_Dial_set_precision(self: Fl_Line_DialPtr, digits: int) -extern def Fl_Line_Dial_value(self: Fl_Line_DialPtr) -> t.CDouble -extern def Fl_Line_Dial_set_value(self: Fl_Line_DialPtr, a1: t.CDouble) -> int +extern def Fl_Line_Dial_value(self: Fl_Line_DialPtr) -> double +extern def Fl_Line_Dial_set_value(self: Fl_Line_DialPtr, a1: double) -> int extern def Fl_Line_Dial_format(self: Fl_Line_DialPtr, a1: str) -> int -extern def Fl_Line_Dial_round(self: Fl_Line_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Line_Dial_clamp(self: Fl_Line_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Line_Dial_increment(self: Fl_Line_DialPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Line_Dial_round(self: Fl_Line_DialPtr, a1: double) -> double +extern def Fl_Line_Dial_clamp(self: Fl_Line_DialPtr, a1: double) -> double +extern def Fl_Line_Dial_increment(self: Fl_Line_DialPtr, a1: double, a2: int) -> double # ----- Fl_Roller (widget_declare) ----- extern def Fl_Roller_new(x: int, y: int, width: int, height: int, title: str) -> Fl_RollerPtr @@ -549,11 +549,11 @@ extern def Fl_Roller_tooltip(self: Fl_RollerPtr) -> str extern def Fl_Roller_set_tooltip(self: Fl_RollerPtr, txt: str) extern def Fl_Roller_get_type(self: Fl_RollerPtr) -> int extern def Fl_Roller_set_type(self: Fl_RollerPtr, typ: int) -extern def Fl_Roller_color(self: Fl_RollerPtr) -> t.CUInt32T -extern def Fl_Roller_set_color(self: Fl_RollerPtr, color: t.CUInt32T) +extern def Fl_Roller_color(self: Fl_RollerPtr) -> uint32 +extern def Fl_Roller_set_color(self: Fl_RollerPtr, color: uint32) extern def Fl_Roller_measure_label(self: Fl_RollerPtr, a1: bytes, a2: bytes) -extern def Fl_Roller_label_color(self: Fl_RollerPtr) -> t.CUInt32T -extern def Fl_Roller_set_label_color(self: Fl_RollerPtr, color: t.CUInt32T) +extern def Fl_Roller_label_color(self: Fl_RollerPtr) -> uint32 +extern def Fl_Roller_set_label_color(self: Fl_RollerPtr, color: uint32) extern def Fl_Roller_label_font(self: Fl_RollerPtr) -> int extern def Fl_Roller_set_label_font(self: Fl_RollerPtr, font: int) extern def Fl_Roller_label_size(self: Fl_RollerPtr) -> int @@ -577,8 +577,8 @@ extern def Fl_Roller_set_when(self: Fl_RollerPtr, a1: int) extern def Fl_Roller_when(self: Fl_RollerPtr) -> int extern def Fl_Roller_image(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_parent(self: Fl_RollerPtr) -> bytes -extern def Fl_Roller_selection_color(self: Fl_RollerPtr) -> t.CUInt32T -extern def Fl_Roller_set_selection_color(self: Fl_RollerPtr, color: t.CUInt32T) +extern def Fl_Roller_selection_color(self: Fl_RollerPtr) -> uint32 +extern def Fl_Roller_set_selection_color(self: Fl_RollerPtr, color: uint32) extern def Fl_Roller_do_callback(self: Fl_RollerPtr) extern def Fl_Roller_inside(self: Fl_RollerPtr, a1: bytes) -> int extern def Fl_Roller_window(self: Fl_RollerPtr) -> bytes @@ -589,15 +589,15 @@ extern def Fl_Roller_take_focus(self: Fl_RollerPtr) -> int extern def Fl_Roller_set_visible_focus(self: Fl_RollerPtr) extern def Fl_Roller_clear_visible_focus(self: Fl_RollerPtr) extern def Fl_Roller_visible_focus(self: Fl_RollerPtr, v: int) -extern def Fl_Roller_has_visible_focus(self: Fl_RollerPtr) -> t.CUInt32T +extern def Fl_Roller_has_visible_focus(self: Fl_RollerPtr) -> uint32 extern def Fl_Roller_set_user_data(self: Fl_RollerPtr, data: bytes) extern def Fl_Roller_draw_data(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_handle_data(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_set_draw_data(self: Fl_RollerPtr, data: bytes) extern def Fl_Roller_set_handle_data(self: Fl_RollerPtr, data: bytes) -extern def Fl_Roller_damage(self: Fl_RollerPtr) -> t.CUInt8T -extern def Fl_Roller_set_damage(self: Fl_RollerPtr, flag: t.CUInt8T) -extern def Fl_Roller_set_damage_area(self: Fl_RollerPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Roller_damage(self: Fl_RollerPtr) -> uint8 +extern def Fl_Roller_set_damage(self: Fl_RollerPtr, flag: uint8) +extern def Fl_Roller_set_damage_area(self: Fl_RollerPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Roller_clear_damage(self: Fl_RollerPtr) extern def Fl_Roller_as_window(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_as_group(self: Fl_RollerPtr) -> bytes @@ -606,7 +606,7 @@ extern def Fl_Roller_deimage(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_set_callback(self: Fl_RollerPtr, a1: bytes, a2: bytes) extern def Fl_Roller_visible(self: Fl_RollerPtr) -> int extern def Fl_Roller_visible_r(self: Fl_RollerPtr) -> int -extern def Fl_Roller_active(self: Fl_RollerPtr) -> t.CUInt32T +extern def Fl_Roller_active(self: Fl_RollerPtr) -> uint32 extern def Fl_Roller_active_r(self: Fl_RollerPtr) -> int extern def Fl_Roller_callback(self: Fl_RollerPtr) -> bytes extern def Fl_Roller_set_deletion_callback(self: Fl_RollerPtr, cb1: bytes, data: bytes) @@ -617,21 +617,21 @@ extern def Fl_Roller_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Roller_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Roller (valuator_declare) ----- -extern def Fl_Roller_set_bounds(self: Fl_RollerPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Roller_minimum(self: Fl_RollerPtr) -> t.CDouble -extern def Fl_Roller_set_minimum(self: Fl_RollerPtr, a: t.CDouble) -extern def Fl_Roller_maximum(self: Fl_RollerPtr) -> t.CDouble -extern def Fl_Roller_set_maximum(self: Fl_RollerPtr, a: t.CDouble) -extern def Fl_Roller_set_range(self: Fl_RollerPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Roller_set_step(self: Fl_RollerPtr, a: t.CDouble, b: int) -extern def Fl_Roller_step(self: Fl_RollerPtr) -> t.CDouble +extern def Fl_Roller_set_bounds(self: Fl_RollerPtr, a: double, b: double) +extern def Fl_Roller_minimum(self: Fl_RollerPtr) -> double +extern def Fl_Roller_set_minimum(self: Fl_RollerPtr, a: double) +extern def Fl_Roller_maximum(self: Fl_RollerPtr) -> double +extern def Fl_Roller_set_maximum(self: Fl_RollerPtr, a: double) +extern def Fl_Roller_set_range(self: Fl_RollerPtr, a: double, b: double) +extern def Fl_Roller_set_step(self: Fl_RollerPtr, a: double, b: int) +extern def Fl_Roller_step(self: Fl_RollerPtr) -> double extern def Fl_Roller_set_precision(self: Fl_RollerPtr, digits: int) -extern def Fl_Roller_value(self: Fl_RollerPtr) -> t.CDouble -extern def Fl_Roller_set_value(self: Fl_RollerPtr, a1: t.CDouble) -> int +extern def Fl_Roller_value(self: Fl_RollerPtr) -> double +extern def Fl_Roller_set_value(self: Fl_RollerPtr, a1: double) -> int extern def Fl_Roller_format(self: Fl_RollerPtr, a1: str) -> int -extern def Fl_Roller_round(self: Fl_RollerPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Roller_clamp(self: Fl_RollerPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Roller_increment(self: Fl_RollerPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Roller_round(self: Fl_RollerPtr, a1: double) -> double +extern def Fl_Roller_clamp(self: Fl_RollerPtr, a1: double) -> double +extern def Fl_Roller_increment(self: Fl_RollerPtr, a1: double, a2: int) -> double # ----- Fl_Scrollbar (widget_declare) ----- extern def Fl_Scrollbar_new(x: int, y: int, width: int, height: int, title: str) -> Fl_ScrollbarPtr @@ -653,11 +653,11 @@ extern def Fl_Scrollbar_tooltip(self: Fl_ScrollbarPtr) -> str extern def Fl_Scrollbar_set_tooltip(self: Fl_ScrollbarPtr, txt: str) extern def Fl_Scrollbar_get_type(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_set_type(self: Fl_ScrollbarPtr, typ: int) -extern def Fl_Scrollbar_color(self: Fl_ScrollbarPtr) -> t.CUInt32T -extern def Fl_Scrollbar_set_color(self: Fl_ScrollbarPtr, color: t.CUInt32T) +extern def Fl_Scrollbar_color(self: Fl_ScrollbarPtr) -> uint32 +extern def Fl_Scrollbar_set_color(self: Fl_ScrollbarPtr, color: uint32) extern def Fl_Scrollbar_measure_label(self: Fl_ScrollbarPtr, a1: bytes, a2: bytes) -extern def Fl_Scrollbar_label_color(self: Fl_ScrollbarPtr) -> t.CUInt32T -extern def Fl_Scrollbar_set_label_color(self: Fl_ScrollbarPtr, color: t.CUInt32T) +extern def Fl_Scrollbar_label_color(self: Fl_ScrollbarPtr) -> uint32 +extern def Fl_Scrollbar_set_label_color(self: Fl_ScrollbarPtr, color: uint32) extern def Fl_Scrollbar_label_font(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_set_label_font(self: Fl_ScrollbarPtr, font: int) extern def Fl_Scrollbar_label_size(self: Fl_ScrollbarPtr) -> int @@ -681,8 +681,8 @@ extern def Fl_Scrollbar_set_when(self: Fl_ScrollbarPtr, a1: int) extern def Fl_Scrollbar_when(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_image(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_parent(self: Fl_ScrollbarPtr) -> bytes -extern def Fl_Scrollbar_selection_color(self: Fl_ScrollbarPtr) -> t.CUInt32T -extern def Fl_Scrollbar_set_selection_color(self: Fl_ScrollbarPtr, color: t.CUInt32T) +extern def Fl_Scrollbar_selection_color(self: Fl_ScrollbarPtr) -> uint32 +extern def Fl_Scrollbar_set_selection_color(self: Fl_ScrollbarPtr, color: uint32) extern def Fl_Scrollbar_do_callback(self: Fl_ScrollbarPtr) extern def Fl_Scrollbar_inside(self: Fl_ScrollbarPtr, a1: bytes) -> int extern def Fl_Scrollbar_window(self: Fl_ScrollbarPtr) -> bytes @@ -693,15 +693,15 @@ extern def Fl_Scrollbar_take_focus(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_set_visible_focus(self: Fl_ScrollbarPtr) extern def Fl_Scrollbar_clear_visible_focus(self: Fl_ScrollbarPtr) extern def Fl_Scrollbar_visible_focus(self: Fl_ScrollbarPtr, v: int) -extern def Fl_Scrollbar_has_visible_focus(self: Fl_ScrollbarPtr) -> t.CUInt32T +extern def Fl_Scrollbar_has_visible_focus(self: Fl_ScrollbarPtr) -> uint32 extern def Fl_Scrollbar_set_user_data(self: Fl_ScrollbarPtr, data: bytes) extern def Fl_Scrollbar_draw_data(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_handle_data(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_set_draw_data(self: Fl_ScrollbarPtr, data: bytes) extern def Fl_Scrollbar_set_handle_data(self: Fl_ScrollbarPtr, data: bytes) -extern def Fl_Scrollbar_damage(self: Fl_ScrollbarPtr) -> t.CUInt8T -extern def Fl_Scrollbar_set_damage(self: Fl_ScrollbarPtr, flag: t.CUInt8T) -extern def Fl_Scrollbar_set_damage_area(self: Fl_ScrollbarPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Scrollbar_damage(self: Fl_ScrollbarPtr) -> uint8 +extern def Fl_Scrollbar_set_damage(self: Fl_ScrollbarPtr, flag: uint8) +extern def Fl_Scrollbar_set_damage_area(self: Fl_ScrollbarPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Scrollbar_clear_damage(self: Fl_ScrollbarPtr) extern def Fl_Scrollbar_as_window(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_as_group(self: Fl_ScrollbarPtr) -> bytes @@ -710,7 +710,7 @@ extern def Fl_Scrollbar_deimage(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_set_callback(self: Fl_ScrollbarPtr, a1: bytes, a2: bytes) extern def Fl_Scrollbar_visible(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_visible_r(self: Fl_ScrollbarPtr) -> int -extern def Fl_Scrollbar_active(self: Fl_ScrollbarPtr) -> t.CUInt32T +extern def Fl_Scrollbar_active(self: Fl_ScrollbarPtr) -> uint32 extern def Fl_Scrollbar_active_r(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_callback(self: Fl_ScrollbarPtr) -> bytes extern def Fl_Scrollbar_set_deletion_callback(self: Fl_ScrollbarPtr, cb1: bytes, data: bytes) @@ -721,21 +721,21 @@ extern def Fl_Scrollbar_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Scrollbar_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Scrollbar (valuator_declare) ----- -extern def Fl_Scrollbar_set_bounds(self: Fl_ScrollbarPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Scrollbar_minimum(self: Fl_ScrollbarPtr) -> t.CDouble -extern def Fl_Scrollbar_set_minimum(self: Fl_ScrollbarPtr, a: t.CDouble) -extern def Fl_Scrollbar_maximum(self: Fl_ScrollbarPtr) -> t.CDouble -extern def Fl_Scrollbar_set_maximum(self: Fl_ScrollbarPtr, a: t.CDouble) -extern def Fl_Scrollbar_set_range(self: Fl_ScrollbarPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Scrollbar_set_step(self: Fl_ScrollbarPtr, a: t.CDouble, b: int) -extern def Fl_Scrollbar_step(self: Fl_ScrollbarPtr) -> t.CDouble +extern def Fl_Scrollbar_set_bounds(self: Fl_ScrollbarPtr, a: double, b: double) +extern def Fl_Scrollbar_minimum(self: Fl_ScrollbarPtr) -> double +extern def Fl_Scrollbar_set_minimum(self: Fl_ScrollbarPtr, a: double) +extern def Fl_Scrollbar_maximum(self: Fl_ScrollbarPtr) -> double +extern def Fl_Scrollbar_set_maximum(self: Fl_ScrollbarPtr, a: double) +extern def Fl_Scrollbar_set_range(self: Fl_ScrollbarPtr, a: double, b: double) +extern def Fl_Scrollbar_set_step(self: Fl_ScrollbarPtr, a: double, b: int) +extern def Fl_Scrollbar_step(self: Fl_ScrollbarPtr) -> double extern def Fl_Scrollbar_set_precision(self: Fl_ScrollbarPtr, digits: int) -extern def Fl_Scrollbar_value(self: Fl_ScrollbarPtr) -> t.CDouble -extern def Fl_Scrollbar_set_value(self: Fl_ScrollbarPtr, a1: t.CDouble) -> int +extern def Fl_Scrollbar_value(self: Fl_ScrollbarPtr) -> double +extern def Fl_Scrollbar_set_value(self: Fl_ScrollbarPtr, a1: double) -> int extern def Fl_Scrollbar_format(self: Fl_ScrollbarPtr, a1: str) -> int -extern def Fl_Scrollbar_round(self: Fl_ScrollbarPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Scrollbar_clamp(self: Fl_ScrollbarPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Scrollbar_increment(self: Fl_ScrollbarPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Scrollbar_round(self: Fl_ScrollbarPtr, a1: double) -> double +extern def Fl_Scrollbar_clamp(self: Fl_ScrollbarPtr, a1: double) -> double +extern def Fl_Scrollbar_increment(self: Fl_ScrollbarPtr, a1: double, a2: int) -> double # ----- Fl_Value_Slider (widget_declare) ----- extern def Fl_Value_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Value_SliderPtr @@ -757,11 +757,11 @@ extern def Fl_Value_Slider_tooltip(self: Fl_Value_SliderPtr) -> str extern def Fl_Value_Slider_set_tooltip(self: Fl_Value_SliderPtr, txt: str) extern def Fl_Value_Slider_get_type(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_set_type(self: Fl_Value_SliderPtr, typ: int) -extern def Fl_Value_Slider_color(self: Fl_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Value_Slider_set_color(self: Fl_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Value_Slider_color(self: Fl_Value_SliderPtr) -> uint32 +extern def Fl_Value_Slider_set_color(self: Fl_Value_SliderPtr, color: uint32) extern def Fl_Value_Slider_measure_label(self: Fl_Value_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Value_Slider_label_color(self: Fl_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Value_Slider_set_label_color(self: Fl_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Value_Slider_label_color(self: Fl_Value_SliderPtr) -> uint32 +extern def Fl_Value_Slider_set_label_color(self: Fl_Value_SliderPtr, color: uint32) extern def Fl_Value_Slider_label_font(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_set_label_font(self: Fl_Value_SliderPtr, font: int) extern def Fl_Value_Slider_label_size(self: Fl_Value_SliderPtr) -> int @@ -785,8 +785,8 @@ extern def Fl_Value_Slider_set_when(self: Fl_Value_SliderPtr, a1: int) extern def Fl_Value_Slider_when(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_image(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_parent(self: Fl_Value_SliderPtr) -> bytes -extern def Fl_Value_Slider_selection_color(self: Fl_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Value_Slider_set_selection_color(self: Fl_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Value_Slider_selection_color(self: Fl_Value_SliderPtr) -> uint32 +extern def Fl_Value_Slider_set_selection_color(self: Fl_Value_SliderPtr, color: uint32) extern def Fl_Value_Slider_do_callback(self: Fl_Value_SliderPtr) extern def Fl_Value_Slider_inside(self: Fl_Value_SliderPtr, a1: bytes) -> int extern def Fl_Value_Slider_window(self: Fl_Value_SliderPtr) -> bytes @@ -797,15 +797,15 @@ extern def Fl_Value_Slider_take_focus(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_set_visible_focus(self: Fl_Value_SliderPtr) extern def Fl_Value_Slider_clear_visible_focus(self: Fl_Value_SliderPtr) extern def Fl_Value_Slider_visible_focus(self: Fl_Value_SliderPtr, v: int) -extern def Fl_Value_Slider_has_visible_focus(self: Fl_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Value_Slider_has_visible_focus(self: Fl_Value_SliderPtr) -> uint32 extern def Fl_Value_Slider_set_user_data(self: Fl_Value_SliderPtr, data: bytes) extern def Fl_Value_Slider_draw_data(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_handle_data(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_set_draw_data(self: Fl_Value_SliderPtr, data: bytes) extern def Fl_Value_Slider_set_handle_data(self: Fl_Value_SliderPtr, data: bytes) -extern def Fl_Value_Slider_damage(self: Fl_Value_SliderPtr) -> t.CUInt8T -extern def Fl_Value_Slider_set_damage(self: Fl_Value_SliderPtr, flag: t.CUInt8T) -extern def Fl_Value_Slider_set_damage_area(self: Fl_Value_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Value_Slider_damage(self: Fl_Value_SliderPtr) -> uint8 +extern def Fl_Value_Slider_set_damage(self: Fl_Value_SliderPtr, flag: uint8) +extern def Fl_Value_Slider_set_damage_area(self: Fl_Value_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Value_Slider_clear_damage(self: Fl_Value_SliderPtr) extern def Fl_Value_Slider_as_window(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_as_group(self: Fl_Value_SliderPtr) -> bytes @@ -814,7 +814,7 @@ extern def Fl_Value_Slider_deimage(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_set_callback(self: Fl_Value_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Value_Slider_visible(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_visible_r(self: Fl_Value_SliderPtr) -> int -extern def Fl_Value_Slider_active(self: Fl_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Value_Slider_active(self: Fl_Value_SliderPtr) -> uint32 extern def Fl_Value_Slider_active_r(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_callback(self: Fl_Value_SliderPtr) -> bytes extern def Fl_Value_Slider_set_deletion_callback(self: Fl_Value_SliderPtr, cb1: bytes, data: bytes) @@ -825,21 +825,21 @@ extern def Fl_Value_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Value_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Value_Slider (valuator_declare) ----- -extern def Fl_Value_Slider_set_bounds(self: Fl_Value_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Slider_minimum(self: Fl_Value_SliderPtr) -> t.CDouble -extern def Fl_Value_Slider_set_minimum(self: Fl_Value_SliderPtr, a: t.CDouble) -extern def Fl_Value_Slider_maximum(self: Fl_Value_SliderPtr) -> t.CDouble -extern def Fl_Value_Slider_set_maximum(self: Fl_Value_SliderPtr, a: t.CDouble) -extern def Fl_Value_Slider_set_range(self: Fl_Value_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Slider_set_step(self: Fl_Value_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Value_Slider_step(self: Fl_Value_SliderPtr) -> t.CDouble +extern def Fl_Value_Slider_set_bounds(self: Fl_Value_SliderPtr, a: double, b: double) +extern def Fl_Value_Slider_minimum(self: Fl_Value_SliderPtr) -> double +extern def Fl_Value_Slider_set_minimum(self: Fl_Value_SliderPtr, a: double) +extern def Fl_Value_Slider_maximum(self: Fl_Value_SliderPtr) -> double +extern def Fl_Value_Slider_set_maximum(self: Fl_Value_SliderPtr, a: double) +extern def Fl_Value_Slider_set_range(self: Fl_Value_SliderPtr, a: double, b: double) +extern def Fl_Value_Slider_set_step(self: Fl_Value_SliderPtr, a: double, b: int) +extern def Fl_Value_Slider_step(self: Fl_Value_SliderPtr) -> double extern def Fl_Value_Slider_set_precision(self: Fl_Value_SliderPtr, digits: int) -extern def Fl_Value_Slider_value(self: Fl_Value_SliderPtr) -> t.CDouble -extern def Fl_Value_Slider_set_value(self: Fl_Value_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Value_Slider_value(self: Fl_Value_SliderPtr) -> double +extern def Fl_Value_Slider_set_value(self: Fl_Value_SliderPtr, a1: double) -> int extern def Fl_Value_Slider_format(self: Fl_Value_SliderPtr, a1: str) -> int -extern def Fl_Value_Slider_round(self: Fl_Value_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Slider_clamp(self: Fl_Value_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Slider_increment(self: Fl_Value_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Value_Slider_round(self: Fl_Value_SliderPtr, a1: double) -> double +extern def Fl_Value_Slider_clamp(self: Fl_Value_SliderPtr, a1: double) -> double +extern def Fl_Value_Slider_increment(self: Fl_Value_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Adjuster (widget_declare) ----- extern def Fl_Adjuster_new(x: int, y: int, width: int, height: int, title: str) -> Fl_AdjusterPtr @@ -861,11 +861,11 @@ extern def Fl_Adjuster_tooltip(self: Fl_AdjusterPtr) -> str extern def Fl_Adjuster_set_tooltip(self: Fl_AdjusterPtr, txt: str) extern def Fl_Adjuster_get_type(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_set_type(self: Fl_AdjusterPtr, typ: int) -extern def Fl_Adjuster_color(self: Fl_AdjusterPtr) -> t.CUInt32T -extern def Fl_Adjuster_set_color(self: Fl_AdjusterPtr, color: t.CUInt32T) +extern def Fl_Adjuster_color(self: Fl_AdjusterPtr) -> uint32 +extern def Fl_Adjuster_set_color(self: Fl_AdjusterPtr, color: uint32) extern def Fl_Adjuster_measure_label(self: Fl_AdjusterPtr, a1: bytes, a2: bytes) -extern def Fl_Adjuster_label_color(self: Fl_AdjusterPtr) -> t.CUInt32T -extern def Fl_Adjuster_set_label_color(self: Fl_AdjusterPtr, color: t.CUInt32T) +extern def Fl_Adjuster_label_color(self: Fl_AdjusterPtr) -> uint32 +extern def Fl_Adjuster_set_label_color(self: Fl_AdjusterPtr, color: uint32) extern def Fl_Adjuster_label_font(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_set_label_font(self: Fl_AdjusterPtr, font: int) extern def Fl_Adjuster_label_size(self: Fl_AdjusterPtr) -> int @@ -889,8 +889,8 @@ extern def Fl_Adjuster_set_when(self: Fl_AdjusterPtr, a1: int) extern def Fl_Adjuster_when(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_image(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_parent(self: Fl_AdjusterPtr) -> bytes -extern def Fl_Adjuster_selection_color(self: Fl_AdjusterPtr) -> t.CUInt32T -extern def Fl_Adjuster_set_selection_color(self: Fl_AdjusterPtr, color: t.CUInt32T) +extern def Fl_Adjuster_selection_color(self: Fl_AdjusterPtr) -> uint32 +extern def Fl_Adjuster_set_selection_color(self: Fl_AdjusterPtr, color: uint32) extern def Fl_Adjuster_do_callback(self: Fl_AdjusterPtr) extern def Fl_Adjuster_inside(self: Fl_AdjusterPtr, a1: bytes) -> int extern def Fl_Adjuster_window(self: Fl_AdjusterPtr) -> bytes @@ -901,15 +901,15 @@ extern def Fl_Adjuster_take_focus(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_set_visible_focus(self: Fl_AdjusterPtr) extern def Fl_Adjuster_clear_visible_focus(self: Fl_AdjusterPtr) extern def Fl_Adjuster_visible_focus(self: Fl_AdjusterPtr, v: int) -extern def Fl_Adjuster_has_visible_focus(self: Fl_AdjusterPtr) -> t.CUInt32T +extern def Fl_Adjuster_has_visible_focus(self: Fl_AdjusterPtr) -> uint32 extern def Fl_Adjuster_set_user_data(self: Fl_AdjusterPtr, data: bytes) extern def Fl_Adjuster_draw_data(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_handle_data(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_set_draw_data(self: Fl_AdjusterPtr, data: bytes) extern def Fl_Adjuster_set_handle_data(self: Fl_AdjusterPtr, data: bytes) -extern def Fl_Adjuster_damage(self: Fl_AdjusterPtr) -> t.CUInt8T -extern def Fl_Adjuster_set_damage(self: Fl_AdjusterPtr, flag: t.CUInt8T) -extern def Fl_Adjuster_set_damage_area(self: Fl_AdjusterPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Adjuster_damage(self: Fl_AdjusterPtr) -> uint8 +extern def Fl_Adjuster_set_damage(self: Fl_AdjusterPtr, flag: uint8) +extern def Fl_Adjuster_set_damage_area(self: Fl_AdjusterPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Adjuster_clear_damage(self: Fl_AdjusterPtr) extern def Fl_Adjuster_as_window(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_as_group(self: Fl_AdjusterPtr) -> bytes @@ -918,7 +918,7 @@ extern def Fl_Adjuster_deimage(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_set_callback(self: Fl_AdjusterPtr, a1: bytes, a2: bytes) extern def Fl_Adjuster_visible(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_visible_r(self: Fl_AdjusterPtr) -> int -extern def Fl_Adjuster_active(self: Fl_AdjusterPtr) -> t.CUInt32T +extern def Fl_Adjuster_active(self: Fl_AdjusterPtr) -> uint32 extern def Fl_Adjuster_active_r(self: Fl_AdjusterPtr) -> int extern def Fl_Adjuster_callback(self: Fl_AdjusterPtr) -> bytes extern def Fl_Adjuster_set_deletion_callback(self: Fl_AdjusterPtr, cb1: bytes, data: bytes) @@ -929,21 +929,21 @@ extern def Fl_Adjuster_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Adjuster_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Adjuster (valuator_declare) ----- -extern def Fl_Adjuster_set_bounds(self: Fl_AdjusterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Adjuster_minimum(self: Fl_AdjusterPtr) -> t.CDouble -extern def Fl_Adjuster_set_minimum(self: Fl_AdjusterPtr, a: t.CDouble) -extern def Fl_Adjuster_maximum(self: Fl_AdjusterPtr) -> t.CDouble -extern def Fl_Adjuster_set_maximum(self: Fl_AdjusterPtr, a: t.CDouble) -extern def Fl_Adjuster_set_range(self: Fl_AdjusterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Adjuster_set_step(self: Fl_AdjusterPtr, a: t.CDouble, b: int) -extern def Fl_Adjuster_step(self: Fl_AdjusterPtr) -> t.CDouble +extern def Fl_Adjuster_set_bounds(self: Fl_AdjusterPtr, a: double, b: double) +extern def Fl_Adjuster_minimum(self: Fl_AdjusterPtr) -> double +extern def Fl_Adjuster_set_minimum(self: Fl_AdjusterPtr, a: double) +extern def Fl_Adjuster_maximum(self: Fl_AdjusterPtr) -> double +extern def Fl_Adjuster_set_maximum(self: Fl_AdjusterPtr, a: double) +extern def Fl_Adjuster_set_range(self: Fl_AdjusterPtr, a: double, b: double) +extern def Fl_Adjuster_set_step(self: Fl_AdjusterPtr, a: double, b: int) +extern def Fl_Adjuster_step(self: Fl_AdjusterPtr) -> double extern def Fl_Adjuster_set_precision(self: Fl_AdjusterPtr, digits: int) -extern def Fl_Adjuster_value(self: Fl_AdjusterPtr) -> t.CDouble -extern def Fl_Adjuster_set_value(self: Fl_AdjusterPtr, a1: t.CDouble) -> int +extern def Fl_Adjuster_value(self: Fl_AdjusterPtr) -> double +extern def Fl_Adjuster_set_value(self: Fl_AdjusterPtr, a1: double) -> int extern def Fl_Adjuster_format(self: Fl_AdjusterPtr, a1: str) -> int -extern def Fl_Adjuster_round(self: Fl_AdjusterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Adjuster_clamp(self: Fl_AdjusterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Adjuster_increment(self: Fl_AdjusterPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Adjuster_round(self: Fl_AdjusterPtr, a1: double) -> double +extern def Fl_Adjuster_clamp(self: Fl_AdjusterPtr, a1: double) -> double +extern def Fl_Adjuster_increment(self: Fl_AdjusterPtr, a1: double, a2: int) -> double # ----- Fl_Value_Input (widget_declare) ----- extern def Fl_Value_Input_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Value_InputPtr @@ -965,11 +965,11 @@ extern def Fl_Value_Input_tooltip(self: Fl_Value_InputPtr) -> str extern def Fl_Value_Input_set_tooltip(self: Fl_Value_InputPtr, txt: str) extern def Fl_Value_Input_get_type(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_set_type(self: Fl_Value_InputPtr, typ: int) -extern def Fl_Value_Input_color(self: Fl_Value_InputPtr) -> t.CUInt32T -extern def Fl_Value_Input_set_color(self: Fl_Value_InputPtr, color: t.CUInt32T) +extern def Fl_Value_Input_color(self: Fl_Value_InputPtr) -> uint32 +extern def Fl_Value_Input_set_color(self: Fl_Value_InputPtr, color: uint32) extern def Fl_Value_Input_measure_label(self: Fl_Value_InputPtr, a1: bytes, a2: bytes) -extern def Fl_Value_Input_label_color(self: Fl_Value_InputPtr) -> t.CUInt32T -extern def Fl_Value_Input_set_label_color(self: Fl_Value_InputPtr, color: t.CUInt32T) +extern def Fl_Value_Input_label_color(self: Fl_Value_InputPtr) -> uint32 +extern def Fl_Value_Input_set_label_color(self: Fl_Value_InputPtr, color: uint32) extern def Fl_Value_Input_label_font(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_set_label_font(self: Fl_Value_InputPtr, font: int) extern def Fl_Value_Input_label_size(self: Fl_Value_InputPtr) -> int @@ -993,8 +993,8 @@ extern def Fl_Value_Input_set_when(self: Fl_Value_InputPtr, a1: int) extern def Fl_Value_Input_when(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_image(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_parent(self: Fl_Value_InputPtr) -> bytes -extern def Fl_Value_Input_selection_color(self: Fl_Value_InputPtr) -> t.CUInt32T -extern def Fl_Value_Input_set_selection_color(self: Fl_Value_InputPtr, color: t.CUInt32T) +extern def Fl_Value_Input_selection_color(self: Fl_Value_InputPtr) -> uint32 +extern def Fl_Value_Input_set_selection_color(self: Fl_Value_InputPtr, color: uint32) extern def Fl_Value_Input_do_callback(self: Fl_Value_InputPtr) extern def Fl_Value_Input_inside(self: Fl_Value_InputPtr, a1: bytes) -> int extern def Fl_Value_Input_window(self: Fl_Value_InputPtr) -> bytes @@ -1005,15 +1005,15 @@ extern def Fl_Value_Input_take_focus(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_set_visible_focus(self: Fl_Value_InputPtr) extern def Fl_Value_Input_clear_visible_focus(self: Fl_Value_InputPtr) extern def Fl_Value_Input_visible_focus(self: Fl_Value_InputPtr, v: int) -extern def Fl_Value_Input_has_visible_focus(self: Fl_Value_InputPtr) -> t.CUInt32T +extern def Fl_Value_Input_has_visible_focus(self: Fl_Value_InputPtr) -> uint32 extern def Fl_Value_Input_set_user_data(self: Fl_Value_InputPtr, data: bytes) extern def Fl_Value_Input_draw_data(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_handle_data(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_set_draw_data(self: Fl_Value_InputPtr, data: bytes) extern def Fl_Value_Input_set_handle_data(self: Fl_Value_InputPtr, data: bytes) -extern def Fl_Value_Input_damage(self: Fl_Value_InputPtr) -> t.CUInt8T -extern def Fl_Value_Input_set_damage(self: Fl_Value_InputPtr, flag: t.CUInt8T) -extern def Fl_Value_Input_set_damage_area(self: Fl_Value_InputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Value_Input_damage(self: Fl_Value_InputPtr) -> uint8 +extern def Fl_Value_Input_set_damage(self: Fl_Value_InputPtr, flag: uint8) +extern def Fl_Value_Input_set_damage_area(self: Fl_Value_InputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Value_Input_clear_damage(self: Fl_Value_InputPtr) extern def Fl_Value_Input_as_window(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_as_group(self: Fl_Value_InputPtr) -> bytes @@ -1022,7 +1022,7 @@ extern def Fl_Value_Input_deimage(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_set_callback(self: Fl_Value_InputPtr, a1: bytes, a2: bytes) extern def Fl_Value_Input_visible(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_visible_r(self: Fl_Value_InputPtr) -> int -extern def Fl_Value_Input_active(self: Fl_Value_InputPtr) -> t.CUInt32T +extern def Fl_Value_Input_active(self: Fl_Value_InputPtr) -> uint32 extern def Fl_Value_Input_active_r(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_callback(self: Fl_Value_InputPtr) -> bytes extern def Fl_Value_Input_set_deletion_callback(self: Fl_Value_InputPtr, cb1: bytes, data: bytes) @@ -1033,21 +1033,21 @@ extern def Fl_Value_Input_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Value_Input_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Value_Input (valuator_declare) ----- -extern def Fl_Value_Input_set_bounds(self: Fl_Value_InputPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Input_minimum(self: Fl_Value_InputPtr) -> t.CDouble -extern def Fl_Value_Input_set_minimum(self: Fl_Value_InputPtr, a: t.CDouble) -extern def Fl_Value_Input_maximum(self: Fl_Value_InputPtr) -> t.CDouble -extern def Fl_Value_Input_set_maximum(self: Fl_Value_InputPtr, a: t.CDouble) -extern def Fl_Value_Input_set_range(self: Fl_Value_InputPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Input_set_step(self: Fl_Value_InputPtr, a: t.CDouble, b: int) -extern def Fl_Value_Input_step(self: Fl_Value_InputPtr) -> t.CDouble +extern def Fl_Value_Input_set_bounds(self: Fl_Value_InputPtr, a: double, b: double) +extern def Fl_Value_Input_minimum(self: Fl_Value_InputPtr) -> double +extern def Fl_Value_Input_set_minimum(self: Fl_Value_InputPtr, a: double) +extern def Fl_Value_Input_maximum(self: Fl_Value_InputPtr) -> double +extern def Fl_Value_Input_set_maximum(self: Fl_Value_InputPtr, a: double) +extern def Fl_Value_Input_set_range(self: Fl_Value_InputPtr, a: double, b: double) +extern def Fl_Value_Input_set_step(self: Fl_Value_InputPtr, a: double, b: int) +extern def Fl_Value_Input_step(self: Fl_Value_InputPtr) -> double extern def Fl_Value_Input_set_precision(self: Fl_Value_InputPtr, digits: int) -extern def Fl_Value_Input_value(self: Fl_Value_InputPtr) -> t.CDouble -extern def Fl_Value_Input_set_value(self: Fl_Value_InputPtr, a1: t.CDouble) -> int +extern def Fl_Value_Input_value(self: Fl_Value_InputPtr) -> double +extern def Fl_Value_Input_set_value(self: Fl_Value_InputPtr, a1: double) -> int extern def Fl_Value_Input_format(self: Fl_Value_InputPtr, a1: str) -> int -extern def Fl_Value_Input_round(self: Fl_Value_InputPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Input_clamp(self: Fl_Value_InputPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Input_increment(self: Fl_Value_InputPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Value_Input_round(self: Fl_Value_InputPtr, a1: double) -> double +extern def Fl_Value_Input_clamp(self: Fl_Value_InputPtr, a1: double) -> double +extern def Fl_Value_Input_increment(self: Fl_Value_InputPtr, a1: double, a2: int) -> double # ----- Fl_Value_Output (widget_declare) ----- extern def Fl_Value_Output_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Value_OutputPtr @@ -1069,11 +1069,11 @@ extern def Fl_Value_Output_tooltip(self: Fl_Value_OutputPtr) -> str extern def Fl_Value_Output_set_tooltip(self: Fl_Value_OutputPtr, txt: str) extern def Fl_Value_Output_get_type(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_set_type(self: Fl_Value_OutputPtr, typ: int) -extern def Fl_Value_Output_color(self: Fl_Value_OutputPtr) -> t.CUInt32T -extern def Fl_Value_Output_set_color(self: Fl_Value_OutputPtr, color: t.CUInt32T) +extern def Fl_Value_Output_color(self: Fl_Value_OutputPtr) -> uint32 +extern def Fl_Value_Output_set_color(self: Fl_Value_OutputPtr, color: uint32) extern def Fl_Value_Output_measure_label(self: Fl_Value_OutputPtr, a1: bytes, a2: bytes) -extern def Fl_Value_Output_label_color(self: Fl_Value_OutputPtr) -> t.CUInt32T -extern def Fl_Value_Output_set_label_color(self: Fl_Value_OutputPtr, color: t.CUInt32T) +extern def Fl_Value_Output_label_color(self: Fl_Value_OutputPtr) -> uint32 +extern def Fl_Value_Output_set_label_color(self: Fl_Value_OutputPtr, color: uint32) extern def Fl_Value_Output_label_font(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_set_label_font(self: Fl_Value_OutputPtr, font: int) extern def Fl_Value_Output_label_size(self: Fl_Value_OutputPtr) -> int @@ -1097,8 +1097,8 @@ extern def Fl_Value_Output_set_when(self: Fl_Value_OutputPtr, a1: int) extern def Fl_Value_Output_when(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_image(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_parent(self: Fl_Value_OutputPtr) -> bytes -extern def Fl_Value_Output_selection_color(self: Fl_Value_OutputPtr) -> t.CUInt32T -extern def Fl_Value_Output_set_selection_color(self: Fl_Value_OutputPtr, color: t.CUInt32T) +extern def Fl_Value_Output_selection_color(self: Fl_Value_OutputPtr) -> uint32 +extern def Fl_Value_Output_set_selection_color(self: Fl_Value_OutputPtr, color: uint32) extern def Fl_Value_Output_do_callback(self: Fl_Value_OutputPtr) extern def Fl_Value_Output_inside(self: Fl_Value_OutputPtr, a1: bytes) -> int extern def Fl_Value_Output_window(self: Fl_Value_OutputPtr) -> bytes @@ -1109,15 +1109,15 @@ extern def Fl_Value_Output_take_focus(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_set_visible_focus(self: Fl_Value_OutputPtr) extern def Fl_Value_Output_clear_visible_focus(self: Fl_Value_OutputPtr) extern def Fl_Value_Output_visible_focus(self: Fl_Value_OutputPtr, v: int) -extern def Fl_Value_Output_has_visible_focus(self: Fl_Value_OutputPtr) -> t.CUInt32T +extern def Fl_Value_Output_has_visible_focus(self: Fl_Value_OutputPtr) -> uint32 extern def Fl_Value_Output_set_user_data(self: Fl_Value_OutputPtr, data: bytes) extern def Fl_Value_Output_draw_data(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_handle_data(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_set_draw_data(self: Fl_Value_OutputPtr, data: bytes) extern def Fl_Value_Output_set_handle_data(self: Fl_Value_OutputPtr, data: bytes) -extern def Fl_Value_Output_damage(self: Fl_Value_OutputPtr) -> t.CUInt8T -extern def Fl_Value_Output_set_damage(self: Fl_Value_OutputPtr, flag: t.CUInt8T) -extern def Fl_Value_Output_set_damage_area(self: Fl_Value_OutputPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Value_Output_damage(self: Fl_Value_OutputPtr) -> uint8 +extern def Fl_Value_Output_set_damage(self: Fl_Value_OutputPtr, flag: uint8) +extern def Fl_Value_Output_set_damage_area(self: Fl_Value_OutputPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Value_Output_clear_damage(self: Fl_Value_OutputPtr) extern def Fl_Value_Output_as_window(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_as_group(self: Fl_Value_OutputPtr) -> bytes @@ -1126,7 +1126,7 @@ extern def Fl_Value_Output_deimage(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_set_callback(self: Fl_Value_OutputPtr, a1: bytes, a2: bytes) extern def Fl_Value_Output_visible(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_visible_r(self: Fl_Value_OutputPtr) -> int -extern def Fl_Value_Output_active(self: Fl_Value_OutputPtr) -> t.CUInt32T +extern def Fl_Value_Output_active(self: Fl_Value_OutputPtr) -> uint32 extern def Fl_Value_Output_active_r(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_callback(self: Fl_Value_OutputPtr) -> bytes extern def Fl_Value_Output_set_deletion_callback(self: Fl_Value_OutputPtr, cb1: bytes, data: bytes) @@ -1137,21 +1137,21 @@ extern def Fl_Value_Output_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Value_Output_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Value_Output (valuator_declare) ----- -extern def Fl_Value_Output_set_bounds(self: Fl_Value_OutputPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Output_minimum(self: Fl_Value_OutputPtr) -> t.CDouble -extern def Fl_Value_Output_set_minimum(self: Fl_Value_OutputPtr, a: t.CDouble) -extern def Fl_Value_Output_maximum(self: Fl_Value_OutputPtr) -> t.CDouble -extern def Fl_Value_Output_set_maximum(self: Fl_Value_OutputPtr, a: t.CDouble) -extern def Fl_Value_Output_set_range(self: Fl_Value_OutputPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Value_Output_set_step(self: Fl_Value_OutputPtr, a: t.CDouble, b: int) -extern def Fl_Value_Output_step(self: Fl_Value_OutputPtr) -> t.CDouble +extern def Fl_Value_Output_set_bounds(self: Fl_Value_OutputPtr, a: double, b: double) +extern def Fl_Value_Output_minimum(self: Fl_Value_OutputPtr) -> double +extern def Fl_Value_Output_set_minimum(self: Fl_Value_OutputPtr, a: double) +extern def Fl_Value_Output_maximum(self: Fl_Value_OutputPtr) -> double +extern def Fl_Value_Output_set_maximum(self: Fl_Value_OutputPtr, a: double) +extern def Fl_Value_Output_set_range(self: Fl_Value_OutputPtr, a: double, b: double) +extern def Fl_Value_Output_set_step(self: Fl_Value_OutputPtr, a: double, b: int) +extern def Fl_Value_Output_step(self: Fl_Value_OutputPtr) -> double extern def Fl_Value_Output_set_precision(self: Fl_Value_OutputPtr, digits: int) -extern def Fl_Value_Output_value(self: Fl_Value_OutputPtr) -> t.CDouble -extern def Fl_Value_Output_set_value(self: Fl_Value_OutputPtr, a1: t.CDouble) -> int +extern def Fl_Value_Output_value(self: Fl_Value_OutputPtr) -> double +extern def Fl_Value_Output_set_value(self: Fl_Value_OutputPtr, a1: double) -> int extern def Fl_Value_Output_format(self: Fl_Value_OutputPtr, a1: str) -> int -extern def Fl_Value_Output_round(self: Fl_Value_OutputPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Output_clamp(self: Fl_Value_OutputPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Value_Output_increment(self: Fl_Value_OutputPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Value_Output_round(self: Fl_Value_OutputPtr, a1: double) -> double +extern def Fl_Value_Output_clamp(self: Fl_Value_OutputPtr, a1: double) -> double +extern def Fl_Value_Output_increment(self: Fl_Value_OutputPtr, a1: double, a2: int) -> double # ----- Fl_Fill_Slider (widget_declare) ----- extern def Fl_Fill_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Fill_SliderPtr @@ -1173,11 +1173,11 @@ extern def Fl_Fill_Slider_tooltip(self: Fl_Fill_SliderPtr) -> str extern def Fl_Fill_Slider_set_tooltip(self: Fl_Fill_SliderPtr, txt: str) extern def Fl_Fill_Slider_get_type(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_set_type(self: Fl_Fill_SliderPtr, typ: int) -extern def Fl_Fill_Slider_color(self: Fl_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Fill_Slider_set_color(self: Fl_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Fill_Slider_color(self: Fl_Fill_SliderPtr) -> uint32 +extern def Fl_Fill_Slider_set_color(self: Fl_Fill_SliderPtr, color: uint32) extern def Fl_Fill_Slider_measure_label(self: Fl_Fill_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Fill_Slider_label_color(self: Fl_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Fill_Slider_set_label_color(self: Fl_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Fill_Slider_label_color(self: Fl_Fill_SliderPtr) -> uint32 +extern def Fl_Fill_Slider_set_label_color(self: Fl_Fill_SliderPtr, color: uint32) extern def Fl_Fill_Slider_label_font(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_set_label_font(self: Fl_Fill_SliderPtr, font: int) extern def Fl_Fill_Slider_label_size(self: Fl_Fill_SliderPtr) -> int @@ -1201,8 +1201,8 @@ extern def Fl_Fill_Slider_set_when(self: Fl_Fill_SliderPtr, a1: int) extern def Fl_Fill_Slider_when(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_image(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_parent(self: Fl_Fill_SliderPtr) -> bytes -extern def Fl_Fill_Slider_selection_color(self: Fl_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Fill_Slider_set_selection_color(self: Fl_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Fill_Slider_selection_color(self: Fl_Fill_SliderPtr) -> uint32 +extern def Fl_Fill_Slider_set_selection_color(self: Fl_Fill_SliderPtr, color: uint32) extern def Fl_Fill_Slider_do_callback(self: Fl_Fill_SliderPtr) extern def Fl_Fill_Slider_inside(self: Fl_Fill_SliderPtr, a1: bytes) -> int extern def Fl_Fill_Slider_window(self: Fl_Fill_SliderPtr) -> bytes @@ -1213,15 +1213,15 @@ extern def Fl_Fill_Slider_take_focus(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_set_visible_focus(self: Fl_Fill_SliderPtr) extern def Fl_Fill_Slider_clear_visible_focus(self: Fl_Fill_SliderPtr) extern def Fl_Fill_Slider_visible_focus(self: Fl_Fill_SliderPtr, v: int) -extern def Fl_Fill_Slider_has_visible_focus(self: Fl_Fill_SliderPtr) -> t.CUInt32T +extern def Fl_Fill_Slider_has_visible_focus(self: Fl_Fill_SliderPtr) -> uint32 extern def Fl_Fill_Slider_set_user_data(self: Fl_Fill_SliderPtr, data: bytes) extern def Fl_Fill_Slider_draw_data(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_handle_data(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_set_draw_data(self: Fl_Fill_SliderPtr, data: bytes) extern def Fl_Fill_Slider_set_handle_data(self: Fl_Fill_SliderPtr, data: bytes) -extern def Fl_Fill_Slider_damage(self: Fl_Fill_SliderPtr) -> t.CUInt8T -extern def Fl_Fill_Slider_set_damage(self: Fl_Fill_SliderPtr, flag: t.CUInt8T) -extern def Fl_Fill_Slider_set_damage_area(self: Fl_Fill_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Fill_Slider_damage(self: Fl_Fill_SliderPtr) -> uint8 +extern def Fl_Fill_Slider_set_damage(self: Fl_Fill_SliderPtr, flag: uint8) +extern def Fl_Fill_Slider_set_damage_area(self: Fl_Fill_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Fill_Slider_clear_damage(self: Fl_Fill_SliderPtr) extern def Fl_Fill_Slider_as_window(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_as_group(self: Fl_Fill_SliderPtr) -> bytes @@ -1230,7 +1230,7 @@ extern def Fl_Fill_Slider_deimage(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_set_callback(self: Fl_Fill_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Fill_Slider_visible(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_visible_r(self: Fl_Fill_SliderPtr) -> int -extern def Fl_Fill_Slider_active(self: Fl_Fill_SliderPtr) -> t.CUInt32T +extern def Fl_Fill_Slider_active(self: Fl_Fill_SliderPtr) -> uint32 extern def Fl_Fill_Slider_active_r(self: Fl_Fill_SliderPtr) -> int extern def Fl_Fill_Slider_callback(self: Fl_Fill_SliderPtr) -> bytes extern def Fl_Fill_Slider_set_deletion_callback(self: Fl_Fill_SliderPtr, cb1: bytes, data: bytes) @@ -1241,21 +1241,21 @@ extern def Fl_Fill_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Fill_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Fill_Slider (valuator_declare) ----- -extern def Fl_Fill_Slider_set_bounds(self: Fl_Fill_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Fill_Slider_minimum(self: Fl_Fill_SliderPtr) -> t.CDouble -extern def Fl_Fill_Slider_set_minimum(self: Fl_Fill_SliderPtr, a: t.CDouble) -extern def Fl_Fill_Slider_maximum(self: Fl_Fill_SliderPtr) -> t.CDouble -extern def Fl_Fill_Slider_set_maximum(self: Fl_Fill_SliderPtr, a: t.CDouble) -extern def Fl_Fill_Slider_set_range(self: Fl_Fill_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Fill_Slider_set_step(self: Fl_Fill_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Fill_Slider_step(self: Fl_Fill_SliderPtr) -> t.CDouble +extern def Fl_Fill_Slider_set_bounds(self: Fl_Fill_SliderPtr, a: double, b: double) +extern def Fl_Fill_Slider_minimum(self: Fl_Fill_SliderPtr) -> double +extern def Fl_Fill_Slider_set_minimum(self: Fl_Fill_SliderPtr, a: double) +extern def Fl_Fill_Slider_maximum(self: Fl_Fill_SliderPtr) -> double +extern def Fl_Fill_Slider_set_maximum(self: Fl_Fill_SliderPtr, a: double) +extern def Fl_Fill_Slider_set_range(self: Fl_Fill_SliderPtr, a: double, b: double) +extern def Fl_Fill_Slider_set_step(self: Fl_Fill_SliderPtr, a: double, b: int) +extern def Fl_Fill_Slider_step(self: Fl_Fill_SliderPtr) -> double extern def Fl_Fill_Slider_set_precision(self: Fl_Fill_SliderPtr, digits: int) -extern def Fl_Fill_Slider_value(self: Fl_Fill_SliderPtr) -> t.CDouble -extern def Fl_Fill_Slider_set_value(self: Fl_Fill_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Fill_Slider_value(self: Fl_Fill_SliderPtr) -> double +extern def Fl_Fill_Slider_set_value(self: Fl_Fill_SliderPtr, a1: double) -> int extern def Fl_Fill_Slider_format(self: Fl_Fill_SliderPtr, a1: str) -> int -extern def Fl_Fill_Slider_round(self: Fl_Fill_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Fill_Slider_clamp(self: Fl_Fill_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Fill_Slider_increment(self: Fl_Fill_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Fill_Slider_round(self: Fl_Fill_SliderPtr, a1: double) -> double +extern def Fl_Fill_Slider_clamp(self: Fl_Fill_SliderPtr, a1: double) -> double +extern def Fl_Fill_Slider_increment(self: Fl_Fill_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Fill_Dial (widget_declare) ----- extern def Fl_Fill_Dial_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Fill_DialPtr @@ -1277,11 +1277,11 @@ extern def Fl_Fill_Dial_tooltip(self: Fl_Fill_DialPtr) -> str extern def Fl_Fill_Dial_set_tooltip(self: Fl_Fill_DialPtr, txt: str) extern def Fl_Fill_Dial_get_type(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_set_type(self: Fl_Fill_DialPtr, typ: int) -extern def Fl_Fill_Dial_color(self: Fl_Fill_DialPtr) -> t.CUInt32T -extern def Fl_Fill_Dial_set_color(self: Fl_Fill_DialPtr, color: t.CUInt32T) +extern def Fl_Fill_Dial_color(self: Fl_Fill_DialPtr) -> uint32 +extern def Fl_Fill_Dial_set_color(self: Fl_Fill_DialPtr, color: uint32) extern def Fl_Fill_Dial_measure_label(self: Fl_Fill_DialPtr, a1: bytes, a2: bytes) -extern def Fl_Fill_Dial_label_color(self: Fl_Fill_DialPtr) -> t.CUInt32T -extern def Fl_Fill_Dial_set_label_color(self: Fl_Fill_DialPtr, color: t.CUInt32T) +extern def Fl_Fill_Dial_label_color(self: Fl_Fill_DialPtr) -> uint32 +extern def Fl_Fill_Dial_set_label_color(self: Fl_Fill_DialPtr, color: uint32) extern def Fl_Fill_Dial_label_font(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_set_label_font(self: Fl_Fill_DialPtr, font: int) extern def Fl_Fill_Dial_label_size(self: Fl_Fill_DialPtr) -> int @@ -1305,8 +1305,8 @@ extern def Fl_Fill_Dial_set_when(self: Fl_Fill_DialPtr, a1: int) extern def Fl_Fill_Dial_when(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_image(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_parent(self: Fl_Fill_DialPtr) -> bytes -extern def Fl_Fill_Dial_selection_color(self: Fl_Fill_DialPtr) -> t.CUInt32T -extern def Fl_Fill_Dial_set_selection_color(self: Fl_Fill_DialPtr, color: t.CUInt32T) +extern def Fl_Fill_Dial_selection_color(self: Fl_Fill_DialPtr) -> uint32 +extern def Fl_Fill_Dial_set_selection_color(self: Fl_Fill_DialPtr, color: uint32) extern def Fl_Fill_Dial_do_callback(self: Fl_Fill_DialPtr) extern def Fl_Fill_Dial_inside(self: Fl_Fill_DialPtr, a1: bytes) -> int extern def Fl_Fill_Dial_window(self: Fl_Fill_DialPtr) -> bytes @@ -1317,15 +1317,15 @@ extern def Fl_Fill_Dial_take_focus(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_set_visible_focus(self: Fl_Fill_DialPtr) extern def Fl_Fill_Dial_clear_visible_focus(self: Fl_Fill_DialPtr) extern def Fl_Fill_Dial_visible_focus(self: Fl_Fill_DialPtr, v: int) -extern def Fl_Fill_Dial_has_visible_focus(self: Fl_Fill_DialPtr) -> t.CUInt32T +extern def Fl_Fill_Dial_has_visible_focus(self: Fl_Fill_DialPtr) -> uint32 extern def Fl_Fill_Dial_set_user_data(self: Fl_Fill_DialPtr, data: bytes) extern def Fl_Fill_Dial_draw_data(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_handle_data(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_set_draw_data(self: Fl_Fill_DialPtr, data: bytes) extern def Fl_Fill_Dial_set_handle_data(self: Fl_Fill_DialPtr, data: bytes) -extern def Fl_Fill_Dial_damage(self: Fl_Fill_DialPtr) -> t.CUInt8T -extern def Fl_Fill_Dial_set_damage(self: Fl_Fill_DialPtr, flag: t.CUInt8T) -extern def Fl_Fill_Dial_set_damage_area(self: Fl_Fill_DialPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Fill_Dial_damage(self: Fl_Fill_DialPtr) -> uint8 +extern def Fl_Fill_Dial_set_damage(self: Fl_Fill_DialPtr, flag: uint8) +extern def Fl_Fill_Dial_set_damage_area(self: Fl_Fill_DialPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Fill_Dial_clear_damage(self: Fl_Fill_DialPtr) extern def Fl_Fill_Dial_as_window(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_as_group(self: Fl_Fill_DialPtr) -> bytes @@ -1334,7 +1334,7 @@ extern def Fl_Fill_Dial_deimage(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_set_callback(self: Fl_Fill_DialPtr, a1: bytes, a2: bytes) extern def Fl_Fill_Dial_visible(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_visible_r(self: Fl_Fill_DialPtr) -> int -extern def Fl_Fill_Dial_active(self: Fl_Fill_DialPtr) -> t.CUInt32T +extern def Fl_Fill_Dial_active(self: Fl_Fill_DialPtr) -> uint32 extern def Fl_Fill_Dial_active_r(self: Fl_Fill_DialPtr) -> int extern def Fl_Fill_Dial_callback(self: Fl_Fill_DialPtr) -> bytes extern def Fl_Fill_Dial_set_deletion_callback(self: Fl_Fill_DialPtr, cb1: bytes, data: bytes) @@ -1345,21 +1345,21 @@ extern def Fl_Fill_Dial_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Fill_Dial_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Fill_Dial (valuator_declare) ----- -extern def Fl_Fill_Dial_set_bounds(self: Fl_Fill_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Fill_Dial_minimum(self: Fl_Fill_DialPtr) -> t.CDouble -extern def Fl_Fill_Dial_set_minimum(self: Fl_Fill_DialPtr, a: t.CDouble) -extern def Fl_Fill_Dial_maximum(self: Fl_Fill_DialPtr) -> t.CDouble -extern def Fl_Fill_Dial_set_maximum(self: Fl_Fill_DialPtr, a: t.CDouble) -extern def Fl_Fill_Dial_set_range(self: Fl_Fill_DialPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Fill_Dial_set_step(self: Fl_Fill_DialPtr, a: t.CDouble, b: int) -extern def Fl_Fill_Dial_step(self: Fl_Fill_DialPtr) -> t.CDouble +extern def Fl_Fill_Dial_set_bounds(self: Fl_Fill_DialPtr, a: double, b: double) +extern def Fl_Fill_Dial_minimum(self: Fl_Fill_DialPtr) -> double +extern def Fl_Fill_Dial_set_minimum(self: Fl_Fill_DialPtr, a: double) +extern def Fl_Fill_Dial_maximum(self: Fl_Fill_DialPtr) -> double +extern def Fl_Fill_Dial_set_maximum(self: Fl_Fill_DialPtr, a: double) +extern def Fl_Fill_Dial_set_range(self: Fl_Fill_DialPtr, a: double, b: double) +extern def Fl_Fill_Dial_set_step(self: Fl_Fill_DialPtr, a: double, b: int) +extern def Fl_Fill_Dial_step(self: Fl_Fill_DialPtr) -> double extern def Fl_Fill_Dial_set_precision(self: Fl_Fill_DialPtr, digits: int) -extern def Fl_Fill_Dial_value(self: Fl_Fill_DialPtr) -> t.CDouble -extern def Fl_Fill_Dial_set_value(self: Fl_Fill_DialPtr, a1: t.CDouble) -> int +extern def Fl_Fill_Dial_value(self: Fl_Fill_DialPtr) -> double +extern def Fl_Fill_Dial_set_value(self: Fl_Fill_DialPtr, a1: double) -> int extern def Fl_Fill_Dial_format(self: Fl_Fill_DialPtr, a1: str) -> int -extern def Fl_Fill_Dial_round(self: Fl_Fill_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Fill_Dial_clamp(self: Fl_Fill_DialPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Fill_Dial_increment(self: Fl_Fill_DialPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Fill_Dial_round(self: Fl_Fill_DialPtr, a1: double) -> double +extern def Fl_Fill_Dial_clamp(self: Fl_Fill_DialPtr, a1: double) -> double +extern def Fl_Fill_Dial_increment(self: Fl_Fill_DialPtr, a1: double, a2: int) -> double # ----- Fl_Hor_Slider (widget_declare) ----- extern def Fl_Hor_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Hor_SliderPtr @@ -1381,11 +1381,11 @@ extern def Fl_Hor_Slider_tooltip(self: Fl_Hor_SliderPtr) -> str extern def Fl_Hor_Slider_set_tooltip(self: Fl_Hor_SliderPtr, txt: str) extern def Fl_Hor_Slider_get_type(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_set_type(self: Fl_Hor_SliderPtr, typ: int) -extern def Fl_Hor_Slider_color(self: Fl_Hor_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Slider_set_color(self: Fl_Hor_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Slider_color(self: Fl_Hor_SliderPtr) -> uint32 +extern def Fl_Hor_Slider_set_color(self: Fl_Hor_SliderPtr, color: uint32) extern def Fl_Hor_Slider_measure_label(self: Fl_Hor_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Hor_Slider_label_color(self: Fl_Hor_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Slider_set_label_color(self: Fl_Hor_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Slider_label_color(self: Fl_Hor_SliderPtr) -> uint32 +extern def Fl_Hor_Slider_set_label_color(self: Fl_Hor_SliderPtr, color: uint32) extern def Fl_Hor_Slider_label_font(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_set_label_font(self: Fl_Hor_SliderPtr, font: int) extern def Fl_Hor_Slider_label_size(self: Fl_Hor_SliderPtr) -> int @@ -1409,8 +1409,8 @@ extern def Fl_Hor_Slider_set_when(self: Fl_Hor_SliderPtr, a1: int) extern def Fl_Hor_Slider_when(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_image(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_parent(self: Fl_Hor_SliderPtr) -> bytes -extern def Fl_Hor_Slider_selection_color(self: Fl_Hor_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Slider_set_selection_color(self: Fl_Hor_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Slider_selection_color(self: Fl_Hor_SliderPtr) -> uint32 +extern def Fl_Hor_Slider_set_selection_color(self: Fl_Hor_SliderPtr, color: uint32) extern def Fl_Hor_Slider_do_callback(self: Fl_Hor_SliderPtr) extern def Fl_Hor_Slider_inside(self: Fl_Hor_SliderPtr, a1: bytes) -> int extern def Fl_Hor_Slider_window(self: Fl_Hor_SliderPtr) -> bytes @@ -1421,15 +1421,15 @@ extern def Fl_Hor_Slider_take_focus(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_set_visible_focus(self: Fl_Hor_SliderPtr) extern def Fl_Hor_Slider_clear_visible_focus(self: Fl_Hor_SliderPtr) extern def Fl_Hor_Slider_visible_focus(self: Fl_Hor_SliderPtr, v: int) -extern def Fl_Hor_Slider_has_visible_focus(self: Fl_Hor_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Slider_has_visible_focus(self: Fl_Hor_SliderPtr) -> uint32 extern def Fl_Hor_Slider_set_user_data(self: Fl_Hor_SliderPtr, data: bytes) extern def Fl_Hor_Slider_draw_data(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_handle_data(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_set_draw_data(self: Fl_Hor_SliderPtr, data: bytes) extern def Fl_Hor_Slider_set_handle_data(self: Fl_Hor_SliderPtr, data: bytes) -extern def Fl_Hor_Slider_damage(self: Fl_Hor_SliderPtr) -> t.CUInt8T -extern def Fl_Hor_Slider_set_damage(self: Fl_Hor_SliderPtr, flag: t.CUInt8T) -extern def Fl_Hor_Slider_set_damage_area(self: Fl_Hor_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Hor_Slider_damage(self: Fl_Hor_SliderPtr) -> uint8 +extern def Fl_Hor_Slider_set_damage(self: Fl_Hor_SliderPtr, flag: uint8) +extern def Fl_Hor_Slider_set_damage_area(self: Fl_Hor_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Hor_Slider_clear_damage(self: Fl_Hor_SliderPtr) extern def Fl_Hor_Slider_as_window(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_as_group(self: Fl_Hor_SliderPtr) -> bytes @@ -1438,7 +1438,7 @@ extern def Fl_Hor_Slider_deimage(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_set_callback(self: Fl_Hor_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Hor_Slider_visible(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_visible_r(self: Fl_Hor_SliderPtr) -> int -extern def Fl_Hor_Slider_active(self: Fl_Hor_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Slider_active(self: Fl_Hor_SliderPtr) -> uint32 extern def Fl_Hor_Slider_active_r(self: Fl_Hor_SliderPtr) -> int extern def Fl_Hor_Slider_callback(self: Fl_Hor_SliderPtr) -> bytes extern def Fl_Hor_Slider_set_deletion_callback(self: Fl_Hor_SliderPtr, cb1: bytes, data: bytes) @@ -1449,21 +1449,21 @@ extern def Fl_Hor_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Hor_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Hor_Slider (valuator_declare) ----- -extern def Fl_Hor_Slider_set_bounds(self: Fl_Hor_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Slider_minimum(self: Fl_Hor_SliderPtr) -> t.CDouble -extern def Fl_Hor_Slider_set_minimum(self: Fl_Hor_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Slider_maximum(self: Fl_Hor_SliderPtr) -> t.CDouble -extern def Fl_Hor_Slider_set_maximum(self: Fl_Hor_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Slider_set_range(self: Fl_Hor_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Slider_set_step(self: Fl_Hor_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Hor_Slider_step(self: Fl_Hor_SliderPtr) -> t.CDouble +extern def Fl_Hor_Slider_set_bounds(self: Fl_Hor_SliderPtr, a: double, b: double) +extern def Fl_Hor_Slider_minimum(self: Fl_Hor_SliderPtr) -> double +extern def Fl_Hor_Slider_set_minimum(self: Fl_Hor_SliderPtr, a: double) +extern def Fl_Hor_Slider_maximum(self: Fl_Hor_SliderPtr) -> double +extern def Fl_Hor_Slider_set_maximum(self: Fl_Hor_SliderPtr, a: double) +extern def Fl_Hor_Slider_set_range(self: Fl_Hor_SliderPtr, a: double, b: double) +extern def Fl_Hor_Slider_set_step(self: Fl_Hor_SliderPtr, a: double, b: int) +extern def Fl_Hor_Slider_step(self: Fl_Hor_SliderPtr) -> double extern def Fl_Hor_Slider_set_precision(self: Fl_Hor_SliderPtr, digits: int) -extern def Fl_Hor_Slider_value(self: Fl_Hor_SliderPtr) -> t.CDouble -extern def Fl_Hor_Slider_set_value(self: Fl_Hor_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Hor_Slider_value(self: Fl_Hor_SliderPtr) -> double +extern def Fl_Hor_Slider_set_value(self: Fl_Hor_SliderPtr, a1: double) -> int extern def Fl_Hor_Slider_format(self: Fl_Hor_SliderPtr, a1: str) -> int -extern def Fl_Hor_Slider_round(self: Fl_Hor_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Slider_clamp(self: Fl_Hor_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Slider_increment(self: Fl_Hor_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Hor_Slider_round(self: Fl_Hor_SliderPtr, a1: double) -> double +extern def Fl_Hor_Slider_clamp(self: Fl_Hor_SliderPtr, a1: double) -> double +extern def Fl_Hor_Slider_increment(self: Fl_Hor_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Hor_Fill_Slider (widget_declare) ----- extern def Fl_Hor_Fill_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Hor_Fill_SliderPtr @@ -1485,11 +1485,11 @@ extern def Fl_Hor_Fill_Slider_tooltip(self: Fl_Hor_Fill_SliderPtr) -> str extern def Fl_Hor_Fill_Slider_set_tooltip(self: Fl_Hor_Fill_SliderPtr, txt: str) extern def Fl_Hor_Fill_Slider_get_type(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_set_type(self: Fl_Hor_Fill_SliderPtr, typ: int) -extern def Fl_Hor_Fill_Slider_color(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Fill_Slider_set_color(self: Fl_Hor_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Fill_Slider_color(self: Fl_Hor_Fill_SliderPtr) -> uint32 +extern def Fl_Hor_Fill_Slider_set_color(self: Fl_Hor_Fill_SliderPtr, color: uint32) extern def Fl_Hor_Fill_Slider_measure_label(self: Fl_Hor_Fill_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Hor_Fill_Slider_label_color(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Fill_Slider_set_label_color(self: Fl_Hor_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Fill_Slider_label_color(self: Fl_Hor_Fill_SliderPtr) -> uint32 +extern def Fl_Hor_Fill_Slider_set_label_color(self: Fl_Hor_Fill_SliderPtr, color: uint32) extern def Fl_Hor_Fill_Slider_label_font(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_set_label_font(self: Fl_Hor_Fill_SliderPtr, font: int) extern def Fl_Hor_Fill_Slider_label_size(self: Fl_Hor_Fill_SliderPtr) -> int @@ -1513,8 +1513,8 @@ extern def Fl_Hor_Fill_Slider_set_when(self: Fl_Hor_Fill_SliderPtr, a1: int) extern def Fl_Hor_Fill_Slider_when(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_image(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_parent(self: Fl_Hor_Fill_SliderPtr) -> bytes -extern def Fl_Hor_Fill_Slider_selection_color(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Fill_Slider_set_selection_color(self: Fl_Hor_Fill_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Fill_Slider_selection_color(self: Fl_Hor_Fill_SliderPtr) -> uint32 +extern def Fl_Hor_Fill_Slider_set_selection_color(self: Fl_Hor_Fill_SliderPtr, color: uint32) extern def Fl_Hor_Fill_Slider_do_callback(self: Fl_Hor_Fill_SliderPtr) extern def Fl_Hor_Fill_Slider_inside(self: Fl_Hor_Fill_SliderPtr, a1: bytes) -> int extern def Fl_Hor_Fill_Slider_window(self: Fl_Hor_Fill_SliderPtr) -> bytes @@ -1525,15 +1525,15 @@ extern def Fl_Hor_Fill_Slider_take_focus(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_set_visible_focus(self: Fl_Hor_Fill_SliderPtr) extern def Fl_Hor_Fill_Slider_clear_visible_focus(self: Fl_Hor_Fill_SliderPtr) extern def Fl_Hor_Fill_Slider_visible_focus(self: Fl_Hor_Fill_SliderPtr, v: int) -extern def Fl_Hor_Fill_Slider_has_visible_focus(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Fill_Slider_has_visible_focus(self: Fl_Hor_Fill_SliderPtr) -> uint32 extern def Fl_Hor_Fill_Slider_set_user_data(self: Fl_Hor_Fill_SliderPtr, data: bytes) extern def Fl_Hor_Fill_Slider_draw_data(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_handle_data(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_set_draw_data(self: Fl_Hor_Fill_SliderPtr, data: bytes) extern def Fl_Hor_Fill_Slider_set_handle_data(self: Fl_Hor_Fill_SliderPtr, data: bytes) -extern def Fl_Hor_Fill_Slider_damage(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt8T -extern def Fl_Hor_Fill_Slider_set_damage(self: Fl_Hor_Fill_SliderPtr, flag: t.CUInt8T) -extern def Fl_Hor_Fill_Slider_set_damage_area(self: Fl_Hor_Fill_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Hor_Fill_Slider_damage(self: Fl_Hor_Fill_SliderPtr) -> uint8 +extern def Fl_Hor_Fill_Slider_set_damage(self: Fl_Hor_Fill_SliderPtr, flag: uint8) +extern def Fl_Hor_Fill_Slider_set_damage_area(self: Fl_Hor_Fill_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Hor_Fill_Slider_clear_damage(self: Fl_Hor_Fill_SliderPtr) extern def Fl_Hor_Fill_Slider_as_window(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_as_group(self: Fl_Hor_Fill_SliderPtr) -> bytes @@ -1542,7 +1542,7 @@ extern def Fl_Hor_Fill_Slider_deimage(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_set_callback(self: Fl_Hor_Fill_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Hor_Fill_Slider_visible(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_visible_r(self: Fl_Hor_Fill_SliderPtr) -> int -extern def Fl_Hor_Fill_Slider_active(self: Fl_Hor_Fill_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Fill_Slider_active(self: Fl_Hor_Fill_SliderPtr) -> uint32 extern def Fl_Hor_Fill_Slider_active_r(self: Fl_Hor_Fill_SliderPtr) -> int extern def Fl_Hor_Fill_Slider_callback(self: Fl_Hor_Fill_SliderPtr) -> bytes extern def Fl_Hor_Fill_Slider_set_deletion_callback(self: Fl_Hor_Fill_SliderPtr, cb1: bytes, data: bytes) @@ -1553,21 +1553,21 @@ extern def Fl_Hor_Fill_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Hor_Fill_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Hor_Fill_Slider (valuator_declare) ----- -extern def Fl_Hor_Fill_Slider_set_bounds(self: Fl_Hor_Fill_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Fill_Slider_minimum(self: Fl_Hor_Fill_SliderPtr) -> t.CDouble -extern def Fl_Hor_Fill_Slider_set_minimum(self: Fl_Hor_Fill_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Fill_Slider_maximum(self: Fl_Hor_Fill_SliderPtr) -> t.CDouble -extern def Fl_Hor_Fill_Slider_set_maximum(self: Fl_Hor_Fill_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Fill_Slider_set_range(self: Fl_Hor_Fill_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Fill_Slider_set_step(self: Fl_Hor_Fill_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Hor_Fill_Slider_step(self: Fl_Hor_Fill_SliderPtr) -> t.CDouble +extern def Fl_Hor_Fill_Slider_set_bounds(self: Fl_Hor_Fill_SliderPtr, a: double, b: double) +extern def Fl_Hor_Fill_Slider_minimum(self: Fl_Hor_Fill_SliderPtr) -> double +extern def Fl_Hor_Fill_Slider_set_minimum(self: Fl_Hor_Fill_SliderPtr, a: double) +extern def Fl_Hor_Fill_Slider_maximum(self: Fl_Hor_Fill_SliderPtr) -> double +extern def Fl_Hor_Fill_Slider_set_maximum(self: Fl_Hor_Fill_SliderPtr, a: double) +extern def Fl_Hor_Fill_Slider_set_range(self: Fl_Hor_Fill_SliderPtr, a: double, b: double) +extern def Fl_Hor_Fill_Slider_set_step(self: Fl_Hor_Fill_SliderPtr, a: double, b: int) +extern def Fl_Hor_Fill_Slider_step(self: Fl_Hor_Fill_SliderPtr) -> double extern def Fl_Hor_Fill_Slider_set_precision(self: Fl_Hor_Fill_SliderPtr, digits: int) -extern def Fl_Hor_Fill_Slider_value(self: Fl_Hor_Fill_SliderPtr) -> t.CDouble -extern def Fl_Hor_Fill_Slider_set_value(self: Fl_Hor_Fill_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Hor_Fill_Slider_value(self: Fl_Hor_Fill_SliderPtr) -> double +extern def Fl_Hor_Fill_Slider_set_value(self: Fl_Hor_Fill_SliderPtr, a1: double) -> int extern def Fl_Hor_Fill_Slider_format(self: Fl_Hor_Fill_SliderPtr, a1: str) -> int -extern def Fl_Hor_Fill_Slider_round(self: Fl_Hor_Fill_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Fill_Slider_clamp(self: Fl_Hor_Fill_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Fill_Slider_increment(self: Fl_Hor_Fill_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Hor_Fill_Slider_round(self: Fl_Hor_Fill_SliderPtr, a1: double) -> double +extern def Fl_Hor_Fill_Slider_clamp(self: Fl_Hor_Fill_SliderPtr, a1: double) -> double +extern def Fl_Hor_Fill_Slider_increment(self: Fl_Hor_Fill_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Hor_Nice_Slider (widget_declare) ----- extern def Fl_Hor_Nice_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Hor_Nice_SliderPtr @@ -1589,11 +1589,11 @@ extern def Fl_Hor_Nice_Slider_tooltip(self: Fl_Hor_Nice_SliderPtr) -> str extern def Fl_Hor_Nice_Slider_set_tooltip(self: Fl_Hor_Nice_SliderPtr, txt: str) extern def Fl_Hor_Nice_Slider_get_type(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_set_type(self: Fl_Hor_Nice_SliderPtr, typ: int) -extern def Fl_Hor_Nice_Slider_color(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Nice_Slider_set_color(self: Fl_Hor_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Nice_Slider_color(self: Fl_Hor_Nice_SliderPtr) -> uint32 +extern def Fl_Hor_Nice_Slider_set_color(self: Fl_Hor_Nice_SliderPtr, color: uint32) extern def Fl_Hor_Nice_Slider_measure_label(self: Fl_Hor_Nice_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Hor_Nice_Slider_label_color(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Nice_Slider_set_label_color(self: Fl_Hor_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Nice_Slider_label_color(self: Fl_Hor_Nice_SliderPtr) -> uint32 +extern def Fl_Hor_Nice_Slider_set_label_color(self: Fl_Hor_Nice_SliderPtr, color: uint32) extern def Fl_Hor_Nice_Slider_label_font(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_set_label_font(self: Fl_Hor_Nice_SliderPtr, font: int) extern def Fl_Hor_Nice_Slider_label_size(self: Fl_Hor_Nice_SliderPtr) -> int @@ -1617,8 +1617,8 @@ extern def Fl_Hor_Nice_Slider_set_when(self: Fl_Hor_Nice_SliderPtr, a1: int) extern def Fl_Hor_Nice_Slider_when(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_image(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_parent(self: Fl_Hor_Nice_SliderPtr) -> bytes -extern def Fl_Hor_Nice_Slider_selection_color(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Nice_Slider_set_selection_color(self: Fl_Hor_Nice_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Nice_Slider_selection_color(self: Fl_Hor_Nice_SliderPtr) -> uint32 +extern def Fl_Hor_Nice_Slider_set_selection_color(self: Fl_Hor_Nice_SliderPtr, color: uint32) extern def Fl_Hor_Nice_Slider_do_callback(self: Fl_Hor_Nice_SliderPtr) extern def Fl_Hor_Nice_Slider_inside(self: Fl_Hor_Nice_SliderPtr, a1: bytes) -> int extern def Fl_Hor_Nice_Slider_window(self: Fl_Hor_Nice_SliderPtr) -> bytes @@ -1629,15 +1629,15 @@ extern def Fl_Hor_Nice_Slider_take_focus(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_set_visible_focus(self: Fl_Hor_Nice_SliderPtr) extern def Fl_Hor_Nice_Slider_clear_visible_focus(self: Fl_Hor_Nice_SliderPtr) extern def Fl_Hor_Nice_Slider_visible_focus(self: Fl_Hor_Nice_SliderPtr, v: int) -extern def Fl_Hor_Nice_Slider_has_visible_focus(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Nice_Slider_has_visible_focus(self: Fl_Hor_Nice_SliderPtr) -> uint32 extern def Fl_Hor_Nice_Slider_set_user_data(self: Fl_Hor_Nice_SliderPtr, data: bytes) extern def Fl_Hor_Nice_Slider_draw_data(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_handle_data(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_set_draw_data(self: Fl_Hor_Nice_SliderPtr, data: bytes) extern def Fl_Hor_Nice_Slider_set_handle_data(self: Fl_Hor_Nice_SliderPtr, data: bytes) -extern def Fl_Hor_Nice_Slider_damage(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt8T -extern def Fl_Hor_Nice_Slider_set_damage(self: Fl_Hor_Nice_SliderPtr, flag: t.CUInt8T) -extern def Fl_Hor_Nice_Slider_set_damage_area(self: Fl_Hor_Nice_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Hor_Nice_Slider_damage(self: Fl_Hor_Nice_SliderPtr) -> uint8 +extern def Fl_Hor_Nice_Slider_set_damage(self: Fl_Hor_Nice_SliderPtr, flag: uint8) +extern def Fl_Hor_Nice_Slider_set_damage_area(self: Fl_Hor_Nice_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Hor_Nice_Slider_clear_damage(self: Fl_Hor_Nice_SliderPtr) extern def Fl_Hor_Nice_Slider_as_window(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_as_group(self: Fl_Hor_Nice_SliderPtr) -> bytes @@ -1646,7 +1646,7 @@ extern def Fl_Hor_Nice_Slider_deimage(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_set_callback(self: Fl_Hor_Nice_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Hor_Nice_Slider_visible(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_visible_r(self: Fl_Hor_Nice_SliderPtr) -> int -extern def Fl_Hor_Nice_Slider_active(self: Fl_Hor_Nice_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Nice_Slider_active(self: Fl_Hor_Nice_SliderPtr) -> uint32 extern def Fl_Hor_Nice_Slider_active_r(self: Fl_Hor_Nice_SliderPtr) -> int extern def Fl_Hor_Nice_Slider_callback(self: Fl_Hor_Nice_SliderPtr) -> bytes extern def Fl_Hor_Nice_Slider_set_deletion_callback(self: Fl_Hor_Nice_SliderPtr, cb1: bytes, data: bytes) @@ -1657,21 +1657,21 @@ extern def Fl_Hor_Nice_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Hor_Nice_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Hor_Nice_Slider (valuator_declare) ----- -extern def Fl_Hor_Nice_Slider_set_bounds(self: Fl_Hor_Nice_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Nice_Slider_minimum(self: Fl_Hor_Nice_SliderPtr) -> t.CDouble -extern def Fl_Hor_Nice_Slider_set_minimum(self: Fl_Hor_Nice_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Nice_Slider_maximum(self: Fl_Hor_Nice_SliderPtr) -> t.CDouble -extern def Fl_Hor_Nice_Slider_set_maximum(self: Fl_Hor_Nice_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Nice_Slider_set_range(self: Fl_Hor_Nice_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Nice_Slider_set_step(self: Fl_Hor_Nice_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Hor_Nice_Slider_step(self: Fl_Hor_Nice_SliderPtr) -> t.CDouble +extern def Fl_Hor_Nice_Slider_set_bounds(self: Fl_Hor_Nice_SliderPtr, a: double, b: double) +extern def Fl_Hor_Nice_Slider_minimum(self: Fl_Hor_Nice_SliderPtr) -> double +extern def Fl_Hor_Nice_Slider_set_minimum(self: Fl_Hor_Nice_SliderPtr, a: double) +extern def Fl_Hor_Nice_Slider_maximum(self: Fl_Hor_Nice_SliderPtr) -> double +extern def Fl_Hor_Nice_Slider_set_maximum(self: Fl_Hor_Nice_SliderPtr, a: double) +extern def Fl_Hor_Nice_Slider_set_range(self: Fl_Hor_Nice_SliderPtr, a: double, b: double) +extern def Fl_Hor_Nice_Slider_set_step(self: Fl_Hor_Nice_SliderPtr, a: double, b: int) +extern def Fl_Hor_Nice_Slider_step(self: Fl_Hor_Nice_SliderPtr) -> double extern def Fl_Hor_Nice_Slider_set_precision(self: Fl_Hor_Nice_SliderPtr, digits: int) -extern def Fl_Hor_Nice_Slider_value(self: Fl_Hor_Nice_SliderPtr) -> t.CDouble -extern def Fl_Hor_Nice_Slider_set_value(self: Fl_Hor_Nice_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Hor_Nice_Slider_value(self: Fl_Hor_Nice_SliderPtr) -> double +extern def Fl_Hor_Nice_Slider_set_value(self: Fl_Hor_Nice_SliderPtr, a1: double) -> int extern def Fl_Hor_Nice_Slider_format(self: Fl_Hor_Nice_SliderPtr, a1: str) -> int -extern def Fl_Hor_Nice_Slider_round(self: Fl_Hor_Nice_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Nice_Slider_clamp(self: Fl_Hor_Nice_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Nice_Slider_increment(self: Fl_Hor_Nice_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Hor_Nice_Slider_round(self: Fl_Hor_Nice_SliderPtr, a1: double) -> double +extern def Fl_Hor_Nice_Slider_clamp(self: Fl_Hor_Nice_SliderPtr, a1: double) -> double +extern def Fl_Hor_Nice_Slider_increment(self: Fl_Hor_Nice_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Hor_Value_Slider (widget_declare) ----- extern def Fl_Hor_Value_Slider_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Hor_Value_SliderPtr @@ -1693,11 +1693,11 @@ extern def Fl_Hor_Value_Slider_tooltip(self: Fl_Hor_Value_SliderPtr) -> str extern def Fl_Hor_Value_Slider_set_tooltip(self: Fl_Hor_Value_SliderPtr, txt: str) extern def Fl_Hor_Value_Slider_get_type(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_set_type(self: Fl_Hor_Value_SliderPtr, typ: int) -extern def Fl_Hor_Value_Slider_color(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Value_Slider_set_color(self: Fl_Hor_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Value_Slider_color(self: Fl_Hor_Value_SliderPtr) -> uint32 +extern def Fl_Hor_Value_Slider_set_color(self: Fl_Hor_Value_SliderPtr, color: uint32) extern def Fl_Hor_Value_Slider_measure_label(self: Fl_Hor_Value_SliderPtr, a1: bytes, a2: bytes) -extern def Fl_Hor_Value_Slider_label_color(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Value_Slider_set_label_color(self: Fl_Hor_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Value_Slider_label_color(self: Fl_Hor_Value_SliderPtr) -> uint32 +extern def Fl_Hor_Value_Slider_set_label_color(self: Fl_Hor_Value_SliderPtr, color: uint32) extern def Fl_Hor_Value_Slider_label_font(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_set_label_font(self: Fl_Hor_Value_SliderPtr, font: int) extern def Fl_Hor_Value_Slider_label_size(self: Fl_Hor_Value_SliderPtr) -> int @@ -1721,8 +1721,8 @@ extern def Fl_Hor_Value_Slider_set_when(self: Fl_Hor_Value_SliderPtr, a1: int) extern def Fl_Hor_Value_Slider_when(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_image(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_parent(self: Fl_Hor_Value_SliderPtr) -> bytes -extern def Fl_Hor_Value_Slider_selection_color(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T -extern def Fl_Hor_Value_Slider_set_selection_color(self: Fl_Hor_Value_SliderPtr, color: t.CUInt32T) +extern def Fl_Hor_Value_Slider_selection_color(self: Fl_Hor_Value_SliderPtr) -> uint32 +extern def Fl_Hor_Value_Slider_set_selection_color(self: Fl_Hor_Value_SliderPtr, color: uint32) extern def Fl_Hor_Value_Slider_do_callback(self: Fl_Hor_Value_SliderPtr) extern def Fl_Hor_Value_Slider_inside(self: Fl_Hor_Value_SliderPtr, a1: bytes) -> int extern def Fl_Hor_Value_Slider_window(self: Fl_Hor_Value_SliderPtr) -> bytes @@ -1733,15 +1733,15 @@ extern def Fl_Hor_Value_Slider_take_focus(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_set_visible_focus(self: Fl_Hor_Value_SliderPtr) extern def Fl_Hor_Value_Slider_clear_visible_focus(self: Fl_Hor_Value_SliderPtr) extern def Fl_Hor_Value_Slider_visible_focus(self: Fl_Hor_Value_SliderPtr, v: int) -extern def Fl_Hor_Value_Slider_has_visible_focus(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Value_Slider_has_visible_focus(self: Fl_Hor_Value_SliderPtr) -> uint32 extern def Fl_Hor_Value_Slider_set_user_data(self: Fl_Hor_Value_SliderPtr, data: bytes) extern def Fl_Hor_Value_Slider_draw_data(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_handle_data(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_set_draw_data(self: Fl_Hor_Value_SliderPtr, data: bytes) extern def Fl_Hor_Value_Slider_set_handle_data(self: Fl_Hor_Value_SliderPtr, data: bytes) -extern def Fl_Hor_Value_Slider_damage(self: Fl_Hor_Value_SliderPtr) -> t.CUInt8T -extern def Fl_Hor_Value_Slider_set_damage(self: Fl_Hor_Value_SliderPtr, flag: t.CUInt8T) -extern def Fl_Hor_Value_Slider_set_damage_area(self: Fl_Hor_Value_SliderPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Hor_Value_Slider_damage(self: Fl_Hor_Value_SliderPtr) -> uint8 +extern def Fl_Hor_Value_Slider_set_damage(self: Fl_Hor_Value_SliderPtr, flag: uint8) +extern def Fl_Hor_Value_Slider_set_damage_area(self: Fl_Hor_Value_SliderPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Hor_Value_Slider_clear_damage(self: Fl_Hor_Value_SliderPtr) extern def Fl_Hor_Value_Slider_as_window(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_as_group(self: Fl_Hor_Value_SliderPtr) -> bytes @@ -1750,7 +1750,7 @@ extern def Fl_Hor_Value_Slider_deimage(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_set_callback(self: Fl_Hor_Value_SliderPtr, a1: bytes, a2: bytes) extern def Fl_Hor_Value_Slider_visible(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_visible_r(self: Fl_Hor_Value_SliderPtr) -> int -extern def Fl_Hor_Value_Slider_active(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Value_Slider_active(self: Fl_Hor_Value_SliderPtr) -> uint32 extern def Fl_Hor_Value_Slider_active_r(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_callback(self: Fl_Hor_Value_SliderPtr) -> bytes extern def Fl_Hor_Value_Slider_set_deletion_callback(self: Fl_Hor_Value_SliderPtr, cb1: bytes, data: bytes) @@ -1761,21 +1761,21 @@ extern def Fl_Hor_Value_Slider_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Hor_Value_Slider_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Hor_Value_Slider (valuator_declare) ----- -extern def Fl_Hor_Value_Slider_set_bounds(self: Fl_Hor_Value_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Value_Slider_minimum(self: Fl_Hor_Value_SliderPtr) -> t.CDouble -extern def Fl_Hor_Value_Slider_set_minimum(self: Fl_Hor_Value_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Value_Slider_maximum(self: Fl_Hor_Value_SliderPtr) -> t.CDouble -extern def Fl_Hor_Value_Slider_set_maximum(self: Fl_Hor_Value_SliderPtr, a: t.CDouble) -extern def Fl_Hor_Value_Slider_set_range(self: Fl_Hor_Value_SliderPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Hor_Value_Slider_set_step(self: Fl_Hor_Value_SliderPtr, a: t.CDouble, b: int) -extern def Fl_Hor_Value_Slider_step(self: Fl_Hor_Value_SliderPtr) -> t.CDouble +extern def Fl_Hor_Value_Slider_set_bounds(self: Fl_Hor_Value_SliderPtr, a: double, b: double) +extern def Fl_Hor_Value_Slider_minimum(self: Fl_Hor_Value_SliderPtr) -> double +extern def Fl_Hor_Value_Slider_set_minimum(self: Fl_Hor_Value_SliderPtr, a: double) +extern def Fl_Hor_Value_Slider_maximum(self: Fl_Hor_Value_SliderPtr) -> double +extern def Fl_Hor_Value_Slider_set_maximum(self: Fl_Hor_Value_SliderPtr, a: double) +extern def Fl_Hor_Value_Slider_set_range(self: Fl_Hor_Value_SliderPtr, a: double, b: double) +extern def Fl_Hor_Value_Slider_set_step(self: Fl_Hor_Value_SliderPtr, a: double, b: int) +extern def Fl_Hor_Value_Slider_step(self: Fl_Hor_Value_SliderPtr) -> double extern def Fl_Hor_Value_Slider_set_precision(self: Fl_Hor_Value_SliderPtr, digits: int) -extern def Fl_Hor_Value_Slider_value(self: Fl_Hor_Value_SliderPtr) -> t.CDouble -extern def Fl_Hor_Value_Slider_set_value(self: Fl_Hor_Value_SliderPtr, a1: t.CDouble) -> int +extern def Fl_Hor_Value_Slider_value(self: Fl_Hor_Value_SliderPtr) -> double +extern def Fl_Hor_Value_Slider_set_value(self: Fl_Hor_Value_SliderPtr, a1: double) -> int extern def Fl_Hor_Value_Slider_format(self: Fl_Hor_Value_SliderPtr, a1: str) -> int -extern def Fl_Hor_Value_Slider_round(self: Fl_Hor_Value_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Value_Slider_clamp(self: Fl_Hor_Value_SliderPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Hor_Value_Slider_increment(self: Fl_Hor_Value_SliderPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Hor_Value_Slider_round(self: Fl_Hor_Value_SliderPtr, a1: double) -> double +extern def Fl_Hor_Value_Slider_clamp(self: Fl_Hor_Value_SliderPtr, a1: double) -> double +extern def Fl_Hor_Value_Slider_increment(self: Fl_Hor_Value_SliderPtr, a1: double, a2: int) -> double # ----- Fl_Simple_Counter (widget_declare) ----- extern def Fl_Simple_Counter_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Simple_CounterPtr @@ -1797,11 +1797,11 @@ extern def Fl_Simple_Counter_tooltip(self: Fl_Simple_CounterPtr) -> str extern def Fl_Simple_Counter_set_tooltip(self: Fl_Simple_CounterPtr, txt: str) extern def Fl_Simple_Counter_get_type(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_set_type(self: Fl_Simple_CounterPtr, typ: int) -extern def Fl_Simple_Counter_color(self: Fl_Simple_CounterPtr) -> t.CUInt32T -extern def Fl_Simple_Counter_set_color(self: Fl_Simple_CounterPtr, color: t.CUInt32T) +extern def Fl_Simple_Counter_color(self: Fl_Simple_CounterPtr) -> uint32 +extern def Fl_Simple_Counter_set_color(self: Fl_Simple_CounterPtr, color: uint32) extern def Fl_Simple_Counter_measure_label(self: Fl_Simple_CounterPtr, a1: bytes, a2: bytes) -extern def Fl_Simple_Counter_label_color(self: Fl_Simple_CounterPtr) -> t.CUInt32T -extern def Fl_Simple_Counter_set_label_color(self: Fl_Simple_CounterPtr, color: t.CUInt32T) +extern def Fl_Simple_Counter_label_color(self: Fl_Simple_CounterPtr) -> uint32 +extern def Fl_Simple_Counter_set_label_color(self: Fl_Simple_CounterPtr, color: uint32) extern def Fl_Simple_Counter_label_font(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_set_label_font(self: Fl_Simple_CounterPtr, font: int) extern def Fl_Simple_Counter_label_size(self: Fl_Simple_CounterPtr) -> int @@ -1825,8 +1825,8 @@ extern def Fl_Simple_Counter_set_when(self: Fl_Simple_CounterPtr, a1: int) extern def Fl_Simple_Counter_when(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_image(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_parent(self: Fl_Simple_CounterPtr) -> bytes -extern def Fl_Simple_Counter_selection_color(self: Fl_Simple_CounterPtr) -> t.CUInt32T -extern def Fl_Simple_Counter_set_selection_color(self: Fl_Simple_CounterPtr, color: t.CUInt32T) +extern def Fl_Simple_Counter_selection_color(self: Fl_Simple_CounterPtr) -> uint32 +extern def Fl_Simple_Counter_set_selection_color(self: Fl_Simple_CounterPtr, color: uint32) extern def Fl_Simple_Counter_do_callback(self: Fl_Simple_CounterPtr) extern def Fl_Simple_Counter_inside(self: Fl_Simple_CounterPtr, a1: bytes) -> int extern def Fl_Simple_Counter_window(self: Fl_Simple_CounterPtr) -> bytes @@ -1837,15 +1837,15 @@ extern def Fl_Simple_Counter_take_focus(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_set_visible_focus(self: Fl_Simple_CounterPtr) extern def Fl_Simple_Counter_clear_visible_focus(self: Fl_Simple_CounterPtr) extern def Fl_Simple_Counter_visible_focus(self: Fl_Simple_CounterPtr, v: int) -extern def Fl_Simple_Counter_has_visible_focus(self: Fl_Simple_CounterPtr) -> t.CUInt32T +extern def Fl_Simple_Counter_has_visible_focus(self: Fl_Simple_CounterPtr) -> uint32 extern def Fl_Simple_Counter_set_user_data(self: Fl_Simple_CounterPtr, data: bytes) extern def Fl_Simple_Counter_draw_data(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_handle_data(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_set_draw_data(self: Fl_Simple_CounterPtr, data: bytes) extern def Fl_Simple_Counter_set_handle_data(self: Fl_Simple_CounterPtr, data: bytes) -extern def Fl_Simple_Counter_damage(self: Fl_Simple_CounterPtr) -> t.CUInt8T -extern def Fl_Simple_Counter_set_damage(self: Fl_Simple_CounterPtr, flag: t.CUInt8T) -extern def Fl_Simple_Counter_set_damage_area(self: Fl_Simple_CounterPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Simple_Counter_damage(self: Fl_Simple_CounterPtr) -> uint8 +extern def Fl_Simple_Counter_set_damage(self: Fl_Simple_CounterPtr, flag: uint8) +extern def Fl_Simple_Counter_set_damage_area(self: Fl_Simple_CounterPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Simple_Counter_clear_damage(self: Fl_Simple_CounterPtr) extern def Fl_Simple_Counter_as_window(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_as_group(self: Fl_Simple_CounterPtr) -> bytes @@ -1854,7 +1854,7 @@ extern def Fl_Simple_Counter_deimage(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_set_callback(self: Fl_Simple_CounterPtr, a1: bytes, a2: bytes) extern def Fl_Simple_Counter_visible(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_visible_r(self: Fl_Simple_CounterPtr) -> int -extern def Fl_Simple_Counter_active(self: Fl_Simple_CounterPtr) -> t.CUInt32T +extern def Fl_Simple_Counter_active(self: Fl_Simple_CounterPtr) -> uint32 extern def Fl_Simple_Counter_active_r(self: Fl_Simple_CounterPtr) -> int extern def Fl_Simple_Counter_callback(self: Fl_Simple_CounterPtr) -> bytes extern def Fl_Simple_Counter_set_deletion_callback(self: Fl_Simple_CounterPtr, cb1: bytes, data: bytes) @@ -1865,56 +1865,56 @@ extern def Fl_Simple_Counter_super_draw_first(ptr: Fl_WidgetPtr, flag: int) extern def Fl_Simple_Counter_super_handle_first(ptr: Fl_WidgetPtr, flag: int) # ----- Fl_Simple_Counter (valuator_declare) ----- -extern def Fl_Simple_Counter_set_bounds(self: Fl_Simple_CounterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Simple_Counter_minimum(self: Fl_Simple_CounterPtr) -> t.CDouble -extern def Fl_Simple_Counter_set_minimum(self: Fl_Simple_CounterPtr, a: t.CDouble) -extern def Fl_Simple_Counter_maximum(self: Fl_Simple_CounterPtr) -> t.CDouble -extern def Fl_Simple_Counter_set_maximum(self: Fl_Simple_CounterPtr, a: t.CDouble) -extern def Fl_Simple_Counter_set_range(self: Fl_Simple_CounterPtr, a: t.CDouble, b: t.CDouble) -extern def Fl_Simple_Counter_set_step(self: Fl_Simple_CounterPtr, a: t.CDouble, b: int) -extern def Fl_Simple_Counter_step(self: Fl_Simple_CounterPtr) -> t.CDouble +extern def Fl_Simple_Counter_set_bounds(self: Fl_Simple_CounterPtr, a: double, b: double) +extern def Fl_Simple_Counter_minimum(self: Fl_Simple_CounterPtr) -> double +extern def Fl_Simple_Counter_set_minimum(self: Fl_Simple_CounterPtr, a: double) +extern def Fl_Simple_Counter_maximum(self: Fl_Simple_CounterPtr) -> double +extern def Fl_Simple_Counter_set_maximum(self: Fl_Simple_CounterPtr, a: double) +extern def Fl_Simple_Counter_set_range(self: Fl_Simple_CounterPtr, a: double, b: double) +extern def Fl_Simple_Counter_set_step(self: Fl_Simple_CounterPtr, a: double, b: int) +extern def Fl_Simple_Counter_step(self: Fl_Simple_CounterPtr) -> double extern def Fl_Simple_Counter_set_precision(self: Fl_Simple_CounterPtr, digits: int) -extern def Fl_Simple_Counter_value(self: Fl_Simple_CounterPtr) -> t.CDouble -extern def Fl_Simple_Counter_set_value(self: Fl_Simple_CounterPtr, a1: t.CDouble) -> int +extern def Fl_Simple_Counter_value(self: Fl_Simple_CounterPtr) -> double +extern def Fl_Simple_Counter_set_value(self: Fl_Simple_CounterPtr, a1: double) -> int extern def Fl_Simple_Counter_format(self: Fl_Simple_CounterPtr, a1: str) -> int -extern def Fl_Simple_Counter_round(self: Fl_Simple_CounterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Simple_Counter_clamp(self: Fl_Simple_CounterPtr, a1: t.CDouble) -> t.CDouble -extern def Fl_Simple_Counter_increment(self: Fl_Simple_CounterPtr, a1: t.CDouble, a2: int) -> t.CDouble +extern def Fl_Simple_Counter_round(self: Fl_Simple_CounterPtr, a1: double) -> double +extern def Fl_Simple_Counter_clamp(self: Fl_Simple_CounterPtr, a1: double) -> double +extern def Fl_Simple_Counter_increment(self: Fl_Simple_CounterPtr, a1: double, a2: int) -> double -extern def Fl_Slider_slider_size(self: Fl_SliderPtr) -> t.CFloat -extern def Fl_Slider_set_slider_size(self: Fl_SliderPtr, v: t.CFloat) +extern def Fl_Slider_slider_size(self: Fl_SliderPtr) -> float +extern def Fl_Slider_set_slider_size(self: Fl_SliderPtr, v: float) extern def Fl_Slider_slider_box(self: Fl_SliderPtr) -> int extern def Fl_Slider_set_slider_box(self: Fl_SliderPtr, c: int) extern def Fl_Slider_scroll_value(self: Fl_SliderPtr, pos: int, windowSize: int, first_line: int, total_lines: int) -> int -extern def Fl_Dial_angle1(self: Fl_DialPtr) -> t.CInt16T -extern def Fl_Dial_angle2(self: Fl_DialPtr) -> t.CInt16T -extern def Fl_Dial_set_angle1(self: Fl_DialPtr, val: t.CInt16T) -extern def Fl_Dial_set_angle2(self: Fl_DialPtr, val: t.CInt16T) +extern def Fl_Dial_angle1(self: Fl_DialPtr) -> int16 +extern def Fl_Dial_angle2(self: Fl_DialPtr) -> int16 +extern def Fl_Dial_set_angle1(self: Fl_DialPtr, val: int16) +extern def Fl_Dial_set_angle2(self: Fl_DialPtr, val: int16) extern def Fl_Scrollbar_set_linesize(self: Fl_ScrollbarPtr, sz: int) extern def Fl_Scrollbar_linesize(self: Fl_ScrollbarPtr) -> int extern def Fl_Scrollbar_scroll_value(self: Fl_ScrollbarPtr, pos: int, windowSize: int, first_line: int, total_lines: int) -> int -extern def Fl_Value_Slider_set_text_color(self: Fl_Value_SliderPtr, c: t.CUInt32T) -extern def Fl_Value_Slider_text_color(self: Fl_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Value_Slider_set_text_color(self: Fl_Value_SliderPtr, c: uint32) +extern def Fl_Value_Slider_text_color(self: Fl_Value_SliderPtr) -> uint32 extern def Fl_Value_Slider_set_text_font(self: Fl_Value_SliderPtr, f: int) extern def Fl_Value_Slider_text_font(self: Fl_Value_SliderPtr) -> int extern def Fl_Value_Slider_set_text_size(self: Fl_Value_SliderPtr, s: int) extern def Fl_Value_Slider_text_size(self: Fl_Value_SliderPtr) -> int -extern def Fl_Value_Input_set_text_color(self: Fl_Value_InputPtr, c: t.CUInt32T) -extern def Fl_Value_Input_text_color(self: Fl_Value_InputPtr) -> t.CUInt32T +extern def Fl_Value_Input_set_text_color(self: Fl_Value_InputPtr, c: uint32) +extern def Fl_Value_Input_text_color(self: Fl_Value_InputPtr) -> uint32 extern def Fl_Value_Input_set_text_font(self: Fl_Value_InputPtr, f: int) extern def Fl_Value_Input_text_font(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_set_text_size(self: Fl_Value_InputPtr, s: int) extern def Fl_Value_Input_text_size(self: Fl_Value_InputPtr) -> int extern def Fl_Value_Input_set_soft(self: Fl_Value_InputPtr, val: char) extern def Fl_Value_Input_soft(self: Fl_Value_InputPtr) -> char -extern def Fl_Value_Output_set_text_color(self: Fl_Value_OutputPtr, c: t.CUInt32T) -extern def Fl_Value_Output_text_color(self: Fl_Value_OutputPtr) -> t.CUInt32T +extern def Fl_Value_Output_set_text_color(self: Fl_Value_OutputPtr, c: uint32) +extern def Fl_Value_Output_text_color(self: Fl_Value_OutputPtr) -> uint32 extern def Fl_Value_Output_set_text_font(self: Fl_Value_OutputPtr, f: int) extern def Fl_Value_Output_text_font(self: Fl_Value_OutputPtr) -> int extern def Fl_Value_Output_set_text_size(self: Fl_Value_OutputPtr, s: int) extern def Fl_Value_Output_text_size(self: Fl_Value_OutputPtr) -> int -extern def Fl_Hor_Value_Slider_set_text_color(self: Fl_Hor_Value_SliderPtr, c: t.CUInt32T) -extern def Fl_Hor_Value_Slider_text_color(self: Fl_Hor_Value_SliderPtr) -> t.CUInt32T +extern def Fl_Hor_Value_Slider_set_text_color(self: Fl_Hor_Value_SliderPtr, c: uint32) +extern def Fl_Hor_Value_Slider_text_color(self: Fl_Hor_Value_SliderPtr) -> uint32 extern def Fl_Hor_Value_Slider_set_text_font(self: Fl_Hor_Value_SliderPtr, f: int) extern def Fl_Hor_Value_Slider_text_font(self: Fl_Hor_Value_SliderPtr) -> int extern def Fl_Hor_Value_Slider_set_text_size(self: Fl_Hor_Value_SliderPtr, s: int) diff --git a/fltk/_cfl_widget.vp b/fltk/_cfl_widget.vp index 97aefe1..f20894c 100644 --- a/fltk/_cfl_widget.vp +++ b/fltk/_cfl_widget.vp @@ -29,11 +29,11 @@ extern def Fl_Widget_tooltip(self: Fl_WidgetPtr) -> str extern def Fl_Widget_set_tooltip(self: Fl_WidgetPtr, txt: str) extern def Fl_Widget_get_type(self: Fl_WidgetPtr) -> int extern def Fl_Widget_set_type(self: Fl_WidgetPtr, typ: int) -extern def Fl_Widget_color(self: Fl_WidgetPtr) -> t.CUInt32T -extern def Fl_Widget_set_color(self: Fl_WidgetPtr, color: t.CUInt32T) +extern def Fl_Widget_color(self: Fl_WidgetPtr) -> uint32 +extern def Fl_Widget_set_color(self: Fl_WidgetPtr, color: uint32) extern def Fl_Widget_measure_label(self: Fl_WidgetPtr, a1: bytes, a2: bytes) -extern def Fl_Widget_label_color(self: Fl_WidgetPtr) -> t.CUInt32T -extern def Fl_Widget_set_label_color(self: Fl_WidgetPtr, color: t.CUInt32T) +extern def Fl_Widget_label_color(self: Fl_WidgetPtr) -> uint32 +extern def Fl_Widget_set_label_color(self: Fl_WidgetPtr, color: uint32) extern def Fl_Widget_label_font(self: Fl_WidgetPtr) -> int extern def Fl_Widget_set_label_font(self: Fl_WidgetPtr, font: int) extern def Fl_Widget_label_size(self: Fl_WidgetPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Widget_set_when(self: Fl_WidgetPtr, a1: int) extern def Fl_Widget_when(self: Fl_WidgetPtr) -> int extern def Fl_Widget_image(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_parent(self: Fl_WidgetPtr) -> bytes -extern def Fl_Widget_selection_color(self: Fl_WidgetPtr) -> t.CUInt32T -extern def Fl_Widget_set_selection_color(self: Fl_WidgetPtr, color: t.CUInt32T) +extern def Fl_Widget_selection_color(self: Fl_WidgetPtr) -> uint32 +extern def Fl_Widget_set_selection_color(self: Fl_WidgetPtr, color: uint32) extern def Fl_Widget_do_callback(self: Fl_WidgetPtr) extern def Fl_Widget_inside(self: Fl_WidgetPtr, a1: bytes) -> int extern def Fl_Widget_window(self: Fl_WidgetPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Widget_take_focus(self: Fl_WidgetPtr) -> int extern def Fl_Widget_set_visible_focus(self: Fl_WidgetPtr) extern def Fl_Widget_clear_visible_focus(self: Fl_WidgetPtr) extern def Fl_Widget_visible_focus(self: Fl_WidgetPtr, v: int) -extern def Fl_Widget_has_visible_focus(self: Fl_WidgetPtr) -> t.CUInt32T +extern def Fl_Widget_has_visible_focus(self: Fl_WidgetPtr) -> uint32 extern def Fl_Widget_set_user_data(self: Fl_WidgetPtr, data: bytes) extern def Fl_Widget_draw_data(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_handle_data(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_set_draw_data(self: Fl_WidgetPtr, data: bytes) extern def Fl_Widget_set_handle_data(self: Fl_WidgetPtr, data: bytes) -extern def Fl_Widget_damage(self: Fl_WidgetPtr) -> t.CUInt8T -extern def Fl_Widget_set_damage(self: Fl_WidgetPtr, flag: t.CUInt8T) -extern def Fl_Widget_set_damage_area(self: Fl_WidgetPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Widget_damage(self: Fl_WidgetPtr) -> uint8 +extern def Fl_Widget_set_damage(self: Fl_WidgetPtr, flag: uint8) +extern def Fl_Widget_set_damage_area(self: Fl_WidgetPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Widget_clear_damage(self: Fl_WidgetPtr) extern def Fl_Widget_as_window(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_as_group(self: Fl_WidgetPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Widget_deimage(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_set_callback(self: Fl_WidgetPtr, a1: bytes, a2: bytes) extern def Fl_Widget_visible(self: Fl_WidgetPtr) -> int extern def Fl_Widget_visible_r(self: Fl_WidgetPtr) -> int -extern def Fl_Widget_active(self: Fl_WidgetPtr) -> t.CUInt32T +extern def Fl_Widget_active(self: Fl_WidgetPtr) -> uint32 extern def Fl_Widget_active_r(self: Fl_WidgetPtr) -> int extern def Fl_Widget_callback(self: Fl_WidgetPtr) -> bytes extern def Fl_Widget_set_deletion_callback(self: Fl_WidgetPtr, cb1: bytes, data: bytes) diff --git a/fltk/_cfl_window.vp b/fltk/_cfl_window.vp index 9b1eeae..64eb3a6 100644 --- a/fltk/_cfl_window.vp +++ b/fltk/_cfl_window.vp @@ -29,11 +29,11 @@ extern def Fl_Window_tooltip(self: Fl_WindowPtr) -> str extern def Fl_Window_set_tooltip(self: Fl_WindowPtr, txt: str) extern def Fl_Window_get_type(self: Fl_WindowPtr) -> int extern def Fl_Window_set_type(self: Fl_WindowPtr, typ: int) -extern def Fl_Window_color(self: Fl_WindowPtr) -> t.CUInt32T -extern def Fl_Window_set_color(self: Fl_WindowPtr, color: t.CUInt32T) +extern def Fl_Window_color(self: Fl_WindowPtr) -> uint32 +extern def Fl_Window_set_color(self: Fl_WindowPtr, color: uint32) extern def Fl_Window_measure_label(self: Fl_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Window_label_color(self: Fl_WindowPtr) -> t.CUInt32T -extern def Fl_Window_set_label_color(self: Fl_WindowPtr, color: t.CUInt32T) +extern def Fl_Window_label_color(self: Fl_WindowPtr) -> uint32 +extern def Fl_Window_set_label_color(self: Fl_WindowPtr, color: uint32) extern def Fl_Window_label_font(self: Fl_WindowPtr) -> int extern def Fl_Window_set_label_font(self: Fl_WindowPtr, font: int) extern def Fl_Window_label_size(self: Fl_WindowPtr) -> int @@ -57,8 +57,8 @@ extern def Fl_Window_set_when(self: Fl_WindowPtr, a1: int) extern def Fl_Window_when(self: Fl_WindowPtr) -> int extern def Fl_Window_image(self: Fl_WindowPtr) -> bytes extern def Fl_Window_parent(self: Fl_WindowPtr) -> bytes -extern def Fl_Window_selection_color(self: Fl_WindowPtr) -> t.CUInt32T -extern def Fl_Window_set_selection_color(self: Fl_WindowPtr, color: t.CUInt32T) +extern def Fl_Window_selection_color(self: Fl_WindowPtr) -> uint32 +extern def Fl_Window_set_selection_color(self: Fl_WindowPtr, color: uint32) extern def Fl_Window_do_callback(self: Fl_WindowPtr) extern def Fl_Window_inside(self: Fl_WindowPtr, a1: bytes) -> int extern def Fl_Window_window(self: Fl_WindowPtr) -> bytes @@ -69,15 +69,15 @@ extern def Fl_Window_take_focus(self: Fl_WindowPtr) -> int extern def Fl_Window_set_visible_focus(self: Fl_WindowPtr) extern def Fl_Window_clear_visible_focus(self: Fl_WindowPtr) extern def Fl_Window_visible_focus(self: Fl_WindowPtr, v: int) -extern def Fl_Window_has_visible_focus(self: Fl_WindowPtr) -> t.CUInt32T +extern def Fl_Window_has_visible_focus(self: Fl_WindowPtr) -> uint32 extern def Fl_Window_set_user_data(self: Fl_WindowPtr, data: bytes) extern def Fl_Window_draw_data(self: Fl_WindowPtr) -> bytes extern def Fl_Window_handle_data(self: Fl_WindowPtr) -> bytes extern def Fl_Window_set_draw_data(self: Fl_WindowPtr, data: bytes) extern def Fl_Window_set_handle_data(self: Fl_WindowPtr, data: bytes) -extern def Fl_Window_damage(self: Fl_WindowPtr) -> t.CUInt8T -extern def Fl_Window_set_damage(self: Fl_WindowPtr, flag: t.CUInt8T) -extern def Fl_Window_set_damage_area(self: Fl_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Window_damage(self: Fl_WindowPtr) -> uint8 +extern def Fl_Window_set_damage(self: Fl_WindowPtr, flag: uint8) +extern def Fl_Window_set_damage_area(self: Fl_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Window_clear_damage(self: Fl_WindowPtr) extern def Fl_Window_as_window(self: Fl_WindowPtr) -> bytes extern def Fl_Window_as_group(self: Fl_WindowPtr) -> bytes @@ -86,7 +86,7 @@ extern def Fl_Window_deimage(self: Fl_WindowPtr) -> bytes extern def Fl_Window_set_callback(self: Fl_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Window_visible(self: Fl_WindowPtr) -> int extern def Fl_Window_visible_r(self: Fl_WindowPtr) -> int -extern def Fl_Window_active(self: Fl_WindowPtr) -> t.CUInt32T +extern def Fl_Window_active(self: Fl_WindowPtr) -> uint32 extern def Fl_Window_active_r(self: Fl_WindowPtr) -> int extern def Fl_Window_callback(self: Fl_WindowPtr) -> bytes extern def Fl_Window_set_deletion_callback(self: Fl_WindowPtr, cb1: bytes, data: bytes) @@ -117,8 +117,8 @@ extern def Fl_Window_draw_outside_label(self: Fl_WindowPtr, w: Fl_WidgetPtr) extern def Fl_Window_draw_children(self: Fl_WindowPtr) # ----- Fl_Window (window_declare) ----- -extern def Fl_Window_make_modal(self: Fl_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Window_fullscreen(self: Fl_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Window_make_modal(self: Fl_WindowPtr, boolean: uint32) +extern def Fl_Window_fullscreen(self: Fl_WindowPtr, boolean: uint32) extern def Fl_Window_make_current(self: Fl_WindowPtr) extern def Fl_Window_set_icon(self: Fl_WindowPtr, a1: bytes) extern def Fl_Window_icon(self: Fl_WindowPtr) -> bytes @@ -130,7 +130,7 @@ extern def Fl_Window_border(self: Fl_WindowPtr) -> int extern def Fl_Window_region(self: Fl_WindowPtr) -> bytes extern def Fl_Window_set_region(self: Fl_WindowPtr, r: bytes) extern def Fl_Window_iconize(self: Fl_WindowPtr) -extern def Fl_Window_fullscreen_active(self: Fl_WindowPtr) -> t.CUInt32T +extern def Fl_Window_fullscreen_active(self: Fl_WindowPtr) -> uint32 extern def Fl_Window_free_position(self: Fl_WindowPtr) extern def Fl_Window_decorated_w(self: Fl_WindowPtr) -> int extern def Fl_Window_decorated_h(self: Fl_WindowPtr) -> int @@ -145,8 +145,8 @@ extern def Fl_Window_default_cursor(self: Fl_WindowPtr, cursor: int) extern def Fl_Window_screen_num(self: Fl_WindowPtr) -> int extern def Fl_Window_set_screen_num(self: Fl_WindowPtr, screen_num: int) extern def Fl_Window_wait_for_expose(self: Fl_WindowPtr) -extern def Fl_Window_set_alpha(self: Fl_WindowPtr, val: t.CUInt8T) -extern def Fl_Window_alpha(self: Fl_WindowPtr) -> t.CUInt8T +extern def Fl_Window_set_alpha(self: Fl_WindowPtr, val: uint8) +extern def Fl_Window_alpha(self: Fl_WindowPtr) -> uint8 extern def Fl_Window_force_position(self: Fl_WindowPtr, flag: int) extern def Fl_Window_default_xclass() -> str extern def Fl_Window_xclass(self: Fl_WindowPtr) -> str @@ -160,7 +160,7 @@ extern def Fl_Window_set_icon_label(self: Fl_WindowPtr, a1: str) extern def Fl_Window_set_icons(self: Fl_WindowPtr, a1: bytes, length: int) extern def Fl_Window_maximize(self: Fl_WindowPtr) extern def Fl_Window_un_maximize(self: Fl_WindowPtr) -extern def Fl_Window_maximize_active(self: Fl_WindowPtr) -> t.CUInt32T +extern def Fl_Window_maximize_active(self: Fl_WindowPtr) -> uint32 # ----- Fl_Single_Window (widget_declare) ----- extern def Fl_Single_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Single_WindowPtr @@ -182,11 +182,11 @@ extern def Fl_Single_Window_tooltip(self: Fl_Single_WindowPtr) -> str extern def Fl_Single_Window_set_tooltip(self: Fl_Single_WindowPtr, txt: str) extern def Fl_Single_Window_get_type(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_set_type(self: Fl_Single_WindowPtr, typ: int) -extern def Fl_Single_Window_color(self: Fl_Single_WindowPtr) -> t.CUInt32T -extern def Fl_Single_Window_set_color(self: Fl_Single_WindowPtr, color: t.CUInt32T) +extern def Fl_Single_Window_color(self: Fl_Single_WindowPtr) -> uint32 +extern def Fl_Single_Window_set_color(self: Fl_Single_WindowPtr, color: uint32) extern def Fl_Single_Window_measure_label(self: Fl_Single_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Single_Window_label_color(self: Fl_Single_WindowPtr) -> t.CUInt32T -extern def Fl_Single_Window_set_label_color(self: Fl_Single_WindowPtr, color: t.CUInt32T) +extern def Fl_Single_Window_label_color(self: Fl_Single_WindowPtr) -> uint32 +extern def Fl_Single_Window_set_label_color(self: Fl_Single_WindowPtr, color: uint32) extern def Fl_Single_Window_label_font(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_set_label_font(self: Fl_Single_WindowPtr, font: int) extern def Fl_Single_Window_label_size(self: Fl_Single_WindowPtr) -> int @@ -210,8 +210,8 @@ extern def Fl_Single_Window_set_when(self: Fl_Single_WindowPtr, a1: int) extern def Fl_Single_Window_when(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_image(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_parent(self: Fl_Single_WindowPtr) -> bytes -extern def Fl_Single_Window_selection_color(self: Fl_Single_WindowPtr) -> t.CUInt32T -extern def Fl_Single_Window_set_selection_color(self: Fl_Single_WindowPtr, color: t.CUInt32T) +extern def Fl_Single_Window_selection_color(self: Fl_Single_WindowPtr) -> uint32 +extern def Fl_Single_Window_set_selection_color(self: Fl_Single_WindowPtr, color: uint32) extern def Fl_Single_Window_do_callback(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_inside(self: Fl_Single_WindowPtr, a1: bytes) -> int extern def Fl_Single_Window_window(self: Fl_Single_WindowPtr) -> bytes @@ -222,15 +222,15 @@ extern def Fl_Single_Window_take_focus(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_set_visible_focus(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_clear_visible_focus(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_visible_focus(self: Fl_Single_WindowPtr, v: int) -extern def Fl_Single_Window_has_visible_focus(self: Fl_Single_WindowPtr) -> t.CUInt32T +extern def Fl_Single_Window_has_visible_focus(self: Fl_Single_WindowPtr) -> uint32 extern def Fl_Single_Window_set_user_data(self: Fl_Single_WindowPtr, data: bytes) extern def Fl_Single_Window_draw_data(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_handle_data(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_set_draw_data(self: Fl_Single_WindowPtr, data: bytes) extern def Fl_Single_Window_set_handle_data(self: Fl_Single_WindowPtr, data: bytes) -extern def Fl_Single_Window_damage(self: Fl_Single_WindowPtr) -> t.CUInt8T -extern def Fl_Single_Window_set_damage(self: Fl_Single_WindowPtr, flag: t.CUInt8T) -extern def Fl_Single_Window_set_damage_area(self: Fl_Single_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Single_Window_damage(self: Fl_Single_WindowPtr) -> uint8 +extern def Fl_Single_Window_set_damage(self: Fl_Single_WindowPtr, flag: uint8) +extern def Fl_Single_Window_set_damage_area(self: Fl_Single_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Single_Window_clear_damage(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_as_window(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_as_group(self: Fl_Single_WindowPtr) -> bytes @@ -239,7 +239,7 @@ extern def Fl_Single_Window_deimage(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_set_callback(self: Fl_Single_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Single_Window_visible(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_visible_r(self: Fl_Single_WindowPtr) -> int -extern def Fl_Single_Window_active(self: Fl_Single_WindowPtr) -> t.CUInt32T +extern def Fl_Single_Window_active(self: Fl_Single_WindowPtr) -> uint32 extern def Fl_Single_Window_active_r(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_callback(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_set_deletion_callback(self: Fl_Single_WindowPtr, cb1: bytes, data: bytes) @@ -270,8 +270,8 @@ extern def Fl_Single_Window_draw_outside_label(self: Fl_Single_WindowPtr, w: Fl_ extern def Fl_Single_Window_draw_children(self: Fl_Single_WindowPtr) # ----- Fl_Single_Window (window_declare) ----- -extern def Fl_Single_Window_make_modal(self: Fl_Single_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Single_Window_fullscreen(self: Fl_Single_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Single_Window_make_modal(self: Fl_Single_WindowPtr, boolean: uint32) +extern def Fl_Single_Window_fullscreen(self: Fl_Single_WindowPtr, boolean: uint32) extern def Fl_Single_Window_make_current(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_set_icon(self: Fl_Single_WindowPtr, a1: bytes) extern def Fl_Single_Window_icon(self: Fl_Single_WindowPtr) -> bytes @@ -283,7 +283,7 @@ extern def Fl_Single_Window_border(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_region(self: Fl_Single_WindowPtr) -> bytes extern def Fl_Single_Window_set_region(self: Fl_Single_WindowPtr, r: bytes) extern def Fl_Single_Window_iconize(self: Fl_Single_WindowPtr) -extern def Fl_Single_Window_fullscreen_active(self: Fl_Single_WindowPtr) -> t.CUInt32T +extern def Fl_Single_Window_fullscreen_active(self: Fl_Single_WindowPtr) -> uint32 extern def Fl_Single_Window_free_position(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_decorated_w(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_decorated_h(self: Fl_Single_WindowPtr) -> int @@ -298,8 +298,8 @@ extern def Fl_Single_Window_default_cursor(self: Fl_Single_WindowPtr, cursor: in extern def Fl_Single_Window_screen_num(self: Fl_Single_WindowPtr) -> int extern def Fl_Single_Window_set_screen_num(self: Fl_Single_WindowPtr, screen_num: int) extern def Fl_Single_Window_wait_for_expose(self: Fl_Single_WindowPtr) -extern def Fl_Single_Window_set_alpha(self: Fl_Single_WindowPtr, val: t.CUInt8T) -extern def Fl_Single_Window_alpha(self: Fl_Single_WindowPtr) -> t.CUInt8T +extern def Fl_Single_Window_set_alpha(self: Fl_Single_WindowPtr, val: uint8) +extern def Fl_Single_Window_alpha(self: Fl_Single_WindowPtr) -> uint8 extern def Fl_Single_Window_force_position(self: Fl_Single_WindowPtr, flag: int) extern def Fl_Single_Window_default_xclass() -> str extern def Fl_Single_Window_xclass(self: Fl_Single_WindowPtr) -> str @@ -313,7 +313,7 @@ extern def Fl_Single_Window_set_icon_label(self: Fl_Single_WindowPtr, a1: str) extern def Fl_Single_Window_set_icons(self: Fl_Single_WindowPtr, a1: bytes, length: int) extern def Fl_Single_Window_maximize(self: Fl_Single_WindowPtr) extern def Fl_Single_Window_un_maximize(self: Fl_Single_WindowPtr) -extern def Fl_Single_Window_maximize_active(self: Fl_Single_WindowPtr) -> t.CUInt32T +extern def Fl_Single_Window_maximize_active(self: Fl_Single_WindowPtr) -> uint32 # ----- Fl_Double_Window (widget_declare) ----- extern def Fl_Double_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Double_WindowPtr @@ -335,11 +335,11 @@ extern def Fl_Double_Window_tooltip(self: Fl_Double_WindowPtr) -> str extern def Fl_Double_Window_set_tooltip(self: Fl_Double_WindowPtr, txt: str) extern def Fl_Double_Window_get_type(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_set_type(self: Fl_Double_WindowPtr, typ: int) -extern def Fl_Double_Window_color(self: Fl_Double_WindowPtr) -> t.CUInt32T -extern def Fl_Double_Window_set_color(self: Fl_Double_WindowPtr, color: t.CUInt32T) +extern def Fl_Double_Window_color(self: Fl_Double_WindowPtr) -> uint32 +extern def Fl_Double_Window_set_color(self: Fl_Double_WindowPtr, color: uint32) extern def Fl_Double_Window_measure_label(self: Fl_Double_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Double_Window_label_color(self: Fl_Double_WindowPtr) -> t.CUInt32T -extern def Fl_Double_Window_set_label_color(self: Fl_Double_WindowPtr, color: t.CUInt32T) +extern def Fl_Double_Window_label_color(self: Fl_Double_WindowPtr) -> uint32 +extern def Fl_Double_Window_set_label_color(self: Fl_Double_WindowPtr, color: uint32) extern def Fl_Double_Window_label_font(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_set_label_font(self: Fl_Double_WindowPtr, font: int) extern def Fl_Double_Window_label_size(self: Fl_Double_WindowPtr) -> int @@ -363,8 +363,8 @@ extern def Fl_Double_Window_set_when(self: Fl_Double_WindowPtr, a1: int) extern def Fl_Double_Window_when(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_image(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_parent(self: Fl_Double_WindowPtr) -> bytes -extern def Fl_Double_Window_selection_color(self: Fl_Double_WindowPtr) -> t.CUInt32T -extern def Fl_Double_Window_set_selection_color(self: Fl_Double_WindowPtr, color: t.CUInt32T) +extern def Fl_Double_Window_selection_color(self: Fl_Double_WindowPtr) -> uint32 +extern def Fl_Double_Window_set_selection_color(self: Fl_Double_WindowPtr, color: uint32) extern def Fl_Double_Window_do_callback(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_inside(self: Fl_Double_WindowPtr, a1: bytes) -> int extern def Fl_Double_Window_window(self: Fl_Double_WindowPtr) -> bytes @@ -375,15 +375,15 @@ extern def Fl_Double_Window_take_focus(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_set_visible_focus(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_clear_visible_focus(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_visible_focus(self: Fl_Double_WindowPtr, v: int) -extern def Fl_Double_Window_has_visible_focus(self: Fl_Double_WindowPtr) -> t.CUInt32T +extern def Fl_Double_Window_has_visible_focus(self: Fl_Double_WindowPtr) -> uint32 extern def Fl_Double_Window_set_user_data(self: Fl_Double_WindowPtr, data: bytes) extern def Fl_Double_Window_draw_data(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_handle_data(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_set_draw_data(self: Fl_Double_WindowPtr, data: bytes) extern def Fl_Double_Window_set_handle_data(self: Fl_Double_WindowPtr, data: bytes) -extern def Fl_Double_Window_damage(self: Fl_Double_WindowPtr) -> t.CUInt8T -extern def Fl_Double_Window_set_damage(self: Fl_Double_WindowPtr, flag: t.CUInt8T) -extern def Fl_Double_Window_set_damage_area(self: Fl_Double_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Double_Window_damage(self: Fl_Double_WindowPtr) -> uint8 +extern def Fl_Double_Window_set_damage(self: Fl_Double_WindowPtr, flag: uint8) +extern def Fl_Double_Window_set_damage_area(self: Fl_Double_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Double_Window_clear_damage(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_as_window(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_as_group(self: Fl_Double_WindowPtr) -> bytes @@ -392,7 +392,7 @@ extern def Fl_Double_Window_deimage(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_set_callback(self: Fl_Double_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Double_Window_visible(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_visible_r(self: Fl_Double_WindowPtr) -> int -extern def Fl_Double_Window_active(self: Fl_Double_WindowPtr) -> t.CUInt32T +extern def Fl_Double_Window_active(self: Fl_Double_WindowPtr) -> uint32 extern def Fl_Double_Window_active_r(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_callback(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_set_deletion_callback(self: Fl_Double_WindowPtr, cb1: bytes, data: bytes) @@ -423,8 +423,8 @@ extern def Fl_Double_Window_draw_outside_label(self: Fl_Double_WindowPtr, w: Fl_ extern def Fl_Double_Window_draw_children(self: Fl_Double_WindowPtr) # ----- Fl_Double_Window (window_declare) ----- -extern def Fl_Double_Window_make_modal(self: Fl_Double_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Double_Window_fullscreen(self: Fl_Double_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Double_Window_make_modal(self: Fl_Double_WindowPtr, boolean: uint32) +extern def Fl_Double_Window_fullscreen(self: Fl_Double_WindowPtr, boolean: uint32) extern def Fl_Double_Window_make_current(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_set_icon(self: Fl_Double_WindowPtr, a1: bytes) extern def Fl_Double_Window_icon(self: Fl_Double_WindowPtr) -> bytes @@ -436,7 +436,7 @@ extern def Fl_Double_Window_border(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_region(self: Fl_Double_WindowPtr) -> bytes extern def Fl_Double_Window_set_region(self: Fl_Double_WindowPtr, r: bytes) extern def Fl_Double_Window_iconize(self: Fl_Double_WindowPtr) -extern def Fl_Double_Window_fullscreen_active(self: Fl_Double_WindowPtr) -> t.CUInt32T +extern def Fl_Double_Window_fullscreen_active(self: Fl_Double_WindowPtr) -> uint32 extern def Fl_Double_Window_free_position(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_decorated_w(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_decorated_h(self: Fl_Double_WindowPtr) -> int @@ -451,8 +451,8 @@ extern def Fl_Double_Window_default_cursor(self: Fl_Double_WindowPtr, cursor: in extern def Fl_Double_Window_screen_num(self: Fl_Double_WindowPtr) -> int extern def Fl_Double_Window_set_screen_num(self: Fl_Double_WindowPtr, screen_num: int) extern def Fl_Double_Window_wait_for_expose(self: Fl_Double_WindowPtr) -extern def Fl_Double_Window_set_alpha(self: Fl_Double_WindowPtr, val: t.CUInt8T) -extern def Fl_Double_Window_alpha(self: Fl_Double_WindowPtr) -> t.CUInt8T +extern def Fl_Double_Window_set_alpha(self: Fl_Double_WindowPtr, val: uint8) +extern def Fl_Double_Window_alpha(self: Fl_Double_WindowPtr) -> uint8 extern def Fl_Double_Window_force_position(self: Fl_Double_WindowPtr, flag: int) extern def Fl_Double_Window_default_xclass() -> str extern def Fl_Double_Window_xclass(self: Fl_Double_WindowPtr) -> str @@ -466,7 +466,7 @@ extern def Fl_Double_Window_set_icon_label(self: Fl_Double_WindowPtr, a1: str) extern def Fl_Double_Window_set_icons(self: Fl_Double_WindowPtr, a1: bytes, length: int) extern def Fl_Double_Window_maximize(self: Fl_Double_WindowPtr) extern def Fl_Double_Window_un_maximize(self: Fl_Double_WindowPtr) -extern def Fl_Double_Window_maximize_active(self: Fl_Double_WindowPtr) -> t.CUInt32T +extern def Fl_Double_Window_maximize_active(self: Fl_Double_WindowPtr) -> uint32 # ----- Fl_Menu_Window (widget_declare) ----- extern def Fl_Menu_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Menu_WindowPtr @@ -488,11 +488,11 @@ extern def Fl_Menu_Window_tooltip(self: Fl_Menu_WindowPtr) -> str extern def Fl_Menu_Window_set_tooltip(self: Fl_Menu_WindowPtr, txt: str) extern def Fl_Menu_Window_get_type(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_set_type(self: Fl_Menu_WindowPtr, typ: int) -extern def Fl_Menu_Window_color(self: Fl_Menu_WindowPtr) -> t.CUInt32T -extern def Fl_Menu_Window_set_color(self: Fl_Menu_WindowPtr, color: t.CUInt32T) +extern def Fl_Menu_Window_color(self: Fl_Menu_WindowPtr) -> uint32 +extern def Fl_Menu_Window_set_color(self: Fl_Menu_WindowPtr, color: uint32) extern def Fl_Menu_Window_measure_label(self: Fl_Menu_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Menu_Window_label_color(self: Fl_Menu_WindowPtr) -> t.CUInt32T -extern def Fl_Menu_Window_set_label_color(self: Fl_Menu_WindowPtr, color: t.CUInt32T) +extern def Fl_Menu_Window_label_color(self: Fl_Menu_WindowPtr) -> uint32 +extern def Fl_Menu_Window_set_label_color(self: Fl_Menu_WindowPtr, color: uint32) extern def Fl_Menu_Window_label_font(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_set_label_font(self: Fl_Menu_WindowPtr, font: int) extern def Fl_Menu_Window_label_size(self: Fl_Menu_WindowPtr) -> int @@ -516,8 +516,8 @@ extern def Fl_Menu_Window_set_when(self: Fl_Menu_WindowPtr, a1: int) extern def Fl_Menu_Window_when(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_image(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_parent(self: Fl_Menu_WindowPtr) -> bytes -extern def Fl_Menu_Window_selection_color(self: Fl_Menu_WindowPtr) -> t.CUInt32T -extern def Fl_Menu_Window_set_selection_color(self: Fl_Menu_WindowPtr, color: t.CUInt32T) +extern def Fl_Menu_Window_selection_color(self: Fl_Menu_WindowPtr) -> uint32 +extern def Fl_Menu_Window_set_selection_color(self: Fl_Menu_WindowPtr, color: uint32) extern def Fl_Menu_Window_do_callback(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_inside(self: Fl_Menu_WindowPtr, a1: bytes) -> int extern def Fl_Menu_Window_window(self: Fl_Menu_WindowPtr) -> bytes @@ -528,15 +528,15 @@ extern def Fl_Menu_Window_take_focus(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_set_visible_focus(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_clear_visible_focus(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_visible_focus(self: Fl_Menu_WindowPtr, v: int) -extern def Fl_Menu_Window_has_visible_focus(self: Fl_Menu_WindowPtr) -> t.CUInt32T +extern def Fl_Menu_Window_has_visible_focus(self: Fl_Menu_WindowPtr) -> uint32 extern def Fl_Menu_Window_set_user_data(self: Fl_Menu_WindowPtr, data: bytes) extern def Fl_Menu_Window_draw_data(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_handle_data(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_set_draw_data(self: Fl_Menu_WindowPtr, data: bytes) extern def Fl_Menu_Window_set_handle_data(self: Fl_Menu_WindowPtr, data: bytes) -extern def Fl_Menu_Window_damage(self: Fl_Menu_WindowPtr) -> t.CUInt8T -extern def Fl_Menu_Window_set_damage(self: Fl_Menu_WindowPtr, flag: t.CUInt8T) -extern def Fl_Menu_Window_set_damage_area(self: Fl_Menu_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Menu_Window_damage(self: Fl_Menu_WindowPtr) -> uint8 +extern def Fl_Menu_Window_set_damage(self: Fl_Menu_WindowPtr, flag: uint8) +extern def Fl_Menu_Window_set_damage_area(self: Fl_Menu_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Menu_Window_clear_damage(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_as_window(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_as_group(self: Fl_Menu_WindowPtr) -> bytes @@ -545,7 +545,7 @@ extern def Fl_Menu_Window_deimage(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_set_callback(self: Fl_Menu_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Menu_Window_visible(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_visible_r(self: Fl_Menu_WindowPtr) -> int -extern def Fl_Menu_Window_active(self: Fl_Menu_WindowPtr) -> t.CUInt32T +extern def Fl_Menu_Window_active(self: Fl_Menu_WindowPtr) -> uint32 extern def Fl_Menu_Window_active_r(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_callback(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_set_deletion_callback(self: Fl_Menu_WindowPtr, cb1: bytes, data: bytes) @@ -576,8 +576,8 @@ extern def Fl_Menu_Window_draw_outside_label(self: Fl_Menu_WindowPtr, w: Fl_Widg extern def Fl_Menu_Window_draw_children(self: Fl_Menu_WindowPtr) # ----- Fl_Menu_Window (window_declare) ----- -extern def Fl_Menu_Window_make_modal(self: Fl_Menu_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Menu_Window_fullscreen(self: Fl_Menu_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Menu_Window_make_modal(self: Fl_Menu_WindowPtr, boolean: uint32) +extern def Fl_Menu_Window_fullscreen(self: Fl_Menu_WindowPtr, boolean: uint32) extern def Fl_Menu_Window_make_current(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_set_icon(self: Fl_Menu_WindowPtr, a1: bytes) extern def Fl_Menu_Window_icon(self: Fl_Menu_WindowPtr) -> bytes @@ -589,7 +589,7 @@ extern def Fl_Menu_Window_border(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_region(self: Fl_Menu_WindowPtr) -> bytes extern def Fl_Menu_Window_set_region(self: Fl_Menu_WindowPtr, r: bytes) extern def Fl_Menu_Window_iconize(self: Fl_Menu_WindowPtr) -extern def Fl_Menu_Window_fullscreen_active(self: Fl_Menu_WindowPtr) -> t.CUInt32T +extern def Fl_Menu_Window_fullscreen_active(self: Fl_Menu_WindowPtr) -> uint32 extern def Fl_Menu_Window_free_position(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_decorated_w(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_decorated_h(self: Fl_Menu_WindowPtr) -> int @@ -604,8 +604,8 @@ extern def Fl_Menu_Window_default_cursor(self: Fl_Menu_WindowPtr, cursor: int) extern def Fl_Menu_Window_screen_num(self: Fl_Menu_WindowPtr) -> int extern def Fl_Menu_Window_set_screen_num(self: Fl_Menu_WindowPtr, screen_num: int) extern def Fl_Menu_Window_wait_for_expose(self: Fl_Menu_WindowPtr) -extern def Fl_Menu_Window_set_alpha(self: Fl_Menu_WindowPtr, val: t.CUInt8T) -extern def Fl_Menu_Window_alpha(self: Fl_Menu_WindowPtr) -> t.CUInt8T +extern def Fl_Menu_Window_set_alpha(self: Fl_Menu_WindowPtr, val: uint8) +extern def Fl_Menu_Window_alpha(self: Fl_Menu_WindowPtr) -> uint8 extern def Fl_Menu_Window_force_position(self: Fl_Menu_WindowPtr, flag: int) extern def Fl_Menu_Window_default_xclass() -> str extern def Fl_Menu_Window_xclass(self: Fl_Menu_WindowPtr) -> str @@ -619,7 +619,7 @@ extern def Fl_Menu_Window_set_icon_label(self: Fl_Menu_WindowPtr, a1: str) extern def Fl_Menu_Window_set_icons(self: Fl_Menu_WindowPtr, a1: bytes, length: int) extern def Fl_Menu_Window_maximize(self: Fl_Menu_WindowPtr) extern def Fl_Menu_Window_un_maximize(self: Fl_Menu_WindowPtr) -extern def Fl_Menu_Window_maximize_active(self: Fl_Menu_WindowPtr) -> t.CUInt32T +extern def Fl_Menu_Window_maximize_active(self: Fl_Menu_WindowPtr) -> uint32 # ----- Fl_Overlay_Window (widget_declare) ----- extern def Fl_Overlay_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Overlay_WindowPtr @@ -641,11 +641,11 @@ extern def Fl_Overlay_Window_tooltip(self: Fl_Overlay_WindowPtr) -> str extern def Fl_Overlay_Window_set_tooltip(self: Fl_Overlay_WindowPtr, txt: str) extern def Fl_Overlay_Window_get_type(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_set_type(self: Fl_Overlay_WindowPtr, typ: int) -extern def Fl_Overlay_Window_color(self: Fl_Overlay_WindowPtr) -> t.CUInt32T -extern def Fl_Overlay_Window_set_color(self: Fl_Overlay_WindowPtr, color: t.CUInt32T) +extern def Fl_Overlay_Window_color(self: Fl_Overlay_WindowPtr) -> uint32 +extern def Fl_Overlay_Window_set_color(self: Fl_Overlay_WindowPtr, color: uint32) extern def Fl_Overlay_Window_measure_label(self: Fl_Overlay_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Overlay_Window_label_color(self: Fl_Overlay_WindowPtr) -> t.CUInt32T -extern def Fl_Overlay_Window_set_label_color(self: Fl_Overlay_WindowPtr, color: t.CUInt32T) +extern def Fl_Overlay_Window_label_color(self: Fl_Overlay_WindowPtr) -> uint32 +extern def Fl_Overlay_Window_set_label_color(self: Fl_Overlay_WindowPtr, color: uint32) extern def Fl_Overlay_Window_label_font(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_set_label_font(self: Fl_Overlay_WindowPtr, font: int) extern def Fl_Overlay_Window_label_size(self: Fl_Overlay_WindowPtr) -> int @@ -669,8 +669,8 @@ extern def Fl_Overlay_Window_set_when(self: Fl_Overlay_WindowPtr, a1: int) extern def Fl_Overlay_Window_when(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_image(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_parent(self: Fl_Overlay_WindowPtr) -> bytes -extern def Fl_Overlay_Window_selection_color(self: Fl_Overlay_WindowPtr) -> t.CUInt32T -extern def Fl_Overlay_Window_set_selection_color(self: Fl_Overlay_WindowPtr, color: t.CUInt32T) +extern def Fl_Overlay_Window_selection_color(self: Fl_Overlay_WindowPtr) -> uint32 +extern def Fl_Overlay_Window_set_selection_color(self: Fl_Overlay_WindowPtr, color: uint32) extern def Fl_Overlay_Window_do_callback(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_inside(self: Fl_Overlay_WindowPtr, a1: bytes) -> int extern def Fl_Overlay_Window_window(self: Fl_Overlay_WindowPtr) -> bytes @@ -681,15 +681,15 @@ extern def Fl_Overlay_Window_take_focus(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_set_visible_focus(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_clear_visible_focus(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_visible_focus(self: Fl_Overlay_WindowPtr, v: int) -extern def Fl_Overlay_Window_has_visible_focus(self: Fl_Overlay_WindowPtr) -> t.CUInt32T +extern def Fl_Overlay_Window_has_visible_focus(self: Fl_Overlay_WindowPtr) -> uint32 extern def Fl_Overlay_Window_set_user_data(self: Fl_Overlay_WindowPtr, data: bytes) extern def Fl_Overlay_Window_draw_data(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_handle_data(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_set_draw_data(self: Fl_Overlay_WindowPtr, data: bytes) extern def Fl_Overlay_Window_set_handle_data(self: Fl_Overlay_WindowPtr, data: bytes) -extern def Fl_Overlay_Window_damage(self: Fl_Overlay_WindowPtr) -> t.CUInt8T -extern def Fl_Overlay_Window_set_damage(self: Fl_Overlay_WindowPtr, flag: t.CUInt8T) -extern def Fl_Overlay_Window_set_damage_area(self: Fl_Overlay_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Overlay_Window_damage(self: Fl_Overlay_WindowPtr) -> uint8 +extern def Fl_Overlay_Window_set_damage(self: Fl_Overlay_WindowPtr, flag: uint8) +extern def Fl_Overlay_Window_set_damage_area(self: Fl_Overlay_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Overlay_Window_clear_damage(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_as_window(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_as_group(self: Fl_Overlay_WindowPtr) -> bytes @@ -698,7 +698,7 @@ extern def Fl_Overlay_Window_deimage(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_set_callback(self: Fl_Overlay_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Overlay_Window_visible(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_visible_r(self: Fl_Overlay_WindowPtr) -> int -extern def Fl_Overlay_Window_active(self: Fl_Overlay_WindowPtr) -> t.CUInt32T +extern def Fl_Overlay_Window_active(self: Fl_Overlay_WindowPtr) -> uint32 extern def Fl_Overlay_Window_active_r(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_callback(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_set_deletion_callback(self: Fl_Overlay_WindowPtr, cb1: bytes, data: bytes) @@ -729,8 +729,8 @@ extern def Fl_Overlay_Window_draw_outside_label(self: Fl_Overlay_WindowPtr, w: F extern def Fl_Overlay_Window_draw_children(self: Fl_Overlay_WindowPtr) # ----- Fl_Overlay_Window (window_declare) ----- -extern def Fl_Overlay_Window_make_modal(self: Fl_Overlay_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Overlay_Window_fullscreen(self: Fl_Overlay_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Overlay_Window_make_modal(self: Fl_Overlay_WindowPtr, boolean: uint32) +extern def Fl_Overlay_Window_fullscreen(self: Fl_Overlay_WindowPtr, boolean: uint32) extern def Fl_Overlay_Window_make_current(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_set_icon(self: Fl_Overlay_WindowPtr, a1: bytes) extern def Fl_Overlay_Window_icon(self: Fl_Overlay_WindowPtr) -> bytes @@ -742,7 +742,7 @@ extern def Fl_Overlay_Window_border(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_region(self: Fl_Overlay_WindowPtr) -> bytes extern def Fl_Overlay_Window_set_region(self: Fl_Overlay_WindowPtr, r: bytes) extern def Fl_Overlay_Window_iconize(self: Fl_Overlay_WindowPtr) -extern def Fl_Overlay_Window_fullscreen_active(self: Fl_Overlay_WindowPtr) -> t.CUInt32T +extern def Fl_Overlay_Window_fullscreen_active(self: Fl_Overlay_WindowPtr) -> uint32 extern def Fl_Overlay_Window_free_position(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_decorated_w(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_decorated_h(self: Fl_Overlay_WindowPtr) -> int @@ -757,8 +757,8 @@ extern def Fl_Overlay_Window_default_cursor(self: Fl_Overlay_WindowPtr, cursor: extern def Fl_Overlay_Window_screen_num(self: Fl_Overlay_WindowPtr) -> int extern def Fl_Overlay_Window_set_screen_num(self: Fl_Overlay_WindowPtr, screen_num: int) extern def Fl_Overlay_Window_wait_for_expose(self: Fl_Overlay_WindowPtr) -extern def Fl_Overlay_Window_set_alpha(self: Fl_Overlay_WindowPtr, val: t.CUInt8T) -extern def Fl_Overlay_Window_alpha(self: Fl_Overlay_WindowPtr) -> t.CUInt8T +extern def Fl_Overlay_Window_set_alpha(self: Fl_Overlay_WindowPtr, val: uint8) +extern def Fl_Overlay_Window_alpha(self: Fl_Overlay_WindowPtr) -> uint8 extern def Fl_Overlay_Window_force_position(self: Fl_Overlay_WindowPtr, flag: int) extern def Fl_Overlay_Window_default_xclass() -> str extern def Fl_Overlay_Window_xclass(self: Fl_Overlay_WindowPtr) -> str @@ -772,7 +772,7 @@ extern def Fl_Overlay_Window_set_icon_label(self: Fl_Overlay_WindowPtr, a1: str) extern def Fl_Overlay_Window_set_icons(self: Fl_Overlay_WindowPtr, a1: bytes, length: int) extern def Fl_Overlay_Window_maximize(self: Fl_Overlay_WindowPtr) extern def Fl_Overlay_Window_un_maximize(self: Fl_Overlay_WindowPtr) -extern def Fl_Overlay_Window_maximize_active(self: Fl_Overlay_WindowPtr) -> t.CUInt32T +extern def Fl_Overlay_Window_maximize_active(self: Fl_Overlay_WindowPtr) -> uint32 # ----- Fl_Gl_Window (widget_declare) ----- extern def Fl_Gl_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Gl_WindowPtr @@ -794,11 +794,11 @@ extern def Fl_Gl_Window_tooltip(self: Fl_Gl_WindowPtr) -> str extern def Fl_Gl_Window_set_tooltip(self: Fl_Gl_WindowPtr, txt: str) extern def Fl_Gl_Window_get_type(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_set_type(self: Fl_Gl_WindowPtr, typ: int) -extern def Fl_Gl_Window_color(self: Fl_Gl_WindowPtr) -> t.CUInt32T -extern def Fl_Gl_Window_set_color(self: Fl_Gl_WindowPtr, color: t.CUInt32T) +extern def Fl_Gl_Window_color(self: Fl_Gl_WindowPtr) -> uint32 +extern def Fl_Gl_Window_set_color(self: Fl_Gl_WindowPtr, color: uint32) extern def Fl_Gl_Window_measure_label(self: Fl_Gl_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Gl_Window_label_color(self: Fl_Gl_WindowPtr) -> t.CUInt32T -extern def Fl_Gl_Window_set_label_color(self: Fl_Gl_WindowPtr, color: t.CUInt32T) +extern def Fl_Gl_Window_label_color(self: Fl_Gl_WindowPtr) -> uint32 +extern def Fl_Gl_Window_set_label_color(self: Fl_Gl_WindowPtr, color: uint32) extern def Fl_Gl_Window_label_font(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_set_label_font(self: Fl_Gl_WindowPtr, font: int) extern def Fl_Gl_Window_label_size(self: Fl_Gl_WindowPtr) -> int @@ -822,8 +822,8 @@ extern def Fl_Gl_Window_set_when(self: Fl_Gl_WindowPtr, a1: int) extern def Fl_Gl_Window_when(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_image(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_parent(self: Fl_Gl_WindowPtr) -> bytes -extern def Fl_Gl_Window_selection_color(self: Fl_Gl_WindowPtr) -> t.CUInt32T -extern def Fl_Gl_Window_set_selection_color(self: Fl_Gl_WindowPtr, color: t.CUInt32T) +extern def Fl_Gl_Window_selection_color(self: Fl_Gl_WindowPtr) -> uint32 +extern def Fl_Gl_Window_set_selection_color(self: Fl_Gl_WindowPtr, color: uint32) extern def Fl_Gl_Window_do_callback(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_inside(self: Fl_Gl_WindowPtr, a1: bytes) -> int extern def Fl_Gl_Window_window(self: Fl_Gl_WindowPtr) -> bytes @@ -834,15 +834,15 @@ extern def Fl_Gl_Window_take_focus(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_set_visible_focus(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_clear_visible_focus(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_visible_focus(self: Fl_Gl_WindowPtr, v: int) -extern def Fl_Gl_Window_has_visible_focus(self: Fl_Gl_WindowPtr) -> t.CUInt32T +extern def Fl_Gl_Window_has_visible_focus(self: Fl_Gl_WindowPtr) -> uint32 extern def Fl_Gl_Window_set_user_data(self: Fl_Gl_WindowPtr, data: bytes) extern def Fl_Gl_Window_draw_data(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_handle_data(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_set_draw_data(self: Fl_Gl_WindowPtr, data: bytes) extern def Fl_Gl_Window_set_handle_data(self: Fl_Gl_WindowPtr, data: bytes) -extern def Fl_Gl_Window_damage(self: Fl_Gl_WindowPtr) -> t.CUInt8T -extern def Fl_Gl_Window_set_damage(self: Fl_Gl_WindowPtr, flag: t.CUInt8T) -extern def Fl_Gl_Window_set_damage_area(self: Fl_Gl_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Gl_Window_damage(self: Fl_Gl_WindowPtr) -> uint8 +extern def Fl_Gl_Window_set_damage(self: Fl_Gl_WindowPtr, flag: uint8) +extern def Fl_Gl_Window_set_damage_area(self: Fl_Gl_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Gl_Window_clear_damage(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_as_window(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_as_group(self: Fl_Gl_WindowPtr) -> bytes @@ -851,7 +851,7 @@ extern def Fl_Gl_Window_deimage(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_set_callback(self: Fl_Gl_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Gl_Window_visible(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_visible_r(self: Fl_Gl_WindowPtr) -> int -extern def Fl_Gl_Window_active(self: Fl_Gl_WindowPtr) -> t.CUInt32T +extern def Fl_Gl_Window_active(self: Fl_Gl_WindowPtr) -> uint32 extern def Fl_Gl_Window_active_r(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_callback(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_set_deletion_callback(self: Fl_Gl_WindowPtr, cb1: bytes, data: bytes) @@ -882,8 +882,8 @@ extern def Fl_Gl_Window_draw_outside_label(self: Fl_Gl_WindowPtr, w: Fl_WidgetPt extern def Fl_Gl_Window_draw_children(self: Fl_Gl_WindowPtr) # ----- Fl_Gl_Window (window_declare) ----- -extern def Fl_Gl_Window_make_modal(self: Fl_Gl_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Gl_Window_fullscreen(self: Fl_Gl_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Gl_Window_make_modal(self: Fl_Gl_WindowPtr, boolean: uint32) +extern def Fl_Gl_Window_fullscreen(self: Fl_Gl_WindowPtr, boolean: uint32) extern def Fl_Gl_Window_make_current(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_set_icon(self: Fl_Gl_WindowPtr, a1: bytes) extern def Fl_Gl_Window_icon(self: Fl_Gl_WindowPtr) -> bytes @@ -895,7 +895,7 @@ extern def Fl_Gl_Window_border(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_region(self: Fl_Gl_WindowPtr) -> bytes extern def Fl_Gl_Window_set_region(self: Fl_Gl_WindowPtr, r: bytes) extern def Fl_Gl_Window_iconize(self: Fl_Gl_WindowPtr) -extern def Fl_Gl_Window_fullscreen_active(self: Fl_Gl_WindowPtr) -> t.CUInt32T +extern def Fl_Gl_Window_fullscreen_active(self: Fl_Gl_WindowPtr) -> uint32 extern def Fl_Gl_Window_free_position(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_decorated_w(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_decorated_h(self: Fl_Gl_WindowPtr) -> int @@ -910,8 +910,8 @@ extern def Fl_Gl_Window_default_cursor(self: Fl_Gl_WindowPtr, cursor: int) extern def Fl_Gl_Window_screen_num(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_set_screen_num(self: Fl_Gl_WindowPtr, screen_num: int) extern def Fl_Gl_Window_wait_for_expose(self: Fl_Gl_WindowPtr) -extern def Fl_Gl_Window_set_alpha(self: Fl_Gl_WindowPtr, val: t.CUInt8T) -extern def Fl_Gl_Window_alpha(self: Fl_Gl_WindowPtr) -> t.CUInt8T +extern def Fl_Gl_Window_set_alpha(self: Fl_Gl_WindowPtr, val: uint8) +extern def Fl_Gl_Window_alpha(self: Fl_Gl_WindowPtr) -> uint8 extern def Fl_Gl_Window_force_position(self: Fl_Gl_WindowPtr, flag: int) extern def Fl_Gl_Window_default_xclass() -> str extern def Fl_Gl_Window_xclass(self: Fl_Gl_WindowPtr) -> str @@ -925,7 +925,7 @@ extern def Fl_Gl_Window_set_icon_label(self: Fl_Gl_WindowPtr, a1: str) extern def Fl_Gl_Window_set_icons(self: Fl_Gl_WindowPtr, a1: bytes, length: int) extern def Fl_Gl_Window_maximize(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_un_maximize(self: Fl_Gl_WindowPtr) -extern def Fl_Gl_Window_maximize_active(self: Fl_Gl_WindowPtr) -> t.CUInt32T +extern def Fl_Gl_Window_maximize_active(self: Fl_Gl_WindowPtr) -> uint32 # ----- Fl_Glut_Window (widget_declare) ----- extern def Fl_Glut_Window_new(x: int, y: int, width: int, height: int, title: str) -> Fl_Glut_WindowPtr @@ -947,11 +947,11 @@ extern def Fl_Glut_Window_tooltip(self: Fl_Glut_WindowPtr) -> str extern def Fl_Glut_Window_set_tooltip(self: Fl_Glut_WindowPtr, txt: str) extern def Fl_Glut_Window_get_type(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_set_type(self: Fl_Glut_WindowPtr, typ: int) -extern def Fl_Glut_Window_color(self: Fl_Glut_WindowPtr) -> t.CUInt32T -extern def Fl_Glut_Window_set_color(self: Fl_Glut_WindowPtr, color: t.CUInt32T) +extern def Fl_Glut_Window_color(self: Fl_Glut_WindowPtr) -> uint32 +extern def Fl_Glut_Window_set_color(self: Fl_Glut_WindowPtr, color: uint32) extern def Fl_Glut_Window_measure_label(self: Fl_Glut_WindowPtr, a1: bytes, a2: bytes) -extern def Fl_Glut_Window_label_color(self: Fl_Glut_WindowPtr) -> t.CUInt32T -extern def Fl_Glut_Window_set_label_color(self: Fl_Glut_WindowPtr, color: t.CUInt32T) +extern def Fl_Glut_Window_label_color(self: Fl_Glut_WindowPtr) -> uint32 +extern def Fl_Glut_Window_set_label_color(self: Fl_Glut_WindowPtr, color: uint32) extern def Fl_Glut_Window_label_font(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_set_label_font(self: Fl_Glut_WindowPtr, font: int) extern def Fl_Glut_Window_label_size(self: Fl_Glut_WindowPtr) -> int @@ -975,8 +975,8 @@ extern def Fl_Glut_Window_set_when(self: Fl_Glut_WindowPtr, a1: int) extern def Fl_Glut_Window_when(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_image(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_parent(self: Fl_Glut_WindowPtr) -> bytes -extern def Fl_Glut_Window_selection_color(self: Fl_Glut_WindowPtr) -> t.CUInt32T -extern def Fl_Glut_Window_set_selection_color(self: Fl_Glut_WindowPtr, color: t.CUInt32T) +extern def Fl_Glut_Window_selection_color(self: Fl_Glut_WindowPtr) -> uint32 +extern def Fl_Glut_Window_set_selection_color(self: Fl_Glut_WindowPtr, color: uint32) extern def Fl_Glut_Window_do_callback(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_inside(self: Fl_Glut_WindowPtr, a1: bytes) -> int extern def Fl_Glut_Window_window(self: Fl_Glut_WindowPtr) -> bytes @@ -987,15 +987,15 @@ extern def Fl_Glut_Window_take_focus(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_set_visible_focus(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_clear_visible_focus(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_visible_focus(self: Fl_Glut_WindowPtr, v: int) -extern def Fl_Glut_Window_has_visible_focus(self: Fl_Glut_WindowPtr) -> t.CUInt32T +extern def Fl_Glut_Window_has_visible_focus(self: Fl_Glut_WindowPtr) -> uint32 extern def Fl_Glut_Window_set_user_data(self: Fl_Glut_WindowPtr, data: bytes) extern def Fl_Glut_Window_draw_data(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_handle_data(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_set_draw_data(self: Fl_Glut_WindowPtr, data: bytes) extern def Fl_Glut_Window_set_handle_data(self: Fl_Glut_WindowPtr, data: bytes) -extern def Fl_Glut_Window_damage(self: Fl_Glut_WindowPtr) -> t.CUInt8T -extern def Fl_Glut_Window_set_damage(self: Fl_Glut_WindowPtr, flag: t.CUInt8T) -extern def Fl_Glut_Window_set_damage_area(self: Fl_Glut_WindowPtr, flag: t.CUInt8T, x: int, y: int, w: int, h: int) +extern def Fl_Glut_Window_damage(self: Fl_Glut_WindowPtr) -> uint8 +extern def Fl_Glut_Window_set_damage(self: Fl_Glut_WindowPtr, flag: uint8) +extern def Fl_Glut_Window_set_damage_area(self: Fl_Glut_WindowPtr, flag: uint8, x: int, y: int, w: int, h: int) extern def Fl_Glut_Window_clear_damage(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_as_window(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_as_group(self: Fl_Glut_WindowPtr) -> bytes @@ -1004,7 +1004,7 @@ extern def Fl_Glut_Window_deimage(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_set_callback(self: Fl_Glut_WindowPtr, a1: bytes, a2: bytes) extern def Fl_Glut_Window_visible(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_visible_r(self: Fl_Glut_WindowPtr) -> int -extern def Fl_Glut_Window_active(self: Fl_Glut_WindowPtr) -> t.CUInt32T +extern def Fl_Glut_Window_active(self: Fl_Glut_WindowPtr) -> uint32 extern def Fl_Glut_Window_active_r(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_callback(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_set_deletion_callback(self: Fl_Glut_WindowPtr, cb1: bytes, data: bytes) @@ -1035,8 +1035,8 @@ extern def Fl_Glut_Window_draw_outside_label(self: Fl_Glut_WindowPtr, w: Fl_Widg extern def Fl_Glut_Window_draw_children(self: Fl_Glut_WindowPtr) # ----- Fl_Glut_Window (window_declare) ----- -extern def Fl_Glut_Window_make_modal(self: Fl_Glut_WindowPtr, boolean: t.CUInt32T) -extern def Fl_Glut_Window_fullscreen(self: Fl_Glut_WindowPtr, boolean: t.CUInt32T) +extern def Fl_Glut_Window_make_modal(self: Fl_Glut_WindowPtr, boolean: uint32) +extern def Fl_Glut_Window_fullscreen(self: Fl_Glut_WindowPtr, boolean: uint32) extern def Fl_Glut_Window_make_current(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_set_icon(self: Fl_Glut_WindowPtr, a1: bytes) extern def Fl_Glut_Window_icon(self: Fl_Glut_WindowPtr) -> bytes @@ -1048,7 +1048,7 @@ extern def Fl_Glut_Window_border(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_region(self: Fl_Glut_WindowPtr) -> bytes extern def Fl_Glut_Window_set_region(self: Fl_Glut_WindowPtr, r: bytes) extern def Fl_Glut_Window_iconize(self: Fl_Glut_WindowPtr) -extern def Fl_Glut_Window_fullscreen_active(self: Fl_Glut_WindowPtr) -> t.CUInt32T +extern def Fl_Glut_Window_fullscreen_active(self: Fl_Glut_WindowPtr) -> uint32 extern def Fl_Glut_Window_free_position(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_decorated_w(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_decorated_h(self: Fl_Glut_WindowPtr) -> int @@ -1063,8 +1063,8 @@ extern def Fl_Glut_Window_default_cursor(self: Fl_Glut_WindowPtr, cursor: int) extern def Fl_Glut_Window_screen_num(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_set_screen_num(self: Fl_Glut_WindowPtr, screen_num: int) extern def Fl_Glut_Window_wait_for_expose(self: Fl_Glut_WindowPtr) -extern def Fl_Glut_Window_set_alpha(self: Fl_Glut_WindowPtr, val: t.CUInt8T) -extern def Fl_Glut_Window_alpha(self: Fl_Glut_WindowPtr) -> t.CUInt8T +extern def Fl_Glut_Window_set_alpha(self: Fl_Glut_WindowPtr, val: uint8) +extern def Fl_Glut_Window_alpha(self: Fl_Glut_WindowPtr) -> uint8 extern def Fl_Glut_Window_force_position(self: Fl_Glut_WindowPtr, flag: int) extern def Fl_Glut_Window_default_xclass() -> str extern def Fl_Glut_Window_xclass(self: Fl_Glut_WindowPtr) -> str @@ -1078,7 +1078,7 @@ extern def Fl_Glut_Window_set_icon_label(self: Fl_Glut_WindowPtr, a1: str) extern def Fl_Glut_Window_set_icons(self: Fl_Glut_WindowPtr, a1: bytes, length: int) extern def Fl_Glut_Window_maximize(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_un_maximize(self: Fl_Glut_WindowPtr) -extern def Fl_Glut_Window_maximize_active(self: Fl_Glut_WindowPtr) -> t.CUInt32T +extern def Fl_Glut_Window_maximize_active(self: Fl_Glut_WindowPtr) -> uint32 extern def Fl_Window_new_wh(width: int, height: int, title: str) -> Fl_WindowPtr extern def Fl_Window_find_by_handle(handle: bytes) -> Fl_WindowPtr @@ -1111,7 +1111,7 @@ extern def Fl_Gl_Window_can_do_overlay(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_redraw_overlay(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_hide_overlay(self: Fl_Gl_WindowPtr) extern def Fl_Gl_Window_make_overlay_current(self: Fl_Gl_WindowPtr) -extern def Fl_Gl_Window_pixels_per_unit(self: Fl_Gl_WindowPtr) -> t.CFloat +extern def Fl_Gl_Window_pixels_per_unit(self: Fl_Gl_WindowPtr) -> float extern def Fl_Gl_Window_pixel_w(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_pixel_h(self: Fl_Gl_WindowPtr) -> int extern def Fl_Gl_Window_mode(self: Fl_Gl_WindowPtr) -> int @@ -1133,7 +1133,7 @@ extern def Fl_Glut_Window_can_do_overlay(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_redraw_overlay(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_hide_overlay(self: Fl_Glut_WindowPtr) extern def Fl_Glut_Window_make_overlay_current(self: Fl_Glut_WindowPtr) -extern def Fl_Glut_Window_pixels_per_unit(self: Fl_Glut_WindowPtr) -> t.CFloat +extern def Fl_Glut_Window_pixels_per_unit(self: Fl_Glut_WindowPtr) -> float extern def Fl_Glut_Window_pixel_w(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_pixel_h(self: Fl_Glut_WindowPtr) -> int extern def Fl_Glut_Window_mode(self: Fl_Glut_WindowPtr) -> int diff --git a/fltk/_enums.vp b/fltk/_enums.vp index 1eea21b..3e8c400 100644 --- a/fltk/_enums.vp +++ b/fltk/_enums.vp @@ -4,444 +4,444 @@ import t, c # fltk/_enums.vp — cfltk 枚举常量（t.CInt） # ============================================================ -Fl_BrowserType_Normal: t.CInt = 0 -Fl_BrowserType_Select: t.CInt = 1 -Fl_BrowserType_Hold: t.CInt = 2 -Fl_BrowserType_Multi: t.CInt = 3 -Fl_BrowserScrollbar_None: t.CInt = 0 -Fl_BrowserScrollbar_Horizontal: t.CInt = 1 -Fl_BrowserScrollbar_Vertical: t.CInt = 2 -Fl_BrowserScrollbar_Both: t.CInt = 3 -Fl_BrowserScrollbar_AlwaysOn: t.CInt = 4 -Fl_BrowserScrollbar_HorizontalAlways: t.CInt = 5 -Fl_BrowserScrollbar_VerticalAlways: t.CInt = 6 -Fl_BrowserScrollbar_BothAlways: t.CInt = 7 -Fl_FileType_Files: t.CInt = 0 -Fl_ButtonType_Normal: t.CInt = 0 -Fl_ButtonType_Toggle: t.CInt = 1 -Fl_ButtonType_Radio: t.CInt = 102 -Fl_ButtonType_Hidden: t.CInt = 103 -Fl_FileDialogType_BrowseFile: t.CInt = 0 -Fl_FileDialogType_BrowseDir: t.CInt = 1 -Fl_FileDialogType_BrowseMultiFile: t.CInt = 2 -Fl_FileDialogType_BrowseMultiDir: t.CInt = 3 -Fl_FileDialogType_BrowseSaveFile: t.CInt = 4 -Fl_FileDialogOptions_NoOptions: t.CInt = 0 -Fl_FileDialogOptions_SaveAsConfirm: t.CInt = 1 -Fl_FileDialogOptions_NewFolder: t.CInt = 2 -Fl_FileDialogOptions_Preview: t.CInt = 4 -Fl_FileDialogOptions_UseFilterExt: t.CInt = 5 -Fl_BeepType_Default: t.CInt = 0 -Fl_BeepType_Message: t.CInt = 1 -Fl_BeepType_Error: t.CInt = 2 -Fl_BeepType_Question: t.CInt = 3 -Fl_BeepType_Password: t.CInt = 4 -Fl_FileChooserType_Single: t.CInt = 0 -Fl_FileChooserType_Multi: t.CInt = 1 -Fl_FileChooserType_Create: t.CInt = 2 -Fl_FileChooserType_Directory: t.CInt = 3 -Fl_NativeFileChooserType_BrowseFile: t.CInt = 0 -Fl_NativeFileChooserType_BrowseDirectory: t.CInt = 1 -Fl_NativeFileChooserType_MultiFile: t.CInt = 2 -Fl_NativeFileChooserType_MultiDirectory: t.CInt = 3 -Fl_NativeFileChooserType_SaveFile: t.CInt = 4 -Fl_NativeFileChooserType_SaveDirectory: t.CInt = 5 -Fl_NativeFileChooserOption_NoOptions: t.CInt = 0 -Fl_NativeFileChooserOption_SaveAsConfirm: t.CInt = 1 -Fl_NativeFileChooserOption_NewFolder: t.CInt = 2 -Fl_NativeFileChooserOption_Preview: t.CInt = 4 -Fl_NativeFileChooserOption_UseFilterExt: t.CInt = 8 -Fl_LineStyle_Solid: t.CInt = 0 -Fl_LineStyle_Dash: t.CInt = 1 -Fl_LineStyle_Dot: t.CInt = 2 -Fl_LineStyle_DashDot: t.CInt = 3 -Fl_LineStyle_DashDotDot: t.CInt = 4 -Fl_LineStyle_CapFlat: t.CInt = 100 -Fl_LineStyle_CapRound: t.CInt = 200 -Fl_LineStyle_CapSquare: t.CInt = 300 -Fl_LineStyle_JoinMiter: t.CInt = 1000 -Fl_LineStyle_JoinRound: t.CInt = 2000 -Fl_LineStyle_JoinBevel: t.CInt = 2001 -Fl_LabelType_Normal: t.CInt = 0 -Fl_LabelType_None: t.CInt = 1 -Fl_LabelType_Shadow: t.CInt = 2 -Fl_LabelType_Engraved: t.CInt = 3 -Fl_LabelType_Embossed: t.CInt = 4 -Fl_LabelType_Multi: t.CInt = 5 -Fl_LabelType_Icon: t.CInt = 6 -Fl_LabelType_Image: t.CInt = 7 -Fl_BoxType_NoBox: t.CInt = 0 -Fl_BoxType_FlatBox: t.CInt = 1 -Fl_BoxType_UpBox: t.CInt = 2 -Fl_BoxType_DownBox: t.CInt = 3 -Fl_BoxType_UpFrame: t.CInt = 4 -Fl_BoxType_DownFrame: t.CInt = 5 -Fl_BoxType_ThinUpBox: t.CInt = 6 -Fl_BoxType_ThinDownBox: t.CInt = 7 -Fl_BoxType_ThinUpFrame: t.CInt = 8 -Fl_BoxType_ThinDownFrame: t.CInt = 9 -Fl_BoxType_EngraveBox: t.CInt = 10 -Fl_BoxType_EmbossedBox: t.CInt = 11 -Fl_BoxType_EngravedFrame: t.CInt = 12 -Fl_BoxType_EmbossedFrame: t.CInt = 13 -Fl_BoxType_BorderBox: t.CInt = 14 -Fl_BoxType_ShadowBox: t.CInt = 15 -Fl_BoxType_BorderFrame: t.CInt = 16 -Fl_BoxType_ShadowFrame: t.CInt = 17 -Fl_BoxType_RoundedBox: t.CInt = 18 -Fl_BoxType_RShadowBox: t.CInt = 19 -Fl_BoxType_RoundedFrame: t.CInt = 20 -Fl_BoxType_RFlatBox: t.CInt = 21 -Fl_BoxType_RoundUpBox: t.CInt = 22 -Fl_BoxType_RoundDownBox: t.CInt = 23 -Fl_BoxType_DiamondUpBox: t.CInt = 24 -Fl_BoxType_DiamondDownBox: t.CInt = 25 -Fl_BoxType_OvalBox: t.CInt = 26 -Fl_BoxType_OShadowBox: t.CInt = 27 -Fl_BoxType_OvalFrame: t.CInt = 28 -Fl_BoxType_OFlatBox: t.CInt = 29 -Fl_BoxType_PlasticUpBox: t.CInt = 30 -Fl_BoxType_PlasticDownBox: t.CInt = 31 -Fl_BoxType_PlasticUpFrame: t.CInt = 32 -Fl_BoxType_PlasticDownFrame: t.CInt = 33 -Fl_BoxType_PlasticThinUpBox: t.CInt = 34 -Fl_BoxType_PlasticThinDownBox: t.CInt = 35 -Fl_BoxType_PlasticRoundUpBox: t.CInt = 36 -Fl_BoxType_PlasticRoundDownBox: t.CInt = 37 -Fl_BoxType_GtkUpBox: t.CInt = 38 -Fl_BoxType_GtkDownBox: t.CInt = 39 -Fl_BoxType_GtkUpFrame: t.CInt = 40 -Fl_BoxType_GtkDownFrame: t.CInt = 41 -Fl_BoxType_GtkThinUpBox: t.CInt = 42 -Fl_BoxType_GtkThinDownBox: t.CInt = 43 -Fl_BoxType_GtkThinUpFrame: t.CInt = 44 -Fl_BoxType_GtkThinDownFrame: t.CInt = 45 -Fl_BoxType_GtkRoundUpFrame: t.CInt = 46 -Fl_BoxType_GtkRoundDownFrame: t.CInt = 47 -Fl_BoxType_GleamUpBox: t.CInt = 48 -Fl_BoxType_GleamDownBox: t.CInt = 49 -Fl_BoxType_GleamUpFrame: t.CInt = 50 -Fl_BoxType_GleamDownFrame: t.CInt = 51 -Fl_BoxType_GleamThinUpBox: t.CInt = 52 -Fl_BoxType_GleamThinDownBox: t.CInt = 53 -Fl_BoxType_GleamRoundUpBox: t.CInt = 54 -Fl_BoxType_GleamRoundDownBox: t.CInt = 55 -Fl_Align_Center: t.CInt = 0 -Fl_Align_Top: t.CInt = 1 -Fl_Align_Bottom: t.CInt = 2 -Fl_Align_Left: t.CInt = 4 -Fl_Align_Right: t.CInt = 8 -Fl_Align_Inside: t.CInt = 16 -Fl_Align_TextOverImage: t.CInt = 32 -Fl_Align_ImageOverText: t.CInt = 0 -Fl_Align_NoWrap: t.CInt = 0 -Fl_Align_Clip: t.CInt = 64 -Fl_Align_Wrap: t.CInt = 128 -Fl_Align_ImageNextToText: t.CInt = 256 -Fl_Align_TextNextToImage: t.CInt = 288 -Fl_Align_ImageBackdrop: t.CInt = 512 -Fl_Align_TopLeft: t.CInt = 5 -Fl_Align_TopRight: t.CInt = 9 -Fl_Align_BottomLeft: t.CInt = 6 -Fl_Align_BottomRight: t.CInt = 10 -Fl_Align_LeftTop: t.CInt = 7 -Fl_Align_RightTop: t.CInt = 11 -Fl_Align_LeftBottom: t.CInt = 13 -Fl_Align_RightBottom: t.CInt = 14 -Fl_Align_PositionMask: t.CInt = 15 -Fl_Align_ImageMask: t.CInt = 16 -Fl_Font_Helvetica: t.CInt = 0 -Fl_Font_HelveticaBold: t.CInt = 1 -Fl_Font_HelveticaItalic: t.CInt = 2 -Fl_Font_HelveticaBoldItalic: t.CInt = 3 -Fl_Font_Courier: t.CInt = 4 -Fl_Font_CourierBold: t.CInt = 5 -Fl_Font_CourierItalic: t.CInt = 6 -Fl_Font_CourierBoldItalic: t.CInt = 7 -Fl_Font_Times: t.CInt = 8 -Fl_Font_TimesBold: t.CInt = 9 -Fl_Font_TimesItalic: t.CInt = 10 -Fl_Font_TimesBoldItalic: t.CInt = 11 -Fl_Font_Symbol: t.CInt = 12 -Fl_Font_Screen: t.CInt = 13 -Fl_Font_ScreenBold: t.CInt = 14 -Fl_Font_Zapfdingbats: t.CInt = 15 -Fl_Color_ForeGround: t.CInt = 0 -Fl_Color_Foreground: t.CInt = 0 -Fl_Color_BackGround2: t.CInt = 7 -Fl_Color_Background2: t.CInt = 7 -Fl_Color_Inactive: t.CInt = 8 -Fl_Color_Selection: t.CInt = 15 -Fl_Color_Gray0: t.CInt = 32 -Fl_Color_Dark3: t.CInt = 39 -Fl_Color_Dark2: t.CInt = 45 -Fl_Color_Dark1: t.CInt = 47 -Fl_Color_FrameDefault: t.CInt = 49 -Fl_Color_BackGround: t.CInt = 49 -Fl_Color_Background: t.CInt = 49 -Fl_Color_Light1: t.CInt = 50 -Fl_Color_Light2: t.CInt = 52 -Fl_Color_Light3: t.CInt = 54 -Fl_Color_Black: t.CInt = 56 -Fl_Color_Red: t.CInt = 88 -Fl_Color_Green: t.CInt = 63 -Fl_Color_Yellow: t.CInt = 95 -Fl_Color_Blue: t.CInt = 216 -Fl_Color_Magenta: t.CInt = 248 -Fl_Color_Cyan: t.CInt = 223 -Fl_Color_DarkRed: t.CInt = 72 -Fl_Color_DarkGreen: t.CInt = 60 -Fl_Color_DarkYellow: t.CInt = 76 -Fl_Color_DarkBlue: t.CInt = 136 -Fl_Color_DarkMagenta: t.CInt = 152 -Fl_Color_DarkCyan: t.CInt = 140 -Fl_Color_White: t.CInt = 141 -Fl_Event_None: t.CInt = 0 -Fl_Event_Push: t.CInt = 1 -Fl_Event_Released: t.CInt = 2 -Fl_Event_Enter: t.CInt = 3 -Fl_Event_Leave: t.CInt = 4 -Fl_Event_Drag: t.CInt = 5 -Fl_Event_Focus: t.CInt = 6 -Fl_Event_Unfocus: t.CInt = 7 -Fl_Event_KeyDown: t.CInt = 8 -Fl_Event_KeyUp: t.CInt = 9 -Fl_Event_Close: t.CInt = 10 -Fl_Event_Move: t.CInt = 11 -Fl_Event_Shortcut: t.CInt = 12 -Fl_Event_Deactivate: t.CInt = 13 -Fl_Event_Activate: t.CInt = 14 -Fl_Event_Hide: t.CInt = 15 -Fl_Event_Show: t.CInt = 16 -Fl_Event_Paste: t.CInt = 17 -Fl_Event_SelectionClear: t.CInt = 18 -Fl_Event_MouseWheel: t.CInt = 19 -Fl_Event_DndEnter: t.CInt = 20 -Fl_Event_DndDrag: t.CInt = 21 -Fl_Event_DndLeave: t.CInt = 22 -Fl_Event_DndRelease: t.CInt = 23 -Fl_Event_ScreenConfigChanged: t.CInt = 24 -Fl_Event_Fullscreen: t.CInt = 25 -Fl_Event_ZoomGesture: t.CInt = 26 -Fl_Event_ZoomEvent: t.CInt = 27 -Fl_Key_None: t.CInt = 0 -Fl_Key_Button: t.CInt = 65256 -Fl_Key_BackSpace: t.CInt = 65288 -Fl_Key_Tab: t.CInt = 65289 -Fl_Key_IsoKey: t.CInt = 65292 -Fl_Key_Enter: t.CInt = 65293 -Fl_Key_Pause: t.CInt = 65299 -Fl_Key_ScrollLock: t.CInt = 65300 -Fl_Key_Escape: t.CInt = 65307 -Fl_Key_Kana: t.CInt = 65326 -Fl_Key_Eisu: t.CInt = 65327 -Fl_Key_Yen: t.CInt = 65328 -Fl_Key_JISUnderscore: t.CInt = 65329 -Fl_Key_Home: t.CInt = 65360 -Fl_Key_Left: t.CInt = 65361 -Fl_Key_Up: t.CInt = 65362 -Fl_Key_Right: t.CInt = 65363 -Fl_Key_Down: t.CInt = 65364 -Fl_Key_PageUp: t.CInt = 65365 -Fl_Key_PageDown: t.CInt = 65366 -Fl_Key_End: t.CInt = 65367 -Fl_Key_Print: t.CInt = 65377 -Fl_Key_Insert: t.CInt = 65379 -Fl_Key_Menu: t.CInt = 65383 -Fl_Key_Help: t.CInt = 65384 -Fl_Key_NumLock: t.CInt = 65407 -Fl_Key_KP: t.CInt = 65408 -Fl_Key_KPEnter: t.CInt = 65421 -Fl_Key_KPLast: t.CInt = 65469 -Fl_Key_F1: t.CInt = 65470 -Fl_Key_F2: t.CInt = 65471 -Fl_Key_F3: t.CInt = 65472 -Fl_Key_F4: t.CInt = 65473 -Fl_Key_F5: t.CInt = 65474 -Fl_Key_F6: t.CInt = 65475 -Fl_Key_F7: t.CInt = 65476 -Fl_Key_F8: t.CInt = 65477 -Fl_Key_F9: t.CInt = 65478 -Fl_Key_F10: t.CInt = 65479 -Fl_Key_F11: t.CInt = 65480 -Fl_Key_F12: t.CInt = 65481 -Fl_Key_FLast: t.CInt = 65504 -Fl_Key_ShiftL: t.CInt = 65505 -Fl_Key_ShiftR: t.CInt = 65506 -Fl_Key_ControlL: t.CInt = 65507 -Fl_Key_ControlR: t.CInt = 65508 -Fl_Key_CapsLock: t.CInt = 65509 -Fl_Key_MetaL: t.CInt = 65511 -Fl_Key_MetaR: t.CInt = 65512 -Fl_Key_AltL: t.CInt = 65513 -Fl_Key_AltR: t.CInt = 65514 -Fl_Key_Delete: t.CInt = 65515 -Fl_Shortcut_None: t.CInt = 0 -Fl_Shortcut_Shift: t.CInt = 65536 -Fl_Shortcut_CapsLock: t.CInt = 131072 -Fl_Shortcut_Ctrl: t.CInt = 262144 -Fl_Shortcut_Alt: t.CInt = 524288 -Fl_Shortcut_Meta: t.CInt = 4194304 -Fl_Shortcut_Button1: t.CInt = 16777216 -Fl_Shortcut_Button2: t.CInt = 33554432 -Fl_Shortcut_Button3: t.CInt = 67108864 -Fl_Shortcut_Buttons: t.CInt = 67108865 -Fl_CallbackTrigger_Never: t.CInt = 0 -Fl_CallbackTrigger_Changed: t.CInt = 1 -Fl_CallbackTrigger_NotChanged: t.CInt = 2 -Fl_CallbackTrigger_Release: t.CInt = 4 -Fl_CallbackTrigger_ReleaseAlways: t.CInt = 6 -Fl_CallbackTrigger_EnterKey: t.CInt = 8 -Fl_CallbackTrigger_EnterKeyAlways: t.CInt = 10 -Fl_CallbackTrigger_EnterKeyChanged: t.CInt = 11 -Fl_TextCursor_Normal: t.CInt = 0 -Fl_TextCursor_Caret: t.CInt = 1 -Fl_TextCursor_Dim: t.CInt = 2 -Fl_TextCursor_Block: t.CInt = 3 -Fl_TextCursor_Heavy: t.CInt = 4 -Fl_Cursor_Default: t.CInt = 0 -Fl_Cursor_Arrow: t.CInt = 35 -Fl_Cursor_Cross: t.CInt = 66 -Fl_Cursor_Wait: t.CInt = 76 -Fl_Cursor_Insert: t.CInt = 77 -Fl_Cursor_Hand: t.CInt = 31 -Fl_Cursor_Help: t.CInt = 47 -Fl_Cursor_Move: t.CInt = 27 -Fl_Cursor_NS: t.CInt = 78 -Fl_Cursor_WE: t.CInt = 79 -Fl_Cursor_NWSE: t.CInt = 80 -Fl_Cursor_NESW: t.CInt = 81 -Fl_Cursor_N: t.CInt = 70 -Fl_Cursor_NE: t.CInt = 69 -Fl_Cursor_E: t.CInt = 49 -Fl_Cursor_SE: t.CInt = 8 -Fl_Cursor_S: t.CInt = 9 -Fl_Cursor_SW: t.CInt = 7 -Fl_Cursor_W: t.CInt = 36 -Fl_Cursor_NW: t.CInt = 68 -Fl_Cursor_None: t.CInt = 69 -Fl_Mode_Rgb: t.CInt = 0 -Fl_Mode_Index: t.CInt = 1 -Fl_Mode_Double: t.CInt = 2 -Fl_Mode_Accum: t.CInt = 4 -Fl_Mode_Alpha: t.CInt = 8 -Fl_Mode_Depth: t.CInt = 16 -Fl_Mode_Stencil: t.CInt = 32 -Fl_Mode_Rgb8: t.CInt = 64 -Fl_Mode_MultiSample: t.CInt = 128 -Fl_Mode_Stereo: t.CInt = 256 -Fl_Mode_FakeSingle: t.CInt = 512 -Fl_Mode_Opengl3: t.CInt = 513 -Fl_PackType_Vertical: t.CInt = 0 -Fl_PackType_Horizontal: t.CInt = 1 -Fl_ScrollType_None: t.CInt = 0 -Fl_ScrollType_Horizontal: t.CInt = 1 -Fl_ScrollType_Vertical: t.CInt = 2 -Fl_ScrollType_Both: t.CInt = 3 -Fl_ScrollType_AlwaysOn: t.CInt = 4 -Fl_ScrollType_HorizontalAlways: t.CInt = 5 -Fl_ScrollType_VerticalAlways: t.CInt = 6 -Fl_ScrollType_BothAlways: t.CInt = 7 -Fl_InputType_Normal: t.CInt = 0 -Fl_InputType_Float: t.CInt = 1 -Fl_InputType_Int: t.CInt = 2 -Fl_InputType_Multiline: t.CInt = 4 -Fl_InputType_Secret: t.CInt = 5 -Fl_InputType_Input: t.CInt = 7 -Fl_InputType_Readonly: t.CInt = 8 -Fl_InputType_Wrap: t.CInt = 9 -Fl_OutputType_Normal: t.CInt = 8 -Fl_OutputType_Multiline: t.CInt = 9 -Fl_MenuFlag_Normal: t.CInt = 0 -Fl_MenuFlag_Inactive: t.CInt = 1 -Fl_MenuFlag_Toggle: t.CInt = 2 -Fl_MenuFlag_Value: t.CInt = 4 -Fl_MenuFlag_Radio: t.CInt = 8 -Fl_MenuFlag_Invisible: t.CInt = 16 -Fl_MenuFlag_SubmenuPointer: t.CInt = 32 -Fl_MenuFlag_Submenu: t.CInt = 64 -Fl_MenuFlag_MenuDivider: t.CInt = 128 -Fl_MenuFlag_MenuHorizontal: t.CInt = 129 -Fl_ChartType_Bar: t.CInt = 0 -Fl_ChartType_HorizontalBar: t.CInt = 1 -Fl_ChartType_Line: t.CInt = 2 -Fl_ChartType_Fill: t.CInt = 3 -Fl_ChartType_Spike: t.CInt = 4 -Fl_ChartType_Pie: t.CInt = 5 -Fl_ChartType_SpecialPie: t.CInt = 6 -Fl_ClockType_Square: t.CInt = 0 -Fl_ClockType_Round: t.CInt = 1 -Fl_TableContext_None: t.CInt = 0 -Fl_TableContext_StartPage: t.CInt = 1 -Fl_TableContext_EndPage: t.CInt = 2 -Fl_TableContext_RowHeader: t.CInt = 4 -Fl_TableContext_ColHeader: t.CInt = 8 -Fl_TableContext_Cell: t.CInt = 16 -Fl_TableContext_Table: t.CInt = 32 -Fl_TableContext_RcResize: t.CInt = 33 -Fl_TableRowSelectMode_None: t.CInt = 0 -Fl_TableRowSelectMode_Single: t.CInt = 1 -Fl_TreeSort_None: t.CInt = 0 -Fl_TreeSort_Ascending: t.CInt = 1 -Fl_TreeSort_Descending: t.CInt = 2 -Fl_TreeConnectorStyle_None: t.CInt = 0 -Fl_TreeConnectorStyle_Dotted: t.CInt = 1 -Fl_TreeConnectorStyle_Solid: t.CInt = 2 -Fl_TreeSelect_None: t.CInt = 0 -Fl_TreeSelect_Single: t.CInt = 1 -Fl_TreeSelect_Multi: t.CInt = 2 -Fl_TreeSelect_SingleDraggable: t.CInt = 3 -Fl_TreeItemSelect_Deselect: t.CInt = 0 -Fl_TreeItemSelect_Select: t.CInt = 1 -Fl_TreeItemSelect_Toggle: t.CInt = 2 -Fl_TreeReason_None: t.CInt = 0 -Fl_TreeReason_Selected: t.CInt = 1 -Fl_TreeReason_Deselected: t.CInt = 2 -Fl_TreeReason_Reselected: t.CInt = 3 -Fl_TreeReason_Opened: t.CInt = 4 -Fl_TreeReason_Closed: t.CInt = 5 -Fl_TreeItemReselectMode_Once: t.CInt = 0 -Fl_TreeItemDrawMode_Default: t.CInt = 0 -Fl_TreeItemDrawMode_LabelAndWidget: t.CInt = 1 -Fl_TreeItemDrawMode_HeightFromWidget: t.CInt = 2 -Fl_SliderType_Vertical: t.CInt = 0 -Fl_SliderType_Horizontal: t.CInt = 1 -Fl_SliderType_VerticalFill: t.CInt = 2 -Fl_SliderType_HorizontalFill: t.CInt = 3 -Fl_SliderType_VerticalNice: t.CInt = 4 -Fl_SliderType_HorizontalNice: t.CInt = 5 -Fl_DialType_Normal: t.CInt = 0 -Fl_DialType_Line: t.CInt = 1 -Fl_DialType_Fill: t.CInt = 2 -Fl_CounterType_Normal: t.CInt = 0 -Fl_CounterType_Simple: t.CInt = 1 -Fl_ScrollbarType_Vertical: t.CInt = 0 -Fl_ScrollbarType_Horizontal: t.CInt = 1 -Fl_ScrollbarType_VerticalFill: t.CInt = 2 -Fl_ScrollbarType_HorizontalFill: t.CInt = 3 -Fl_ScrollbarType_VerticalNice: t.CInt = 4 -Fl_ScrollbarType_HorizontalNice: t.CInt = 5 -Fl_WindowType_Normal: t.CInt = 240 -Fl_WindowType_Double: t.CInt = 241 -Fl_Wrap_None: t.CInt = 0 -Fl_Wrap_At_Column: t.CInt = 1 -Fl_Wrap_At_Pixel: t.CInt = 2 -Fl_Drag_None: t.CInt = -2 -Fl_Drag_Start_Dnd: t.CInt = -1 -Fl_Drag_Char: t.CInt = 0 -Fl_Drag_Word: t.CInt = 1 -Fl_Drag_Line: t.CInt = 2 -Fl_Damage_Child: t.CInt = 0 -Popup1: t.CInt = 1 -Popup2: t.CInt = 2 -Popup12: t.CInt = 3 -Popup3: t.CInt = 4 -Popup13: t.CInt = 5 -Popup23: t.CInt = 6 -Fl_FlexType_Column: t.CInt = 0 -Fl_RgbScaling_Nearest: t.CInt = 0 -Fl_Table_RESIZE_NONE: t.CInt = 0 -Fl_Table_RESIZE_COL_LEFT: t.CInt = 1 -Fl_Table_RESIZE_COL_RIGHT: t.CInt = 2 -Fl_Table_RESIZE_ROW_ABOVE: t.CInt = 3 -Fl_Table_RESIZE_ROW_BELOW: t.CInt = 4 +Fl_BrowserType_Normal: int = 0 +Fl_BrowserType_Select: int = 1 +Fl_BrowserType_Hold: int = 2 +Fl_BrowserType_Multi: int = 3 +Fl_BrowserScrollbar_None: int = 0 +Fl_BrowserScrollbar_Horizontal: int = 1 +Fl_BrowserScrollbar_Vertical: int = 2 +Fl_BrowserScrollbar_Both: int = 3 +Fl_BrowserScrollbar_AlwaysOn: int = 4 +Fl_BrowserScrollbar_HorizontalAlways: int = 5 +Fl_BrowserScrollbar_VerticalAlways: int = 6 +Fl_BrowserScrollbar_BothAlways: int = 7 +Fl_FileType_Files: int = 0 +Fl_ButtonType_Normal: int = 0 +Fl_ButtonType_Toggle: int = 1 +Fl_ButtonType_Radio: int = 102 +Fl_ButtonType_Hidden: int = 103 +Fl_FileDialogType_BrowseFile: int = 0 +Fl_FileDialogType_BrowseDir: int = 1 +Fl_FileDialogType_BrowseMultiFile: int = 2 +Fl_FileDialogType_BrowseMultiDir: int = 3 +Fl_FileDialogType_BrowseSaveFile: int = 4 +Fl_FileDialogOptions_NoOptions: int = 0 +Fl_FileDialogOptions_SaveAsConfirm: int = 1 +Fl_FileDialogOptions_NewFolder: int = 2 +Fl_FileDialogOptions_Preview: int = 4 +Fl_FileDialogOptions_UseFilterExt: int = 5 +Fl_BeepType_Default: int = 0 +Fl_BeepType_Message: int = 1 +Fl_BeepType_Error: int = 2 +Fl_BeepType_Question: int = 3 +Fl_BeepType_Password: int = 4 +Fl_FileChooserType_Single: int = 0 +Fl_FileChooserType_Multi: int = 1 +Fl_FileChooserType_Create: int = 2 +Fl_FileChooserType_Directory: int = 3 +Fl_NativeFileChooserType_BrowseFile: int = 0 +Fl_NativeFileChooserType_BrowseDirectory: int = 1 +Fl_NativeFileChooserType_MultiFile: int = 2 +Fl_NativeFileChooserType_MultiDirectory: int = 3 +Fl_NativeFileChooserType_SaveFile: int = 4 +Fl_NativeFileChooserType_SaveDirectory: int = 5 +Fl_NativeFileChooserOption_NoOptions: int = 0 +Fl_NativeFileChooserOption_SaveAsConfirm: int = 1 +Fl_NativeFileChooserOption_NewFolder: int = 2 +Fl_NativeFileChooserOption_Preview: int = 4 +Fl_NativeFileChooserOption_UseFilterExt: int = 8 +Fl_LineStyle_Solid: int = 0 +Fl_LineStyle_Dash: int = 1 +Fl_LineStyle_Dot: int = 2 +Fl_LineStyle_DashDot: int = 3 +Fl_LineStyle_DashDotDot: int = 4 +Fl_LineStyle_CapFlat: int = 100 +Fl_LineStyle_CapRound: int = 200 +Fl_LineStyle_CapSquare: int = 300 +Fl_LineStyle_JoinMiter: int = 1000 +Fl_LineStyle_JoinRound: int = 2000 +Fl_LineStyle_JoinBevel: int = 2001 +Fl_LabelType_Normal: int = 0 +Fl_LabelType_None: int = 1 +Fl_LabelType_Shadow: int = 2 +Fl_LabelType_Engraved: int = 3 +Fl_LabelType_Embossed: int = 4 +Fl_LabelType_Multi: int = 5 +Fl_LabelType_Icon: int = 6 +Fl_LabelType_Image: int = 7 +Fl_BoxType_NoBox: int = 0 +Fl_BoxType_FlatBox: int = 1 +Fl_BoxType_UpBox: int = 2 +Fl_BoxType_DownBox: int = 3 +Fl_BoxType_UpFrame: int = 4 +Fl_BoxType_DownFrame: int = 5 +Fl_BoxType_ThinUpBox: int = 6 +Fl_BoxType_ThinDownBox: int = 7 +Fl_BoxType_ThinUpFrame: int = 8 +Fl_BoxType_ThinDownFrame: int = 9 +Fl_BoxType_EngraveBox: int = 10 +Fl_BoxType_EmbossedBox: int = 11 +Fl_BoxType_EngravedFrame: int = 12 +Fl_BoxType_EmbossedFrame: int = 13 +Fl_BoxType_BorderBox: int = 14 +Fl_BoxType_ShadowBox: int = 15 +Fl_BoxType_BorderFrame: int = 16 +Fl_BoxType_ShadowFrame: int = 17 +Fl_BoxType_RoundedBox: int = 18 +Fl_BoxType_RShadowBox: int = 19 +Fl_BoxType_RoundedFrame: int = 20 +Fl_BoxType_RFlatBox: int = 21 +Fl_BoxType_RoundUpBox: int = 22 +Fl_BoxType_RoundDownBox: int = 23 +Fl_BoxType_DiamondUpBox: int = 24 +Fl_BoxType_DiamondDownBox: int = 25 +Fl_BoxType_OvalBox: int = 26 +Fl_BoxType_OShadowBox: int = 27 +Fl_BoxType_OvalFrame: int = 28 +Fl_BoxType_OFlatBox: int = 29 +Fl_BoxType_PlasticUpBox: int = 30 +Fl_BoxType_PlasticDownBox: int = 31 +Fl_BoxType_PlasticUpFrame: int = 32 +Fl_BoxType_PlasticDownFrame: int = 33 +Fl_BoxType_PlasticThinUpBox: int = 34 +Fl_BoxType_PlasticThinDownBox: int = 35 +Fl_BoxType_PlasticRoundUpBox: int = 36 +Fl_BoxType_PlasticRoundDownBox: int = 37 +Fl_BoxType_GtkUpBox: int = 38 +Fl_BoxType_GtkDownBox: int = 39 +Fl_BoxType_GtkUpFrame: int = 40 +Fl_BoxType_GtkDownFrame: int = 41 +Fl_BoxType_GtkThinUpBox: int = 42 +Fl_BoxType_GtkThinDownBox: int = 43 +Fl_BoxType_GtkThinUpFrame: int = 44 +Fl_BoxType_GtkThinDownFrame: int = 45 +Fl_BoxType_GtkRoundUpFrame: int = 46 +Fl_BoxType_GtkRoundDownFrame: int = 47 +Fl_BoxType_GleamUpBox: int = 48 +Fl_BoxType_GleamDownBox: int = 49 +Fl_BoxType_GleamUpFrame: int = 50 +Fl_BoxType_GleamDownFrame: int = 51 +Fl_BoxType_GleamThinUpBox: int = 52 +Fl_BoxType_GleamThinDownBox: int = 53 +Fl_BoxType_GleamRoundUpBox: int = 54 +Fl_BoxType_GleamRoundDownBox: int = 55 +Fl_Align_Center: int = 0 +Fl_Align_Top: int = 1 +Fl_Align_Bottom: int = 2 +Fl_Align_Left: int = 4 +Fl_Align_Right: int = 8 +Fl_Align_Inside: int = 16 +Fl_Align_TextOverImage: int = 32 +Fl_Align_ImageOverText: int = 0 +Fl_Align_NoWrap: int = 0 +Fl_Align_Clip: int = 64 +Fl_Align_Wrap: int = 128 +Fl_Align_ImageNextToText: int = 256 +Fl_Align_TextNextToImage: int = 288 +Fl_Align_ImageBackdrop: int = 512 +Fl_Align_TopLeft: int = 5 +Fl_Align_TopRight: int = 9 +Fl_Align_BottomLeft: int = 6 +Fl_Align_BottomRight: int = 10 +Fl_Align_LeftTop: int = 7 +Fl_Align_RightTop: int = 11 +Fl_Align_LeftBottom: int = 13 +Fl_Align_RightBottom: int = 14 +Fl_Align_PositionMask: int = 15 +Fl_Align_ImageMask: int = 16 +Fl_Font_Helvetica: int = 0 +Fl_Font_HelveticaBold: int = 1 +Fl_Font_HelveticaItalic: int = 2 +Fl_Font_HelveticaBoldItalic: int = 3 +Fl_Font_Courier: int = 4 +Fl_Font_CourierBold: int = 5 +Fl_Font_CourierItalic: int = 6 +Fl_Font_CourierBoldItalic: int = 7 +Fl_Font_Times: int = 8 +Fl_Font_TimesBold: int = 9 +Fl_Font_TimesItalic: int = 10 +Fl_Font_TimesBoldItalic: int = 11 +Fl_Font_Symbol: int = 12 +Fl_Font_Screen: int = 13 +Fl_Font_ScreenBold: int = 14 +Fl_Font_Zapfdingbats: int = 15 +Fl_Color_ForeGround: int = 0 +Fl_Color_Foreground: int = 0 +Fl_Color_BackGround2: int = 7 +Fl_Color_Background2: int = 7 +Fl_Color_Inactive: int = 8 +Fl_Color_Selection: int = 15 +Fl_Color_Gray0: int = 32 +Fl_Color_Dark3: int = 39 +Fl_Color_Dark2: int = 45 +Fl_Color_Dark1: int = 47 +Fl_Color_FrameDefault: int = 49 +Fl_Color_BackGround: int = 49 +Fl_Color_Background: int = 49 +Fl_Color_Light1: int = 50 +Fl_Color_Light2: int = 52 +Fl_Color_Light3: int = 54 +Fl_Color_Black: int = 56 +Fl_Color_Red: int = 88 +Fl_Color_Green: int = 63 +Fl_Color_Yellow: int = 95 +Fl_Color_Blue: int = 216 +Fl_Color_Magenta: int = 248 +Fl_Color_Cyan: int = 223 +Fl_Color_DarkRed: int = 72 +Fl_Color_DarkGreen: int = 60 +Fl_Color_DarkYellow: int = 76 +Fl_Color_DarkBlue: int = 136 +Fl_Color_DarkMagenta: int = 152 +Fl_Color_DarkCyan: int = 140 +Fl_Color_White: int = 141 +Fl_Event_None: int = 0 +Fl_Event_Push: int = 1 +Fl_Event_Released: int = 2 +Fl_Event_Enter: int = 3 +Fl_Event_Leave: int = 4 +Fl_Event_Drag: int = 5 +Fl_Event_Focus: int = 6 +Fl_Event_Unfocus: int = 7 +Fl_Event_KeyDown: int = 8 +Fl_Event_KeyUp: int = 9 +Fl_Event_Close: int = 10 +Fl_Event_Move: int = 11 +Fl_Event_Shortcut: int = 12 +Fl_Event_Deactivate: int = 13 +Fl_Event_Activate: int = 14 +Fl_Event_Hide: int = 15 +Fl_Event_Show: int = 16 +Fl_Event_Paste: int = 17 +Fl_Event_SelectionClear: int = 18 +Fl_Event_MouseWheel: int = 19 +Fl_Event_DndEnter: int = 20 +Fl_Event_DndDrag: int = 21 +Fl_Event_DndLeave: int = 22 +Fl_Event_DndRelease: int = 23 +Fl_Event_ScreenConfigChanged: int = 24 +Fl_Event_Fullscreen: int = 25 +Fl_Event_ZoomGesture: int = 26 +Fl_Event_ZoomEvent: int = 27 +Fl_Key_None: int = 0 +Fl_Key_Button: int = 65256 +Fl_Key_BackSpace: int = 65288 +Fl_Key_Tab: int = 65289 +Fl_Key_IsoKey: int = 65292 +Fl_Key_Enter: int = 65293 +Fl_Key_Pause: int = 65299 +Fl_Key_ScrollLock: int = 65300 +Fl_Key_Escape: int = 65307 +Fl_Key_Kana: int = 65326 +Fl_Key_Eisu: int = 65327 +Fl_Key_Yen: int = 65328 +Fl_Key_JISUnderscore: int = 65329 +Fl_Key_Home: int = 65360 +Fl_Key_Left: int = 65361 +Fl_Key_Up: int = 65362 +Fl_Key_Right: int = 65363 +Fl_Key_Down: int = 65364 +Fl_Key_PageUp: int = 65365 +Fl_Key_PageDown: int = 65366 +Fl_Key_End: int = 65367 +Fl_Key_Print: int = 65377 +Fl_Key_Insert: int = 65379 +Fl_Key_Menu: int = 65383 +Fl_Key_Help: int = 65384 +Fl_Key_NumLock: int = 65407 +Fl_Key_KP: int = 65408 +Fl_Key_KPEnter: int = 65421 +Fl_Key_KPLast: int = 65469 +Fl_Key_F1: int = 65470 +Fl_Key_F2: int = 65471 +Fl_Key_F3: int = 65472 +Fl_Key_F4: int = 65473 +Fl_Key_F5: int = 65474 +Fl_Key_F6: int = 65475 +Fl_Key_F7: int = 65476 +Fl_Key_F8: int = 65477 +Fl_Key_F9: int = 65478 +Fl_Key_F10: int = 65479 +Fl_Key_F11: int = 65480 +Fl_Key_F12: int = 65481 +Fl_Key_FLast: int = 65504 +Fl_Key_ShiftL: int = 65505 +Fl_Key_ShiftR: int = 65506 +Fl_Key_ControlL: int = 65507 +Fl_Key_ControlR: int = 65508 +Fl_Key_CapsLock: int = 65509 +Fl_Key_MetaL: int = 65511 +Fl_Key_MetaR: int = 65512 +Fl_Key_AltL: int = 65513 +Fl_Key_AltR: int = 65514 +Fl_Key_Delete: int = 65515 +Fl_Shortcut_None: int = 0 +Fl_Shortcut_Shift: int = 65536 +Fl_Shortcut_CapsLock: int = 131072 +Fl_Shortcut_Ctrl: int = 262144 +Fl_Shortcut_Alt: int = 524288 +Fl_Shortcut_Meta: int = 4194304 +Fl_Shortcut_Button1: int = 16777216 +Fl_Shortcut_Button2: int = 33554432 +Fl_Shortcut_Button3: int = 67108864 +Fl_Shortcut_Buttons: int = 67108865 +Fl_CallbackTrigger_Never: int = 0 +Fl_CallbackTrigger_Changed: int = 1 +Fl_CallbackTrigger_NotChanged: int = 2 +Fl_CallbackTrigger_Release: int = 4 +Fl_CallbackTrigger_ReleaseAlways: int = 6 +Fl_CallbackTrigger_EnterKey: int = 8 +Fl_CallbackTrigger_EnterKeyAlways: int = 10 +Fl_CallbackTrigger_EnterKeyChanged: int = 11 +Fl_TextCursor_Normal: int = 0 +Fl_TextCursor_Caret: int = 1 +Fl_TextCursor_Dim: int = 2 +Fl_TextCursor_Block: int = 3 +Fl_TextCursor_Heavy: int = 4 +Fl_Cursor_Default: int = 0 +Fl_Cursor_Arrow: int = 35 +Fl_Cursor_Cross: int = 66 +Fl_Cursor_Wait: int = 76 +Fl_Cursor_Insert: int = 77 +Fl_Cursor_Hand: int = 31 +Fl_Cursor_Help: int = 47 +Fl_Cursor_Move: int = 27 +Fl_Cursor_NS: int = 78 +Fl_Cursor_WE: int = 79 +Fl_Cursor_NWSE: int = 80 +Fl_Cursor_NESW: int = 81 +Fl_Cursor_N: int = 70 +Fl_Cursor_NE: int = 69 +Fl_Cursor_E: int = 49 +Fl_Cursor_SE: int = 8 +Fl_Cursor_S: int = 9 +Fl_Cursor_SW: int = 7 +Fl_Cursor_W: int = 36 +Fl_Cursor_NW: int = 68 +Fl_Cursor_None: int = 69 +Fl_Mode_Rgb: int = 0 +Fl_Mode_Index: int = 1 +Fl_Mode_Double: int = 2 +Fl_Mode_Accum: int = 4 +Fl_Mode_Alpha: int = 8 +Fl_Mode_Depth: int = 16 +Fl_Mode_Stencil: int = 32 +Fl_Mode_Rgb8: int = 64 +Fl_Mode_MultiSample: int = 128 +Fl_Mode_Stereo: int = 256 +Fl_Mode_FakeSingle: int = 512 +Fl_Mode_Opengl3: int = 513 +Fl_PackType_Vertical: int = 0 +Fl_PackType_Horizontal: int = 1 +Fl_ScrollType_None: int = 0 +Fl_ScrollType_Horizontal: int = 1 +Fl_ScrollType_Vertical: int = 2 +Fl_ScrollType_Both: int = 3 +Fl_ScrollType_AlwaysOn: int = 4 +Fl_ScrollType_HorizontalAlways: int = 5 +Fl_ScrollType_VerticalAlways: int = 6 +Fl_ScrollType_BothAlways: int = 7 +Fl_InputType_Normal: int = 0 +Fl_InputType_Float: int = 1 +Fl_InputType_Int: int = 2 +Fl_InputType_Multiline: int = 4 +Fl_InputType_Secret: int = 5 +Fl_InputType_Input: int = 7 +Fl_InputType_Readonly: int = 8 +Fl_InputType_Wrap: int = 9 +Fl_OutputType_Normal: int = 8 +Fl_OutputType_Multiline: int = 9 +Fl_MenuFlag_Normal: int = 0 +Fl_MenuFlag_Inactive: int = 1 +Fl_MenuFlag_Toggle: int = 2 +Fl_MenuFlag_Value: int = 4 +Fl_MenuFlag_Radio: int = 8 +Fl_MenuFlag_Invisible: int = 16 +Fl_MenuFlag_SubmenuPointer: int = 32 +Fl_MenuFlag_Submenu: int = 64 +Fl_MenuFlag_MenuDivider: int = 128 +Fl_MenuFlag_MenuHorizontal: int = 129 +Fl_ChartType_Bar: int = 0 +Fl_ChartType_HorizontalBar: int = 1 +Fl_ChartType_Line: int = 2 +Fl_ChartType_Fill: int = 3 +Fl_ChartType_Spike: int = 4 +Fl_ChartType_Pie: int = 5 +Fl_ChartType_SpecialPie: int = 6 +Fl_ClockType_Square: int = 0 +Fl_ClockType_Round: int = 1 +Fl_TableContext_None: int = 0 +Fl_TableContext_StartPage: int = 1 +Fl_TableContext_EndPage: int = 2 +Fl_TableContext_RowHeader: int = 4 +Fl_TableContext_ColHeader: int = 8 +Fl_TableContext_Cell: int = 16 +Fl_TableContext_Table: int = 32 +Fl_TableContext_RcResize: int = 33 +Fl_TableRowSelectMode_None: int = 0 +Fl_TableRowSelectMode_Single: int = 1 +Fl_TreeSort_None: int = 0 +Fl_TreeSort_Ascending: int = 1 +Fl_TreeSort_Descending: int = 2 +Fl_TreeConnectorStyle_None: int = 0 +Fl_TreeConnectorStyle_Dotted: int = 1 +Fl_TreeConnectorStyle_Solid: int = 2 +Fl_TreeSelect_None: int = 0 +Fl_TreeSelect_Single: int = 1 +Fl_TreeSelect_Multi: int = 2 +Fl_TreeSelect_SingleDraggable: int = 3 +Fl_TreeItemSelect_Deselect: int = 0 +Fl_TreeItemSelect_Select: int = 1 +Fl_TreeItemSelect_Toggle: int = 2 +Fl_TreeReason_None: int = 0 +Fl_TreeReason_Selected: int = 1 +Fl_TreeReason_Deselected: int = 2 +Fl_TreeReason_Reselected: int = 3 +Fl_TreeReason_Opened: int = 4 +Fl_TreeReason_Closed: int = 5 +Fl_TreeItemReselectMode_Once: int = 0 +Fl_TreeItemDrawMode_Default: int = 0 +Fl_TreeItemDrawMode_LabelAndWidget: int = 1 +Fl_TreeItemDrawMode_HeightFromWidget: int = 2 +Fl_SliderType_Vertical: int = 0 +Fl_SliderType_Horizontal: int = 1 +Fl_SliderType_VerticalFill: int = 2 +Fl_SliderType_HorizontalFill: int = 3 +Fl_SliderType_VerticalNice: int = 4 +Fl_SliderType_HorizontalNice: int = 5 +Fl_DialType_Normal: int = 0 +Fl_DialType_Line: int = 1 +Fl_DialType_Fill: int = 2 +Fl_CounterType_Normal: int = 0 +Fl_CounterType_Simple: int = 1 +Fl_ScrollbarType_Vertical: int = 0 +Fl_ScrollbarType_Horizontal: int = 1 +Fl_ScrollbarType_VerticalFill: int = 2 +Fl_ScrollbarType_HorizontalFill: int = 3 +Fl_ScrollbarType_VerticalNice: int = 4 +Fl_ScrollbarType_HorizontalNice: int = 5 +Fl_WindowType_Normal: int = 240 +Fl_WindowType_Double: int = 241 +Fl_Wrap_None: int = 0 +Fl_Wrap_At_Column: int = 1 +Fl_Wrap_At_Pixel: int = 2 +Fl_Drag_None: int = -2 +Fl_Drag_Start_Dnd: int = -1 +Fl_Drag_Char: int = 0 +Fl_Drag_Word: int = 1 +Fl_Drag_Line: int = 2 +Fl_Damage_Child: int = 0 +Popup1: int = 1 +Popup2: int = 2 +Popup12: int = 3 +Popup3: int = 4 +Popup13: int = 5 +Popup23: int = 6 +Fl_FlexType_Column: int = 0 +Fl_RgbScaling_Nearest: int = 0 +Fl_Table_RESIZE_NONE: int = 0 +Fl_Table_RESIZE_COL_LEFT: int = 1 +Fl_Table_RESIZE_COL_RIGHT: int = 2 +Fl_Table_RESIZE_ROW_ABOVE: int = 3 +Fl_Table_RESIZE_ROW_BELOW: int = 4 diff --git a/gzip.vp b/gzip.vp index 554c34a..492b5c1 100644 --- a/gzip.vp +++ b/gzip.vp @@ -191,8 +191,8 @@ def _align(): _g_bitcnt = 0 -def _decode(count: int | t.CPtr, first: int | t.CPtr, - off: int | t.CPtr, sorted: int | t.CPtr) -> int: +def _decode(count: int*, first: int*, + off: int*, sorted: int*) -> int: code: int = 0 ln: int = 1 while ln <= 15: @@ -208,8 +208,8 @@ def _decode(count: int | t.CPtr, first: int | t.CPtr, return -1 -def _build(first: int | t.CPtr, off: int | t.CPtr, - count: int | t.CPtr) -> int: +def _build(first: int*, off: int*, + count: int*) -> int: anylen: int = 0 l1: int = 1 while l1 <= 15: @@ -241,9 +241,9 @@ def _build(first: int | t.CPtr, off: int | t.CPtr, return 0 -def _collect(len_arr: int | t.CPtr, cnt: int | t.CPtr, - sorted_arr: int | t.CPtr, nsym: int, - pos: int | t.CPtr): +def _collect(len_arr: int*, cnt: int*, + sorted_arr: int*, nsym: int, + pos: int*): string.memset(cnt, 0, 17 * 4) s1: int = 0 while s1 < nsym: @@ -312,7 +312,7 @@ def _dist_base(code: int) -> int: return f + (1 << e) -def _cl_order_set(arr: int | t.CPtr, idx: int, val: int): +def _cl_order_set(arr: int*, idx: int, val: int): arr[idx] = val @@ -350,23 +350,23 @@ def _gzip_decode(src: t.CPtr, src_len: sizet, dout: uchar* = dst wpos: sizet = 0 - lit_len: int | t.CPtr = stdlib.malloc(288 * 4) - lit_cnt: int | t.CPtr = stdlib.malloc(17 * 4) - lit_first: int | t.CPtr = stdlib.malloc(17 * 4) - lit_off: int | t.CPtr = stdlib.malloc(17 * 4) - lit_sorted: int | t.CPtr = stdlib.malloc(288 * 4) - dst_len: int | t.CPtr = stdlib.malloc(32 * 4) - dst_cnt: int | t.CPtr = stdlib.malloc(17 * 4) - dst_first: int | t.CPtr = stdlib.malloc(17 * 4) - dst_off: int | t.CPtr = stdlib.malloc(17 * 4) - dst_sorted: int | t.CPtr = stdlib.malloc(32 * 4) - cl_len: int | t.CPtr = stdlib.malloc(19 * 4) - cl_order: int | t.CPtr = stdlib.malloc(19 * 4) - cl_cnt: int | t.CPtr = stdlib.malloc(17 * 4) - cl_first: int | t.CPtr = stdlib.malloc(17 * 4) - cl_off: int | t.CPtr = stdlib.malloc(17 * 4) - cl_sorted: int | t.CPtr = stdlib.malloc(19 * 4) - pos_tmp: int | t.CPtr = stdlib.malloc(17 * 4) + lit_len: int* = stdlib.malloc(288 * 4) + lit_cnt: int* = stdlib.malloc(17 * 4) + lit_first: int* = stdlib.malloc(17 * 4) + lit_off: int* = stdlib.malloc(17 * 4) + lit_sorted: int* = stdlib.malloc(288 * 4) + dst_len: int* = stdlib.malloc(32 * 4) + dst_cnt: int* = stdlib.malloc(17 * 4) + dst_first: int* = stdlib.malloc(17 * 4) + dst_off: int* = stdlib.malloc(17 * 4) + dst_sorted: int* = stdlib.malloc(32 * 4) + cl_len: int* = stdlib.malloc(19 * 4) + cl_order: int* = stdlib.malloc(19 * 4) + cl_cnt: int* = stdlib.malloc(17 * 4) + cl_first: int* = stdlib.malloc(17 * 4) + cl_off: int* = stdlib.malloc(17 * 4) + cl_sorted: int* = stdlib.malloc(19 * 4) + pos_tmp: int* = stdlib.malloc(17 * 4) if lit_len is None or lit_cnt is None or lit_first is None \ or lit_off is None or lit_sorted is None or dst_len is None \ or dst_cnt is None or dst_first is None or dst_off is None \ @@ -443,7 +443,7 @@ def _gzip_decode(src: t.CPtr, src_len: sizet, if wpos >= dst_cap: err = -9 break - dout[wpos] = t.CUnsignedChar(ch) + dout[wpos] = uchar(ch) wpos += 1 i += 1 if err != 0: @@ -562,7 +562,7 @@ def _gzip_decode(src: t.CPtr, src_len: sizet, if wpos >= dst_cap: err = -18 break - dout[wpos] = t.CUnsignedChar(sym) + dout[wpos] = uchar(sym) wpos += 1 elif sym == 256: run = 0 diff --git a/hashtable.vp b/hashtable.vp index ab5a3f5..25da5ad 100644 --- a/hashtable.vp +++ b/hashtable.vp @@ -8,24 +8,24 @@ import stdio from stdint import * # Empty slot marker (hash == 0) -_HT_EMPTY: t.CDefine = 0 +define _HT_EMPTY = 0 # Tombstone slot marker (hash == 1) -_HT_TOMBSTONE: t.CDefine = 1 +define _HT_TOMBSTONE = 1 # Default initial capacity (must be power of two) -_HT_INIT_CAP: t.CDefine = 16 +define _HT_INIT_CAP = 16 # Slot memory layout: hash(8) + key pointer(8) + value pointer(8) = 24 bytes -_HT_SLOT_SIZE: t.CDefine = 24 +define _HT_SLOT_SIZE = 24 # FNV-1a 64-bit constants -_FNV_OFFSET: t.CUInt64T = 0xcbf29ce484222325 -_FNV_PRIME: t.CUInt64T = 0x100000001b3 +_FNV_OFFSET: uint64 = 0xcbf29ce484222325 +_FNV_PRIME: uint64 = 0x100000001b3 -def _fnv1a_hash(key: str) -> t.CUInt64T: +def _fnv1a_hash(key: str) -> uint64: """FNV-1a 64-bit hash function.""" - h: t.CUInt64T = _FNV_OFFSET + h: uint64 = _FNV_OFFSET k: str = key while k[0] != 0: - h = h ^ t.CUInt64T(k[0]) + h = h ^ uint64(k[0]) h = h * _FNV_PRIME k += 1 # Ensure h >= 2 (avoids empty slot marker 0 and tombstone marker 1) @@ -67,14 +67,14 @@ class HashTable: # Initialize all slots to empty (hash = 0) string.memset(self.__slots__, 0, self.__capacity__ * _HT_SLOT_SIZE) - def _slot_hash(self, idx: sizet) -> t.CUInt64T: + def _slot_hash(self, idx: sizet) -> uint64: """Read hash value from target slot.""" - ptr: t.CUInt64T | t.CPtr = t.CPtr(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE) + ptr: uint64* = t.CPtr(uint64(self.__slots__) + idx * _HT_SLOT_SIZE) return ptr[0] def _slot_key(self, idx: sizet) -> str: """Read key pointer from target slot.""" - ptr: str | t.CPtr = (str | t.CPtr)(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE + 8) + ptr: str* = (str*)(uint64(self.__slots__) + idx * _HT_SLOT_SIZE + 8) return ptr[0] def _slot_value(self, idx: sizet) -> t.CPtr: @@ -83,20 +83,20 @@ class HashTable: # 故 t.CUInt64T|t.CPtr|t.CPtr = Ptr(Ptr(i64)) = i64**，取下标得 i64*（指针）， # 与返回类型 t.CPtr（i8*）同级指针可隐式 bitcast。若只写 t.CUInt64T|t.CPtr # （= i64*，存哈希整数用），取下标得标量 i64 → 撞「整数隐式转指针禁止」。 - ptr: t.CUInt64T | t.CPtr | t.CPtr = (t.CUInt64T | t.CPtr | t.CPtr)(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE + 16) + ptr: uint64** = (uint64**)(uint64(self.__slots__) + idx * _HT_SLOT_SIZE + 16) return ptr[0] - def _set_slot(self, idx: sizet, h: t.CUInt64T, key: str, val: t.CPtr): + def _set_slot(self, idx: sizet, h: uint64, key: str, val: t.CPtr): """Assign three fields of the target slot.""" - h_ptr: t.CUInt64T | t.CPtr = t.CPtr(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE) + h_ptr: uint64* = t.CPtr(uint64(self.__slots__) + idx * _HT_SLOT_SIZE) h_ptr[0] = h - k_ptr: str | t.CPtr = (str | t.CPtr)(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE + 8) + k_ptr: str* = (str*)(uint64(self.__slots__) + idx * _HT_SLOT_SIZE + 8) k_ptr[0] = key # 同 _slot_value：value 槽按「指针的指针」(i64**) 注解，元素才是指针 - v_ptr: t.CUInt64T | t.CPtr | t.CPtr = (t.CUInt64T | t.CPtr | t.CPtr)(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE + 16) + v_ptr: uint64** = (uint64**)(uint64(self.__slots__) + idx * _HT_SLOT_SIZE + 16) v_ptr[0] = val - def _find_slot(self, key: str, h: t.CUInt64T) -> sizet: + def _find_slot(self, key: str, h: uint64) -> sizet: """Locate slot index for key insertion or lookup. Returns: Index of matching key if found; otherwise returns index of first usable empty/tombstone slot. @@ -106,7 +106,7 @@ class HashTable: first_tombstone: sizet = self.__capacity__ i: sizet = 0 while i < self.__capacity__: - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY: if first_tombstone < self.__capacity__: return first_tombstone @@ -139,12 +139,12 @@ class HashTable: self.__tombstones__ = 0 i: sizet = 0 while i < old_cap: - old_h_ptr: t.CUInt64T | t.CPtr = t.CPtr(t.CUInt64T(old_slots) + i * _HT_SLOT_SIZE) - h: t.CUInt64T = old_h_ptr[0] + old_h_ptr: uint64* = t.CPtr(uint64(old_slots) + i * _HT_SLOT_SIZE) + h: uint64 = old_h_ptr[0] if h != _HT_EMPTY and h != _HT_TOMBSTONE: - old_k_ptr: str | t.CPtr = (str | t.CPtr)(t.CUInt64T(old_slots) + i * _HT_SLOT_SIZE + 8) + old_k_ptr: str* = (str*)(uint64(old_slots) + i * _HT_SLOT_SIZE + 8) # 同 _slot_value：value 槽按「指针的指针」(i64**) 注解，元素才是指针 - old_v_ptr: t.CUInt64T | t.CPtr | t.CPtr = (t.CUInt64T | t.CPtr | t.CPtr)(t.CUInt64T(old_slots) + i * _HT_SLOT_SIZE + 16) + old_v_ptr: uint64** = (uint64**)(uint64(old_slots) + i * _HT_SLOT_SIZE + 16) k: str = old_k_ptr[0] v: t.CPtr = old_v_ptr[0] idx: sizet = self._find_slot(k, h) @@ -154,11 +154,11 @@ class HashTable: def __setitem__(self, key: str, val: t.CNeedPtr): """Insert or update key-value pair. val automatically decays to pointer (t.CNeedPtr: no conversion if already pointer).""" - h: t.CUInt64T = _fnv1a_hash(key) + h: uint64 = _fnv1a_hash(key) idx: sizet = self._find_slot(key, h) if idx >= self.__capacity__: return - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY or sh == _HT_TOMBSTONE: if sh == _HT_TOMBSTONE: self.__tombstones__ -= 1 @@ -173,37 +173,37 @@ class HashTable: def __getitem__(self, key: str) -> t.CPtr: """Lookup key and return value pointer. Returns None if key not found.""" - h: t.CUInt64T = _fnv1a_hash(key) + h: uint64 = _fnv1a_hash(key) idx: sizet = self._find_slot(key, h) if idx >= self.__capacity__: return None - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY or sh == _HT_TOMBSTONE: return None v: t.CPtr = self._slot_value(idx) return v - def __contains__(self, key: str) -> t.CInt: + def __contains__(self, key: str) -> int: """Check whether key exists in table.""" - h: t.CUInt64T = _fnv1a_hash(key) + h: uint64 = _fnv1a_hash(key) idx: sizet = self._find_slot(key, h) if idx >= self.__capacity__: return 0 - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY or sh == _HT_TOMBSTONE: return 0 return 1 - def __delitem__(self, key: str) -> t.CInt: + def __delitem__(self, key: str) -> int: """Delete entry by key. Return 1 on success, 0 if key not present.""" - h: t.CUInt64T = _fnv1a_hash(key) + h: uint64 = _fnv1a_hash(key) idx: sizet = self._find_slot(key, h) if idx >= self.__capacity__: return 0 - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY or sh == _HT_TOMBSTONE: return 0 - h_ptr: t.CUInt64T | t.CPtr = t.CPtr(t.CUInt64T(self.__slots__) + idx * _HT_SLOT_SIZE) + h_ptr: uint64* = t.CPtr(uint64(self.__slots__) + idx * _HT_SLOT_SIZE) h_ptr[0] = _HT_TOMBSTONE self.__count__ -= 1 self.__tombstones__ += 1 @@ -212,7 +212,7 @@ class HashTable: def __len__(self) -> sizet: return self.__count__ - def __iter__(self) -> HashTable | t.CPtr: + def __iter__(self) -> HashTable*: self.__iter_index__ = 0 return self @@ -220,18 +220,18 @@ class HashTable: while self.__iter_index__ < self.__capacity__: idx: sizet = self.__iter_index__ self.__iter_index__ = idx + 1 - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh != _HT_EMPTY and sh != _HT_TOMBSTONE: return self._slot_key(idx) raise StopIteration def get(self, key: str, default: t.CPtr) -> t.CPtr: """Return value pointer; return default pointer if key not found.""" - h: t.CUInt64T = _fnv1a_hash(key) + h: uint64 = _fnv1a_hash(key) idx: sizet = self._find_slot(key, h) if idx >= self.__capacity__: return default - sh: t.CUInt64T = self._slot_hash(idx) + sh: uint64 = self._slot_hash(idx) if sh == _HT_EMPTY or sh == _HT_TOMBSTONE: return default return self._slot_value(idx) @@ -239,7 +239,7 @@ class HashTable: def set_int(self, key: str, val: int): """Store integer value. Value is copied into mbuddy-managed storage.""" storage: t.CPtr = self.__mbuddy__.alloc(8) - int_ptr: int | t.CPtr = t.CPtr(t.CUInt64T(storage)) + int_ptr: int* = t.CPtr(uint64(storage)) int_ptr[0] = val self[key] = storage diff --git a/json/__init__.vp b/json/__init__.vp index a2e7967..6c1300d 100644 --- a/json/__init__.vp +++ b/json/__init__.vp @@ -7,13 +7,13 @@ import viperio # ============================================================ # JSON 值类型枚举 # ============================================================ -JSON_NULL: t.CDefine = 0 -JSON_BOOL: t.CDefine = 1 -JSON_INT: t.CDefine = 2 -JSON_FLOAT: t.CDefine = 3 -JSON_STRING: t.CDefine = 4 -JSON_ARRAY: t.CDefine = 5 -JSON_OBJECT: t.CDefine = 6 +define JSON_NULL = 0 +define JSON_BOOL = 1 +define JSON_INT = 2 +define JSON_FLOAT = 3 +define JSON_STRING = 4 +define JSON_ARRAY = 5 +define JSON_OBJECT = 6 # ============================================================ diff --git a/json/__writer.vp b/json/__writer.vp index f5c5ef5..f10b096 100644 --- a/json/__writer.vp +++ b/json/__writer.vp @@ -21,9 +21,9 @@ from . import ( # cap 的合法区间是 [WRITE_CAP_MIN, WRITE_CAP_MAX]：越界一律返回 None， # 非法容量不进入 pool.alloc（不会按可疑值去申请内存）。 # ============================================================ -WRITE_CAP_MIN: t.CDefine = 64 # 下限：最短 JSON 文档（如 {"id":""}）含结尾 NUL 也在 64 字节内 -WRITE_CAP_MAX: t.CDefine = 67108864 # 上限：64 MiB，不小于调用方可能申请的最大输出缓冲 -WRITE_CAP_DEFAULT: t.CDefine = 4096 # write 三参入口的固定容量（与旧实现 pool.alloc(4096) 一致） +define WRITE_CAP_MIN = 64# 下限：最短 JSON 文档（如 {"id":""}）含结尾 NUL 也在 64 字节内 +define WRITE_CAP_MAX = 67108864# 上限：64 MiB，不小于调用方可能申请的最大输出缓冲 +define WRITE_CAP_DEFAULT = 4096# write 三参入口的固定容量（与旧实现 pool.alloc(4096) 一致） def _write_char(buf: str, pos: sizet, cap: sizet, ch: char) -> sizet: if pos + 1 >= cap: @@ -40,7 +40,7 @@ def _write_str(buf: str, pos: sizet, cap: sizet, s: str) -> sizet: slen: sizet = string.strlen(s) if pos + slen >= cap: return cap # 留不出结尾 NUL 位 ⇒ 置溢出标志 - string.memcpy(char(t.CUInt64T(buf) + pos, t.CPtr), s, slen) + string.memcpy(char(uint64(buf) + pos, t.CPtr), s, slen) return pos + slen def _write_string_escaped(buf: str, pos: sizet, cap: sizet, s: str) -> sizet: diff --git a/mlirlite/__builder.vp b/mlirlite/__builder.vp index 7a235dd..48088a3 100644 --- a/mlirlite/__builder.vp +++ b/mlirlite/__builder.vp @@ -38,11 +38,11 @@ from .__function import Function, BasicBlock, block_append_text, block_set_termi # 产出畸形 MLIR（历史故障：alloca 行类型被 128 字节缓冲截断 → mlir-opt 报 # "unbalanced '(' character in pretty dialect name"）。 # ============================================================ -# 单个类型文本的容量（builders 内嵌类型经 TypePrint 渲染为 MLIR 形态）。 -# 内联具名结构体在使用处展开**完整字段体**，类型文本可达数百字节（TransPyV -# 自身类名/嵌套更深）⇒ 512 偏小会触发 TypePrint 的"类型文本超出输出缓冲被 -# 截断"响亮报错。提到 2048；注意 arg_cap 由本常量推导 -# （(arg_count+1)*(_TY_TEXT_CAP+32)），过高会让多参调用单次分配逼近模块池单块上限。 +# 单个类型文本的容量（builders 内嵌类型经 TypePrint 渲染为 MLIR 形态）。 +# 内联具名结构体在使用处展开**完整字段体**，类型文本可达数百字节（TransPyV +# 自身类名/嵌套更深）⇒ 512 偏小会触发 TypePrint 的"类型文本超出输出缓冲被 +# 截断"响亮报错。提到 2048；注意 arg_cap 由本常量推导 +# （(arg_count+1)*(_TY_TEXT_CAP+32)），过高会让多参调用单次分配逼近模块池单块上限。 _TY_TEXT_CAP: sizet = 2048 _LINE_CAP: sizet = 2560 @@ -87,7 +87,7 @@ novirtual class IRBuilder: if c0 == 0 or (c0 != 'i' and c0 != 'f' and c0 != '!' and c0 != 'n' and c0 != '[' and c0 != '{' and c0 != '%' and c0 != '"'): stdio.printf("[IR-FAIL] _type_str: LLVMType 对象已损坏 ty=0x%llx 首字符=%d 输出='%s'\n", - t.CUInt64T(ty), c0, buf) + uint64(ty), c0, buf) stdlib.exit(1) return None return buf @@ -1248,7 +1248,7 @@ novirtual class IRBuilder: # 工厂函数 # ============================================================ # IRBuilder 硬编码大小: Pool(8) + Func(8) + CurBlock(8) + Counter(4) + DbgLoc(8) = 40 字节（与 llvmlite 同布局） -BUILDER_SIZE: t.CDefine = 40 +define BUILDER_SIZE = 40 def new_builder(pool: memhub.MemBuddy*, func: rawptr[Function]) -> rawptr[IRBuilder]: """创建 IRBuilder，关联到函数 func""" @@ -1499,34 +1499,34 @@ def _build_binop(builder: rawptr[IRBuilder], op: str, # 比较指令 # ============================================================ # ICMP 谓词常量 -ICMP_EQ: t.CDefine = 0 -ICMP_NE: t.CDefine = 1 -ICMP_SGT: t.CDefine = 2 -ICMP_SGE: t.CDefine = 3 -ICMP_SLT: t.CDefine = 4 -ICMP_SLE: t.CDefine = 5 -ICMP_UGT: t.CDefine = 6 -ICMP_UGE: t.CDefine = 7 -ICMP_ULT: t.CDefine = 8 -ICMP_ULE: t.CDefine = 9 +define ICMP_EQ = 0 +define ICMP_NE = 1 +define ICMP_SGT = 2 +define ICMP_SGE = 3 +define ICMP_SLT = 4 +define ICMP_SLE = 5 +define ICMP_UGT = 6 +define ICMP_UGE = 7 +define ICMP_ULT = 8 +define ICMP_ULE = 9 # FCMP 谓词常量 -FCMP_FALSE: t.CDefine = 0 -FCMP_OEQ: t.CDefine = 1 -FCMP_OGT: t.CDefine = 2 -FCMP_OGE: t.CDefine = 3 -FCMP_OLT: t.CDefine = 4 -FCMP_OLE: t.CDefine = 5 -FCMP_ONE: t.CDefine = 6 -FCMP_ORD: t.CDefine = 7 -FCMP_UNO: t.CDefine = 8 -FCMP_UEQ: t.CDefine = 9 -FCMP_UGT: t.CDefine = 10 -FCMP_UGE: t.CDefine = 11 -FCMP_ULT: t.CDefine = 12 -FCMP_ULE: t.CDefine = 13 -FCMP_UNE: t.CDefine = 14 -FCMP_TRUE: t.CDefine = 15 +define FCMP_FALSE = 0 +define FCMP_OEQ = 1 +define FCMP_OGT = 2 +define FCMP_OGE = 3 +define FCMP_OLT = 4 +define FCMP_OLE = 5 +define FCMP_ONE = 6 +define FCMP_ORD = 7 +define FCMP_UNO = 8 +define FCMP_UEQ = 9 +define FCMP_UGT = 10 +define FCMP_UGE = 11 +define FCMP_ULT = 12 +define FCMP_ULE = 13 +define FCMP_UNE = 14 +define FCMP_TRUE = 15 def _icmp_pred_str(pred: int) -> str: @@ -1772,7 +1772,7 @@ novirtual class PhiIncoming(GSListNode[PhiIncoming]): # PhiIncoming 硬编码大小: Next(8) + Val(8) + Block(8) = 24 字节 -PHIINC_SIZE: t.CDefine = 24 +define PHIINC_SIZE = 24 def new_phi_incoming(pool: memhub.MemBuddy*, val: rawptr[Value], block: rawptr[BasicBlock]) -> rawptr[PhiIncoming]: @@ -1807,7 +1807,7 @@ novirtual class SwitchCase(GSListNode[SwitchCase]): # SwitchCase 硬编码大小: Next(8) + CaseVal(8) + Block(8) = 24 字节 -SWCASE_SIZE: t.CDefine = 24 +define SWCASE_SIZE = 24 def new_switch_case(pool: memhub.MemBuddy*, case_val: rawptr[Value], block: rawptr[BasicBlock]) -> rawptr[SwitchCase]: @@ -1850,26 +1850,26 @@ def build_unreachable(builder: rawptr[IRBuilder]): # 原子指令 (Phase 3) # ============================================================ # AtomicRMW 操作常量 -ATOMIC_XCHG: t.CDefine = 0 -ATOMIC_ADD: t.CDefine = 1 -ATOMIC_SUB: t.CDefine = 2 -ATOMIC_AND: t.CDefine = 3 -ATOMIC_NAND: t.CDefine = 4 -ATOMIC_OR: t.CDefine = 5 -ATOMIC_XOR: t.CDefine = 6 -ATOMIC_MAX: t.CDefine = 7 -ATOMIC_MIN: t.CDefine = 8 -ATOMIC_UMAX: t.CDefine = 9 -ATOMIC_UMIN: t.CDefine = 10 +define ATOMIC_XCHG = 0 +define ATOMIC_ADD = 1 +define ATOMIC_SUB = 2 +define ATOMIC_AND = 3 +define ATOMIC_NAND = 4 +define ATOMIC_OR = 5 +define ATOMIC_XOR = 6 +define ATOMIC_MAX = 7 +define ATOMIC_MIN = 8 +define ATOMIC_UMAX = 9 +define ATOMIC_UMIN = 10 # 内存序常量 -ATOMIC_ORDER_NOTATOMIC: t.CDefine = 0 -ATOMIC_ORDER_UNORDERED: t.CDefine = 1 -ATOMIC_ORDER_MONOTONIC: t.CDefine = 2 -ATOMIC_ORDER_ACQUIRE: t.CDefine = 3 -ATOMIC_ORDER_RELEASE: t.CDefine = 4 -ATOMIC_ORDER_ACQ_REL: t.CDefine = 5 -ATOMIC_ORDER_SEQ_CST: t.CDefine = 6 +define ATOMIC_ORDER_NOTATOMIC = 0 +define ATOMIC_ORDER_UNORDERED = 1 +define ATOMIC_ORDER_MONOTONIC = 2 +define ATOMIC_ORDER_ACQUIRE = 3 +define ATOMIC_ORDER_RELEASE = 4 +define ATOMIC_ORDER_ACQ_REL = 5 +define ATOMIC_ORDER_SEQ_CST = 6 def _atomic_op_str(op: int) -> str: @@ -1943,7 +1943,7 @@ def build_inline_asm(builder: rawptr[IRBuilder], ret_ty: rawptr[LLVMType], # _append_cstr 写入位置缓存（性能优化：同一缓冲连续追加时 O(1) 定位， # 避免每次 strlen(dst) 从头扫描导致的 O(n²) —— IR 序列化热点）。 # 缓冲切换（dst 不同）或缓冲被重置（dst[0]=0 且 pos>0）时自动回退 strlen。 -_g_last_dst: t.CUInt64T = 0 +_g_last_dst: uint64 = 0 _g_last_pos: sizet = 0 def _append_cstr(dst: str, dst_size: sizet, src: str): @@ -1951,7 +1951,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): global _g_last_dst, _g_last_pos if dst is None or src is None: return dlen: sizet = 0 - if _g_last_dst == t.CUInt64T(dst): + if _g_last_dst == uint64(dst): dlen = _g_last_pos # 缓冲被重置（调用方 buf[0]=0 后复用同一地址）→ 回到头部 if dlen > 0 and dst[0] == '\0': @@ -1965,7 +1965,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): dlen = string.strlen(dst) else: dlen = string.strlen(dst) - _g_last_dst = t.CUInt64T(dst) + _g_last_dst = uint64(dst) # 无符号下溢防护：dlen 超过缓冲大小时（缓冲已被破坏/悬空）直接返回， # 否则 remain = dst_size - dlen 下溢成巨值会把 dst[dlen+i] 写穿到缓冲外 if dlen >= dst_size: diff --git a/mlirlite/__function.vp b/mlirlite/__function.vp index 9aba641..87cc7f5 100644 --- a/mlirlite/__function.vp +++ b/mlirlite/__function.vp @@ -15,7 +15,7 @@ from .__types import ( # dump 哨兵：IR 链表遍历步数上限（成环检测，fail-fast，与 __module.vp 对齐）。 # 函数/基本块/指令行链的 Next 被越界写破坏成环时，遍历无限循环挂起； # 超过上限即打印链表名并 exit(1)，把"卡死"变成"确定性报错定位"。 -IR_DUMP_CHAIN_LIMIT: t.CDefine = 100000 +define IR_DUMP_CHAIN_LIMIT = 100000 # 窥孔优化总开关（T2 转发/ret 归零、T3 no-op bitcast 消除）。 # TPV 命令行 --no-llvmpeephole 会将其置 0：FunctionPrint 序列化时跳过全部本地窥孔， @@ -100,7 +100,7 @@ novirtual class Function(GSListNode[Function]): # 工厂函数 # ============================================================ # Line 硬编码大小: Next(8) + Buf(8) + Len(8) = 24 字节 -LINE_SIZE: t.CDefine = 24 +define LINE_SIZE = 24 def new_line(pool: memhub.MemBuddy*, text: str) -> rawptr[Line]: """创建一个指令行，复制 text 到新分配的缓冲区""" @@ -126,7 +126,7 @@ def _new_gslist(pool: memhub.MemBuddy*, list_size: sizet) -> t.CPtr: # BasicBlock 硬编码大小: Next(8) + Name(8) + Lines(8) + IsTerminated(4) = 32 字节 -BLOCK_SIZE: t.CDefine = 32 +define BLOCK_SIZE = 32 def new_basic_block(pool: memhub.MemBuddy*, name: str) -> rawptr[BasicBlock]: """创建一个基本块""" @@ -140,7 +140,7 @@ def new_basic_block(pool: memhub.MemBuddy*, name: str) -> rawptr[BasicBlock]: # Param 硬编码大小: Next(8) + Ty(8) + Name(8) + Attrs(8) = 32 字节 -PARAM_SIZE: t.CDefine = 32 +define PARAM_SIZE = 32 def new_param(pool: memhub.MemBuddy*, ty: rawptr[LLVMType], name: str) -> rawptr[Param]: @@ -155,7 +155,7 @@ def new_param(pool: memhub.MemBuddy*, ty: rawptr[LLVMType], # Function 硬编码大小: Next(8) + Name(8) + RetTy(8) + Params(8) + Blocks(8) + IsDeclared(4) + IsVarArg(4) + Attrs(8) + AttrGroup(8) + AttrGroupId(8) + NameLen(8) + DbgRef(8) = 88 字节（与 llvmlite 同布局） -FUNC_SIZE: t.CDefine = 88 +define FUNC_SIZE = 88 def new_function(pool: memhub.MemBuddy*, name: str, ret_ty: rawptr[LLVMType]) -> rawptr[Function]: @@ -466,9 +466,9 @@ def _map_get_i32(map_arr: str, idx: int) -> int: """ if map_arr is None: return -1 - byte_off: t.CUInt64T = t.CUInt64T(map_arr) + idx * 4 + byte_off: uint64 = uint64(map_arr) + idx * 4 elem_ptr: rawptr[int] = (rawptr[int])(byte_off) - return c.Deref(elem_ptr) + return *elem_ptr def _map_set_i32(map_arr: str, idx: int, val: int): @@ -479,7 +479,7 @@ def _map_set_i32(map_arr: str, idx: int, val: int): """ if map_arr is None: return - byte_off: t.CUInt64T = t.CUInt64T(map_arr) + idx * 4 + byte_off: uint64 = uint64(map_arr) + idx * 4 elem_ptr: rawptr[int] = (rawptr[int])(byte_off) c.DerefAs(elem_ptr, val) @@ -826,7 +826,7 @@ def _peep_alloc_name(eb: str, pool: memhub.MemBuddy*) -> str: eqpos: str = string.strstr(eb, " = alloca ") if eqpos is None: return None - nlen: sizet = sizet(t.CUInt64T(eqpos) - t.CUInt64T(eb)) - 1 + nlen: sizet = sizet(uint64(eqpos) - uint64(eb)) - 1 if nlen == 0: return None nm: str = pool.alloc(nlen + 1) @@ -858,7 +858,7 @@ def _peep_is_alloc_of(eb: str, a_name: str, nl: sizet) -> int: if string.strncmp(eb + 1, a_name, nl) != 0: return 0 eqpos: str = string.strstr(eb, " = alloca ") - if eqpos is not None and t.CUInt64T(eqpos) == t.CUInt64T(eb) + 1 + nl: + if eqpos is not None and uint64(eqpos) == uint64(eb) + 1 + nl: return 1 return 0 @@ -886,7 +886,7 @@ def _peephole_opt(func: rawptr[Function], pool: memhub.MemBuddy*): if line1.Buf is not None: zi: str = string.strstr(line1.Buf, " zeroinitializer") if zi is not None and _peep_is_startwith(line1.Buf, "ret ") != 0: - ty_len: sizet = sizet(t.CUInt64T(zi) - t.CUInt64T(line1.Buf)) - 4 + ty_len: sizet = sizet(uint64(zi) - uint64(line1.Buf)) - 4 if ty_len > 0: ty_buf: str = pool.alloc(ty_len + 1) if ty_buf is not None: @@ -930,7 +930,7 @@ def _peephole_opt(func: rawptr[Function], pool: memhub.MemBuddy*): st_line_order: int = -1 load_ltoks: str = pool.alloc(8 * 64) load_cnt: int = 0 - load_entry_order: t.CInt64T = 0 + load_entry_order: int64 = 0 alloca_order: int = -1 order: int = 0 unsafe: int = 0 @@ -954,7 +954,7 @@ def _peephole_opt(func: rawptr[Function], pool: memhub.MemBuddy*): if st_count == 1: vcomma: str = string.strstr(sb + 6, ", ") if vcomma is not None: - vlen: sizet = sizet(t.CUInt64T(vcomma) - t.CUInt64T(sb + 6)) + vlen: sizet = sizet(uint64(vcomma) - uint64(sb + 6)) if vlen > 0: vbuf: str = pool.alloc(vlen + 1) if vbuf is not None: @@ -970,12 +970,12 @@ def _peephole_opt(func: rawptr[Function], pool: memhub.MemBuddy*): ls: str = string.strstr(sb, "%") if ls is not None and load_cnt < 64: lname_len: sizet = sizet( - t.CUInt64T(string.strstr(sb, " = load ")) - t.CUInt64T(ls)) + uint64(string.strstr(sb, " = load ")) - uint64(ls)) lname: str = pool.alloc(lname_len + 1) if lname is not None: string.strncpy(lname, ls + 1, lname_len - 1) lname[lname_len - 1] = '\0' - slotp: str | t.CPtr = (str | t.CPtr)(t.CUInt64T(load_ltoks) + load_cnt * 8) + slotp: str* = (str*)(uint64(load_ltoks) + load_cnt * 8) slotp[0] = lname load_cnt += 1 if blk_s == entry_blk and st_line_order < 0: @@ -1020,7 +1020,7 @@ def _peephole_opt(func: rawptr[Function], pool: memhub.MemBuddy*): safe_len: sizet = string.strlen(safe_val) li2: int = 0 while li2 < load_cnt: - slotsp: str | t.CPtr = (str | t.CPtr)(t.CUInt64T(load_ltoks) + li2 * 8) + slotsp: str* = (str*)(uint64(load_ltoks) + li2 * 8) ltok: str = slotsp[0] if ltok is not None: # ltok 在该 load 名的全函数行扫描中不变，strlen 只求一次 @@ -1092,7 +1092,7 @@ def _peep_noop_bitcast(func: rawptr[Function], pool: memhub.MemBuddy*): if ln.Buf is not None: eqpos: str = string.strstr(ln.Buf, " = bitcast ") if eqpos is not None: - nlen: sizet = sizet(t.CUInt64T(eqpos) - t.CUInt64T(ln.Buf)) - 1 + nlen: sizet = sizet(uint64(eqpos) - uint64(ln.Buf)) - 1 nm_buf: str = None src_buf: str = None if nlen > 0: @@ -1100,14 +1100,14 @@ def _peep_noop_bitcast(func: rawptr[Function], pool: memhub.MemBuddy*): sp1: str = string.strchr(after, ' ') tpos: str = string.strstr(after, " to ") if sp1 is not None and tpos is not None \ - and t.CUInt64T(sp1) < t.CUInt64T(tpos): - tyA_len: sizet = sizet(t.CUInt64T(sp1) - t.CUInt64T(after)) + and uint64(sp1) < uint64(tpos): + tyA_len: sizet = sizet(uint64(sp1) - uint64(after)) src_st: str = sp1 + 1 - src_len: sizet = sizet(t.CUInt64T(tpos) - t.CUInt64T(src_st)) + src_len: sizet = sizet(uint64(tpos) - uint64(src_st)) tyB: str = tpos + 4 tyB_len: sizet = string.strlen(tyB) if src_len > 0 and string.strchr(tyB, ' ') is None \ - and t.CUInt64T(string.strchr(src_st, ' ')) == t.CUInt64T(tpos) \ + and uint64(string.strchr(src_st, ' ')) == uint64(tpos) \ and tyA_len == tyB_len \ and string.strncmp(after, tyB, tyA_len) == 0: nm_buf = pool.alloc(nlen + 1) @@ -1161,8 +1161,8 @@ def _peep_noop_bitcast(func: rawptr[Function], pool: memhub.MemBuddy*): # ============================================================ # 表格容量 -MLIR_CONST_CAP: t.CDefine = 512 -MLIR_ALIAS_CAP: t.CDefine = 512 +define MLIR_CONST_CAP = 512 +define MLIR_ALIAS_CAP = 512 # 渲染阶段：1=扫描(登记) 2=发射(写文本) _MLIR_Pass: int = 0 @@ -1211,9 +1211,9 @@ _SC_B2: str = None _SC_Buf: str = None -def _mlir_slotp(buf: t.CPtr, idx: int) -> str | t.CPtr: +def _mlir_slotp(buf: t.CPtr, idx: int) -> str*: """表格槽位地址（buf + idx*8）""" - return (str | t.CPtr)(t.CUInt64T(buf) + idx * 8) + return (str*)(uint64(buf) + idx * 8) def _mlir_dup(s: str) -> str: @@ -1288,9 +1288,9 @@ def _MlirAliasLookup(name: str) -> str: return None i: int = 0 while i < _MLIR_AliasCount: - sp: str | t.CPtr = _mlir_slotp(_MLIR_AliasFrom, i) + sp: str* = _mlir_slotp(_MLIR_AliasFrom, i) if sp[0] is not None and string.strcmp(sp[0], name) == 0: - st: str | t.CPtr = _mlir_slotp(_MLIR_AliasTo, i) + st: str* = _mlir_slotp(_MLIR_AliasTo, i) return st[0] i += 1 return None @@ -1303,8 +1303,8 @@ def _MlirAliasAdd(from_name: str, to_name: str): return if _MLIR_AliasCount >= MLIR_ALIAS_CAP: MlirFail("MLIR 渲染: bitcast 别名表溢出") - sp: str | t.CPtr = _mlir_slotp(_MLIR_AliasFrom, _MLIR_AliasCount) - st: str | t.CPtr = _mlir_slotp(_MLIR_AliasTo, _MLIR_AliasCount) + sp: str* = _mlir_slotp(_MLIR_AliasFrom, _MLIR_AliasCount) + st: str* = _mlir_slotp(_MLIR_AliasTo, _MLIR_AliasCount) sp[0] = _mlir_dup(from_name) st[0] = _mlir_dup(to_name) _MLIR_AliasCount += 1 @@ -1330,11 +1330,11 @@ def _MlirConstGet(tytext: str, valtext: str) -> str: global _MLIR_ConstCount i: int = 0 while i < _MLIR_ConstCount: - sp: str | t.CPtr = _mlir_slotp(_MLIR_ConstTy, i) + sp: str* = _mlir_slotp(_MLIR_ConstTy, i) if sp[0] is not None and string.strcmp(sp[0], tytext) == 0: - sv: str | t.CPtr = _mlir_slotp(_MLIR_ConstVal, i) + sv: str* = _mlir_slotp(_MLIR_ConstVal, i) if sv[0] is not None and string.strcmp(sv[0], valtext) == 0: - sn: str | t.CPtr = _mlir_slotp(_MLIR_ConstName, i) + sn: str* = _mlir_slotp(_MLIR_ConstName, i) return sn[0] i += 1 if _MLIR_Pass == 2: @@ -1346,9 +1346,9 @@ def _MlirConstGet(tytext: str, valtext: str) -> str: if nm is None: MlirFail("MLIR 渲染: 常量名分配失败") viperlib.snprintf(nm, 32, "%%c%d", _MLIR_ConstCount) - sp2: str | t.CPtr = _mlir_slotp(_MLIR_ConstTy, _MLIR_ConstCount) - sv2: str | t.CPtr = _mlir_slotp(_MLIR_ConstVal, _MLIR_ConstCount) - sn2: str | t.CPtr = _mlir_slotp(_MLIR_ConstName, _MLIR_ConstCount) + sp2: str* = _mlir_slotp(_MLIR_ConstTy, _MLIR_ConstCount) + sv2: str* = _mlir_slotp(_MLIR_ConstVal, _MLIR_ConstCount) + sn2: str* = _mlir_slotp(_MLIR_ConstName, _MLIR_ConstCount) sp2[0] = _mlir_dup(tytext) sv2[0] = _mlir_dup(valtext) sn2[0] = nm @@ -1453,9 +1453,9 @@ def _MlirEmitConsts(out: str, outsz: sizet): """按登记顺序在 entry 块开头发射全部常量物化 op""" i: int = 0 while i < _MLIR_ConstCount: - st: str | t.CPtr = _mlir_slotp(_MLIR_ConstTy, i) - sv: str | t.CPtr = _mlir_slotp(_MLIR_ConstVal, i) - sn: str | t.CPtr = _mlir_slotp(_MLIR_ConstName, i) + st: str* = _mlir_slotp(_MLIR_ConstTy, i) + sv: str* = _mlir_slotp(_MLIR_ConstVal, i) + sn: str* = _mlir_slotp(_MLIR_ConstName, i) _MlirEmitOneConst(out, outsz, st[0], sv[0], sn[0]) i += 1 @@ -3339,7 +3339,7 @@ def FunctionPrint(buf: str, size: sizet, # _append_cstr 写入位置缓存（性能优化：同一缓冲连续追加时 O(1) 定位， # 避免每次 strlen(dst) 从头扫描导致的 O(n²) —— IR 序列化热点）。 # 缓冲切换（dst 不同）或缓冲被重置（dst[0]=0 且 pos>0）时自动回退 strlen。 -_g_last_dst: t.CUInt64T = 0 +_g_last_dst: uint64 = 0 _g_last_pos: sizet = 0 def _append_cstr(dst: str, dst_size: sizet, src: str): @@ -3347,7 +3347,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): global _g_last_dst, _g_last_pos, _MlirOutTrunc if dst is None or src is None: return dlen: sizet = 0 - if _g_last_dst == t.CUInt64T(dst): + if _g_last_dst == uint64(dst): dlen = _g_last_pos # 缓冲被重置（调用方 buf[0]=0 后复用同一地址）→ 回到头部 if dlen > 0 and dst[0] == '\0': @@ -3362,7 +3362,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): dlen = string.strlen(dst) else: dlen = string.strlen(dst) - _g_last_dst = t.CUInt64T(dst) + _g_last_dst = uint64(dst) # 无符号下溢防护：dlen 超过缓冲大小时（缓冲已被破坏/悬空）直接返回， # 否则 remain = dst_size - dlen 下溢成巨值会把 dst[dlen+i] 写穿到缓冲外 if dlen >= dst_size: @@ -3420,7 +3420,7 @@ _g_dbg_cap: sizet = 0 # 当前函数上下文（C 记录从这里取调用方符号/文件/行）；嵌套 define（lambda 等） # 用定长栈 Push/Pop。 -DBGC_STACK_MAX: t.CDefine = 256 +define DBGC_STACK_MAX = 256 _g_dbg_func: str = None _g_dbg_file: str = None _g_dbg_defline: int = 0 @@ -3498,9 +3498,9 @@ def DebugNoteFunc(sym: str, file: str, line: int) -> int: MlirFail("MLIR 调试记录: 函数嵌套深度超上限（DBGC_STACK_MAX）") if _DbgEnsureStack() != 0: MlirFail("MLIR 调试记录: 上下文栈分配失败") - fs: str | t.CPtr = (str | t.CPtr)(uint64(_g_dbg_stk_func) + sizet(_g_dbg_depth) * 8) + fs: str* = (str*)(uint64(_g_dbg_stk_func) + sizet(_g_dbg_depth) * 8) fs[0] = _g_dbg_func - ff: str | t.CPtr = (str | t.CPtr)(uint64(_g_dbg_stk_file) + sizet(_g_dbg_depth) * 8) + ff: str* = (str*)(uint64(_g_dbg_stk_file) + sizet(_g_dbg_depth) * 8) ff[0] = _g_dbg_file ds: sizet* = (sizet*)(uint64(_g_dbg_stk_def) + sizet(_g_dbg_depth) * 8) ds[0] = sizet(_g_dbg_defline) @@ -3534,9 +3534,9 @@ def DebugClearFunc() -> int: _g_dbg_line = 0 return 0 _g_dbg_depth -= 1 - fs: str | t.CPtr = (str | t.CPtr)(uint64(_g_dbg_stk_func) + sizet(_g_dbg_depth) * 8) + fs: str* = (str*)(uint64(_g_dbg_stk_func) + sizet(_g_dbg_depth) * 8) _g_dbg_func = fs[0] - ff: str | t.CPtr = (str | t.CPtr)(uint64(_g_dbg_stk_file) + sizet(_g_dbg_depth) * 8) + ff: str* = (str*)(uint64(_g_dbg_stk_file) + sizet(_g_dbg_depth) * 8) _g_dbg_file = ff[0] ds: sizet* = (sizet*)(uint64(_g_dbg_stk_def) + sizet(_g_dbg_depth) * 8) _g_dbg_defline = int(ds[0]) diff --git a/mlirlite/__init__.vp b/mlirlite/__init__.vp index cd8ec58..0219c9c 100644 --- a/mlirlite/__init__.vp +++ b/mlirlite/__init__.vp @@ -287,7 +287,7 @@ def create_global_string(pool: memhub.MemBuddy*, mod: rawptr[LLVMModule], pos += 1 i: sizet = 0 while i < slen: - ch: t.CUInt8T = text[i] + ch: uint8 = text[i] if ch == 0x22 or ch == 0x5C or ch < 0x20 or ch >= 0x7F: # 需要转义: " → \22, \ → \5c, 非打印字符 → \xx init_buf[pos] = '\\' @@ -445,7 +445,7 @@ class LLVMModuleCore: def ConstInt64(self, val: int64) -> rawptr[Value]: return const_int64(self.Pool, val) - def ConstFloat(self, ty: rawptr[LLVMType], val: t.CDouble) -> rawptr[Value]: + def ConstFloat(self, ty: rawptr[LLVMType], val: double) -> rawptr[Value]: return ConstFloat(self.Pool, ty, val) def SSAValue(self, ty: rawptr[LLVMType], name: str) -> rawptr[Value]: diff --git a/mlirlite/__module.vp b/mlirlite/__module.vp index 88751fd..e45fcf5 100644 --- a/mlirlite/__module.vp +++ b/mlirlite/__module.vp @@ -505,16 +505,16 @@ def new_module(pool: memhub.MemBuddy*, name: str) -> rawptr[LLVMModule]: # GlobalVariable 硬编码大小: Next(8) + Name(8) + Ty(8) + Initializer(8) + IsConstant(4) + Linkage(8) + Section(8) + UnnamedAddr(4) + Align(4) = 72 字节 -GV_SIZE: t.CDefine = 72 +define GV_SIZE = 72 # NamedTypeNode 硬编码大小: Next(8) + Ty(8) + IsPacked(8) = 24 字节 -NAMED_TYPE_NODE_SIZE: t.CDefine = 24 +define NAMED_TYPE_NODE_SIZE = 24 # DINode 硬编码大小: Next(8) + Text(8) = 16 字节（同 llvmlite） -DI_NODE_SIZE: t.CDefine = 16 +define DI_NODE_SIZE = 16 # DINamedMeta 硬编码大小: Next(8) + Name(8) + Refs(8) = 24 字节（同 llvmlite） -DI_NAMED_SIZE: t.CDefine = 24 +define DI_NAMED_SIZE = 24 def new_global_variable(pool: memhub.MemBuddy*, name: str, ty: rawptr[LLVMType]) -> rawptr[GlobalVariable]: @@ -758,16 +758,16 @@ def global_set_section(gv: rawptr[GlobalVariable], section: str): # ============================================================ # 输出模式常量 # ============================================================ -OUTPUT_FULL: t.CDefine = 0 # 完整 IR（stub + text） -OUTPUT_STUB: t.CDefine = 1 # 仅声明（header + 类型定义 + declare + external global） -OUTPUT_TEXT: t.CDefine = 2 # 仅代码（define + global 带初值） +define OUTPUT_FULL = 0# 完整 IR（stub + text） +define OUTPUT_STUB = 1# 仅声明（header + 类型定义 + declare + external global） +define OUTPUT_TEXT = 2# 仅代码（define + global 带初值） # dump 哨兵：IR 链表遍历步数上限（成环检测，fail-fast）。 # 任何一条链（函数/全局/命名类型/结构体字段）的 Next 被越界写破坏成环时， # 遍历会无限循环导致 tpv.exe 挂起（builtins.vp dump 卡死根因排查）。 # 超过上限即打印链表名并 exit(1)，把"卡死"变成"确定性报错定位" # （对齐 memhub.self_check 的 max_steps 哲学）。 -IR_DUMP_CHAIN_LIMIT: t.CDefine = 100000 +define IR_DUMP_CHAIN_LIMIT = 100000 _MlirModOutTrunc: int = 0 # ============================================================ @@ -1032,13 +1032,13 @@ def _MlirArrayDenseAt(buf: str, size: sizet, src: str, # * 符号名一律经 _MlirSymRefAppend（先剥 LLVM 口径引号，再按 MLIR 口径重加）； # * 不支持的叶子形态一律 MlirFail（带原始文本），绝不静默输出错误 MLIR。 # ============================================================ -GV_REGION_BUF_SIZE: t.CDefine = 32768 - -# 下标路径复用栈：每个递归深度一个槽（顶层 path="" → 深度 d 的路径写在槽 d）。 -# 深度上限与 _MlirGvWalk 的 64 层守卫一致，留余量取 72；每槽 512 字节足够 -# （64 层 × " , NN" ≈ 400 字节）。 -GV_PATH_SLOT: t.CDefine = 512 -GV_PATH_MAX: t.CDefine = 72 +define GV_REGION_BUF_SIZE = 32768 + +# 下标路径复用栈：每个递归深度一个槽（顶层 path="" → 深度 d 的路径写在槽 d）。 +# 深度上限与 _MlirGvWalk 的 64 层守卫一致，留余量取 72；每槽 512 字节足够 +# （64 层 × " , NN" ≈ 400 字节）。 +define GV_PATH_SLOT = 512 +define GV_PATH_MAX = 72 # region 渲染期状态（单线程递归渲染，逐全局重置） _MlirGvLeafBuf: str = None # 叶子 op 缓冲 @@ -1682,7 +1682,7 @@ def _MlirAppendIndented(dst: str, dst_size: sizet, src: str, # _append_cstr 写入位置缓存（性能优化：同一缓冲连续追加时 O(1) 定位， # 避免每次 strlen(dst) 从头扫描导致的 O(n²) —— IR 序列化热点）。 # 缓冲切换（dst 不同）或缓冲被重置（dst[0]=0 且 pos>0）时自动回退 strlen。 -_g_last_dst: t.CUInt64T = 0 +_g_last_dst: uint64 = 0 _g_last_pos: sizet = 0 def _append_cstr(dst: str, dst_size: sizet, src: str): @@ -1690,7 +1690,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): global _g_last_dst, _g_last_pos, _MlirModOutTrunc if dst is None or src is None: return dlen: sizet = 0 - if _g_last_dst == t.CUInt64T(dst): + if _g_last_dst == uint64(dst): dlen = _g_last_pos # 缓冲被重置（调用方 buf[0]=0 后复用同一地址）→ 回到头部 if dlen > 0 and dst[0] == '\0': @@ -1707,7 +1707,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): dlen = string.strlen(dst) else: dlen = string.strlen(dst) - _g_last_dst = t.CUInt64T(dst) + _g_last_dst = uint64(dst) # 无符号下溢防护：dlen 超过缓冲大小时（缓冲已被破坏/悬空）直接返回， # 否则 remain = dst_size - dlen 下溢成巨值会把 dst[dlen+i] 写穿到缓冲外 if dlen >= dst_size: diff --git a/mlirlite/__types.vp b/mlirlite/__types.vp index c3a85fe..8b19dd2 100644 --- a/mlirlite/__types.vp +++ b/mlirlite/__types.vp @@ -242,7 +242,7 @@ def Label(pool: memhub.MemBuddy*) -> rawptr[LLVMType]: # ParamNode 辅助 # ============================================================ # ParamNode 硬编码大小: Next(8) + Ty(8) = 16 字节 -PNODE_SIZE: t.CDefine = 16 +define PNODE_SIZE = 16 def new_param_node(pool: memhub.MemBuddy*, ty: rawptr[LLVMType]) -> rawptr[ParamNode]: """创建一个参数节点，Ty 设为给定类型指针""" @@ -402,14 +402,14 @@ def MlirFail(msg: str): # 类型转换失败报文再把它追加出来，一次定位到出错的那一行中间文本。 # 依赖方向保持单向：本模块只存/读，不反向 import __function.vp。 # ============================================================ -_MlirCtxLine: str = None - -# 类型文本渲染溢出标志：_strappend/_MlirAppendN 因缓冲上限截断时置 1， -# 由 TypePrint / MlirTypeText 在渲染后检查并响亮报错。 -# 为什么必须响亮：MLIR 把具名结构体内联为**完整字段体** -# （`!llvm.struct<"name", (13 个字段…)>`），类型文本远长于 LLVM 形态的 -# `%"name"` 引用，固定小缓冲（128/256）会被截断并产出畸形 MLIR -# （实测：alloca 行类型截断 → mlir-opt 报 "unbalanced '(' character"）。 +_MlirCtxLine: str = None + +# 类型文本渲染溢出标志：_strappend/_MlirAppendN 因缓冲上限截断时置 1， +# 由 TypePrint / MlirTypeText 在渲染后检查并响亮报错。 +# 为什么必须响亮：MLIR 把具名结构体内联为**完整字段体** +# （`!llvm.struct<"name", (13 个字段…)>`），类型文本远长于 LLVM 形态的 +# `%"name"` 引用，固定小缓冲（128/256）会被截断并产出畸形 MLIR +# （实测：alloca 行类型截断 → mlir-opt 报 "unbalanced '(' character"）。 _MlirTypeTrunc: int = 0 @@ -903,26 +903,26 @@ def _MlirTypeAppend(dst: str, dstsz: sizet, src: str, pool: memhub.MemBuddy*, if fp != 0: _MlirFuncText(dst, dstsz, p, lt, fp, pool, depth) return - # 报文带上原始类型文本（截断到 lt）+ 当前正在渲染的中间文本行，便于一次定位： - # 若谓词/记号被误当类型，会直接看到 'sgt' 这类内容；行上下文由 - # MlirSetContextLine 寄存（见本文件顶部的 _MlirCtxLine）。 - emb: str = pool.alloc(lt + 1) - if emb is not None: - string.strncpy(emb, p, lt) - emb[lt] = '\0' - clen: sizet = 0 - if _MlirCtxLine is not None: - clen = string.strlen(_MlirCtxLine) - emsg: str = pool.alloc(lt + clen + 128) - if emsg is not None: - if _MlirCtxLine is not None: - viperlib.snprintf(emsg, lt + clen + 128, - "无法转换为 MLIR 类型文本（v1 未覆盖该形态）：'%s' [行: %s]", - emb, _MlirCtxLine) - else: - viperlib.snprintf(emsg, lt + clen + 128, - "无法转换为 MLIR 类型文本（v1 未覆盖该形态）：'%s'", emb) - MlirFail(emsg) + # 报文带上原始类型文本（截断到 lt）+ 当前正在渲染的中间文本行，便于一次定位： + # 若谓词/记号被误当类型，会直接看到 'sgt' 这类内容；行上下文由 + # MlirSetContextLine 寄存（见本文件顶部的 _MlirCtxLine）。 + emb: str = pool.alloc(lt + 1) + if emb is not None: + string.strncpy(emb, p, lt) + emb[lt] = '\0' + clen: sizet = 0 + if _MlirCtxLine is not None: + clen = string.strlen(_MlirCtxLine) + emsg: str = pool.alloc(lt + clen + 128) + if emsg is not None: + if _MlirCtxLine is not None: + viperlib.snprintf(emsg, lt + clen + 128, + "无法转换为 MLIR 类型文本（v1 未覆盖该形态）：'%s' [行: %s]", + emb, _MlirCtxLine) + else: + viperlib.snprintf(emsg, lt + clen + 128, + "无法转换为 MLIR 类型文本（v1 未覆盖该形态）：'%s'", emb) + MlirFail(emsg) MlirFail("无法转换为 MLIR 类型文本（v1 未覆盖该形态）") @@ -1129,7 +1129,7 @@ def _MlirFuncText(dst: str, dstsz: sizet, p: str, lt: sizet, fp: sizet, # 递归深度上限：悬空/自引用的 LLVMType 树（reset 后内存被复用）会导致 # Ptr(pointee)/Struct(fields)/Func(params) 无限递归，每次递归分配临时缓冲 # 造成 OOM。超过 100 层即停止打印。 -TYPEPRINT_MAX_DEPTH: t.CDefine = 100 +define TYPEPRINT_MAX_DEPTH = 100 def _MlirTypePrintDepth(buf: str, size: sizet, ty: rawptr[LLVMType], pool: memhub.MemBuddy*, @@ -1353,7 +1353,7 @@ def get_struct_fcount(ty: rawptr[LLVMType]) -> int: # 注意: 自引用类型（如 Value 含 Ptr(Value) 字段）会导致无限递归， # 用深度上限防护（超过即返回浅拷贝副本，后续不再递归）。 # ============================================================ -DEEPCOPY_MAX_DEPTH: t.CDefine = 64 +define DEEPCOPY_MAX_DEPTH = 64 def DeepCopyType(pool: memhub.MemBuddy*, ty: rawptr[LLVMType]) -> rawptr[LLVMType]: diff --git a/mlirlite/__values.vp b/mlirlite/__values.vp index 4b3615d..90d4800 100644 --- a/mlirlite/__values.vp +++ b/mlirlite/__values.vp @@ -23,14 +23,14 @@ class Value(GSListNode[Value]): Name: str # SSA 名（"%0"/"%result"）或常量文本（"42"/"1.5e+00"） IsConst: int # 1=常量字面量, 0=SSA 临时值 IntVal: int64 # 整数常量值（当 IsConst=1 时使用） - FloatVal: t.CDouble # 浮点常量值（当 IsConst=1 且 Ty 为 Float 时使用） + FloatVal: double # 浮点常量值（当 IsConst=1 且 Ty 为 Float 时使用） # ============================================================ # 工厂函数 # ============================================================ # Value 硬编码大小: Next(8) + Ty(8) + Name(8) + IsConst(4) + IntVal(8) + FloatVal(8) = 48 字节 -VALUE_SIZE: t.CDefine = 48 +define VALUE_SIZE = 48 def new_value(pool: memhub.MemBuddy*) -> rawptr[Value]: """从 mpool 分配一个零初始化的 Value""" @@ -82,7 +82,7 @@ def ConstZero(pool: memhub.MemBuddy*, ty: rawptr[LLVMType]) -> rawptr[Value]: def ConstFloat(pool: memhub.MemBuddy*, ty: rawptr[LLVMType], - val: t.CDouble) -> rawptr[Value]: + val: double) -> rawptr[Value]: """创建浮点常量值 参数: @@ -112,16 +112,16 @@ def ConstFloat(pool: memhub.MemBuddy*, ty: rawptr[LLVMType], if f_bits == 16: # half：先按 half 舍入（double → half 为 fptrunc），再取其 2 字节位模式 h16: t.CFloat16T = t.CFloat16T(val) - b16: t.CUInt16T = 0 - c.Load(c.Addr(b16), c.Addr(h16)) + b16: uint16 = 0 + *&b16 = *&h16 stdio.snprintf(name_buf, 64, "0x%04x", b16) elif f_bits == 32: # f32 位模式必须取 **float 的 32 位编码**，不是 double 位模式的低 32 位 # （3.14 的 double 是 0x40091EB851EB851F，低 32 位 0x51EB851F 并非 f32 # 编码 0x4048F5C3）。先把值按 f32 舍入再取其 4 字节编码。 - f32v: t.CFloat = t.CFloat(val) - b32: t.CUInt32T = 0 - c.Load(c.Addr(b32), c.Addr(f32v)) + f32v: float = float(val) + b32: uint32 = 0 + *&b32 = *&f32v stdio.snprintf(name_buf, 64, "0x%08x", b32) elif f_bits == 128: # quad：double → fp128 为无损扩展（fpext）。小端内存里低 64 位在前、 @@ -129,15 +129,15 @@ def ConstFloat(pool: memhub.MemBuddy*, ty: rawptr[LLVMType], # 注意 c.Load 的宽度取**源指针**的 pointee，故源必须显式转成 u64* # （否则会按 fp128 的 16 字节写入 8 字节目标 → 越界）。 q128: t.CFloat128T = t.CFloat128T(val) - q8: rawptr[t.CUInt8T] = (rawptr[t.CUInt8T])(c.Addr(q128)) - q_lo: t.CUInt64T = 0 - q_hi: t.CUInt64T = 0 - c.Load(c.Addr(q_lo), (rawptr[t.CUInt64T])(q8)) - c.Load(c.Addr(q_hi), (rawptr[t.CUInt64T])(q8 + 8)) + q8: rawptr[uint8] = (rawptr[uint8])(&q128) + q_lo: uint64 = 0 + q_hi: uint64 = 0 + *&q_lo = *(rawptr[uint64])(q8) + *&q_hi = *(rawptr[uint64])(q8 + 8) stdio.snprintf(name_buf, 64, "0x%016llx%016llx", q_hi, q_lo) else: - fv_bits: t.CUInt64T = 0 - c.Load(c.Addr(fv_bits), c.Addr(val)) + fv_bits: uint64 = 0 + *&fv_bits = *&val stdio.snprintf(name_buf, 64, "0x%016llx", fv_bits) v.Name = name_buf return v diff --git a/mlirlite/__verify.vp b/mlirlite/__verify.vp index af31793..546dfc7 100644 --- a/mlirlite/__verify.vp +++ b/mlirlite/__verify.vp @@ -23,11 +23,11 @@ from .__module import LLVMModule # ============================================================ # 错误码 -VERIFY_OK: t.CDefine = 0 -VERIFY_ERR_NO_TERMINATOR: t.CDefine = 1 -VERIFY_ERR_DUPLICATE_DEF: t.CDefine = 2 -VERIFY_ERR_UNDEFINED_USE: t.CDefine = 3 -VERIFY_ERR_PHI_NOT_FIRST: t.CDefine = 4 +define VERIFY_OK = 0 +define VERIFY_ERR_NO_TERMINATOR = 1 +define VERIFY_ERR_DUPLICATE_DEF = 2 +define VERIFY_ERR_UNDEFINED_USE = 3 +define VERIFY_ERR_PHI_NOT_FIRST = 4 # ============================================================ @@ -85,7 +85,7 @@ def _report_error(result: rawptr[VerifyResult], code: int, msg: str): # _append_cstr 写入位置缓存（性能优化：同一缓冲连续追加时 O(1) 定位， # 避免每次 strlen(dst) 从头扫描导致的 O(n²) —— IR 序列化热点）。 # 缓冲切换（dst 不同）或缓冲被重置（dst[0]=0 且 pos>0）时自动回退 strlen。 -_g_last_dst: t.CUInt64T = 0 +_g_last_dst: uint64 = 0 _g_last_pos: sizet = 0 def _append_cstr(dst: str, dst_size: sizet, src: str): @@ -93,7 +93,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): global _g_last_dst, _g_last_pos if dst is None or src is None: return dlen: sizet = 0 - if _g_last_dst == t.CUInt64T(dst): + if _g_last_dst == uint64(dst): dlen = _g_last_pos # 缓冲被重置（调用方 buf[0]=0 后复用同一地址）→ 回到头部 if dlen > 0 and dst[0] == '\0': @@ -107,7 +107,7 @@ def _append_cstr(dst: str, dst_size: sizet, src: str): dlen = string.strlen(dst) else: dlen = string.strlen(dst) - _g_last_dst = t.CUInt64T(dst) + _g_last_dst = uint64(dst) # 无符号下溢防护：dlen 超过缓冲大小时（缓冲已被破坏/悬空）直接返回， # 否则 remain = dst_size - dlen 下溢成巨值会把 dst[dlen+i] 写穿到缓冲外 if dlen >= dst_size: @@ -135,7 +135,7 @@ def _new_name_table(pool: memhub.MemBuddy*) -> rawptr[GSList[NameEntry]]: # NameEntry 硬编码大小: Next(8) + Name(8) = 16 字节 -NENTRY_SIZE: t.CDefine = 16 +define NENTRY_SIZE = 16 def _name_table_add(table: rawptr[GSList[NameEntry]], pool: memhub.MemBuddy*, diff --git a/numpy/__init__.vp b/numpy/__init__.vp index 7837b46..3858076 100644 --- a/numpy/__init__.vp +++ b/numpy/__init__.vp @@ -10,10 +10,10 @@ import memhub # ============================================================ # Constants # ============================================================ -MAX_NDIM: t.CDefine = 4 +define MAX_NDIM = 4 -float64: t.CTypedef = t.CDouble -float32: t.CTypedef = t.CFloat +float64: t.CTypedef = double +float32: t.CTypedef = float define pi = 3.14159265358979323846 define e = 2.71828182845904523536 @@ -28,12 +28,12 @@ define e = 2.71828182845904523536 # Default usage: ndarray[t.CDouble] for floating point. # ============================================================ class ndarray[T]: - data: T | t.CPtr + data: T* shape: t.CArray[sizet, MAX_NDIM] strides: t.CArray[sizet, MAX_NDIM] - ndim: t.CInt + ndim: int size: sizet - owns_data: t.CInt + owns_data: int pool: rawptr[memhub.MemManager] def __new__(self, pool: rawptr[memhub.MemManager], n: sizet): @@ -47,8 +47,8 @@ class ndarray[T]: self.strides[0] = 1 self.owns_data = 1 - def __add__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __add__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -56,8 +56,8 @@ class ndarray[T]: i += 1 return result - def __sub__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __sub__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -65,8 +65,8 @@ class ndarray[T]: i += 1 return result - def __mul__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __mul__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -74,8 +74,8 @@ class ndarray[T]: i += 1 return result - def __truediv__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __truediv__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -86,8 +86,8 @@ class ndarray[T]: i += 1 return result - def __floordiv__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __floordiv__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -98,8 +98,8 @@ class ndarray[T]: i += 1 return result - def __mod__(self, other: ndarray[T] | t.CPtr) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __mod__(self, other: ndarray[T]*) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -110,8 +110,8 @@ class ndarray[T]: i += 1 return result - def __neg__(self) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def __neg__(self) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None i: sizet = 0 while i < self.size: @@ -119,8 +119,8 @@ class ndarray[T]: i += 1 return result - def __len__(self) -> t.CInt: - if self.ndim > 0: return t.CInt(self.shape[0]) + def __len__(self) -> int: + if self.ndim > 0: return int(self.shape[0]) return 0 def at2d(self, row: sizet, col: sizet) -> T: @@ -141,19 +141,19 @@ class ndarray[T]: self.data[i] = val i += 1 - def copy(self) -> ndarray[T] | t.CPtr: - result: ndarray[T] | t.CPtr = _empty_like(self) + def copy(self) -> ndarray[T]*: + result: ndarray[T]* = _empty_like(self) if not result: return None string.memcpy(result.data, self.data, self.size * T.__sizeof__()) return result - def reshape(self, new_shape: INTPTR, new_ndim: t.CInt) -> ndarray[T] | t.CPtr: + def reshape(self, new_shape: INTPTR, new_ndim: int) -> ndarray[T]*: new_size: sizet = 1 - i: t.CInt = 0 + i: int = 0 for i in range(new_ndim): new_size *= sizet(new_shape[i]) if new_size != self.size: return None - result: ndarray[T] | t.CPtr = _alloc_ndarray(self.pool) + result: ndarray[T]* = _alloc_ndarray(self.pool) if not result: return None result.data = self.data result.pool = self.pool @@ -195,31 +195,31 @@ class ndarray[T]: i += 1 return m - def argmax(self) -> t.CInt: + def argmax(self) -> int: if self.size == 0: return -1 m: T = self.data[0] - idx: t.CInt = 0 + idx: int = 0 i: sizet = 1 while i < self.size: if self.data[i] > m: m = self.data[i] - idx = t.CInt(i) + idx = int(i) i += 1 return idx - def argmin(self) -> t.CInt: + def argmin(self) -> int: if self.size == 0: return -1 m: T = self.data[0] - idx: t.CInt = 0 + idx: int = 0 i: sizet = 1 while i < self.size: if self.data[i] < m: m = self.data[i] - idx = t.CInt(i) + idx = int(i) i += 1 return idx - def dot(self, other: ndarray[T] | t.CPtr) -> T: + def dot(self, other: ndarray[T]*) -> T: s: T = T(0) n: sizet = self.size if (self.size < other.size) else other.size i: sizet = 0 @@ -228,11 +228,11 @@ class ndarray[T]: i += 1 return s - def T(self) -> ndarray[T] | t.CPtr: + def T(self) -> ndarray[T]*: if self.ndim != 2: return None rows: sizet = self.shape[0] cols: sizet = self.shape[1] - result: ndarray[T] | t.CPtr = empty2d(self.pool, rows, cols) + result: ndarray[T]* = empty2d(self.pool, rows, cols) if not result: return None # Swap shape for transpose result.shape[0] = cols @@ -280,35 +280,35 @@ class ndarray[T]: # Convenience aliases: typed ndarray instantiations # (must be after class ndarray[T] definition to avoid forward reference) # ============================================================ -Float64Array: t.CTypedef = ndarray[t.CDouble] -Float32Array: t.CTypedef = ndarray[t.CFloat] -Int64Array: t.CTypedef = ndarray[t.CLong] -Int32Array: t.CTypedef = ndarray[t.CInt] -Uint8Array: t.CTypedef = ndarray[t.CUnsignedChar] +Float64Array: t.CTypedef = ndarray[double] +Float32Array: t.CTypedef = ndarray[float] +Int64Array: t.CTypedef = ndarray[int32] +Int32Array: t.CTypedef = ndarray[int] +Uint8Array: t.CTypedef = ndarray[uchar] # ============================================================ # Internal helpers (specialized for float64 by default) # Use _alloc_ndarray_t[T] / _empty_like_t[T] for other types # ============================================================ -def _alloc_ndarray(pool: rawptr[memhub.MemManager]) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = pool.alloc(ndarray[t.CDouble].__sizeof__()) +def _alloc_ndarray(pool: rawptr[memhub.MemManager]) -> ndarray[double]*: + a: ndarray[double]* = pool.alloc(ndarray[double].__sizeof__()) if a: - string.memset(a, 0, ndarray[t.CDouble].__sizeof__()) + string.memset(a, 0, ndarray[double].__sizeof__()) return a -def _compute_strides(a: ndarray[t.CDouble] | t.CPtr): +def _compute_strides(a: ndarray[double]*): if a.ndim <= 0: return a.strides[a.ndim - 1] = 1 - i: t.CInt = a.ndim - 2 + i: int = a.ndim - 2 while i >= 0: a.strides[i] = a.strides[i + 1] * a.shape[i + 1] i -= 1 -def _empty_like(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _alloc_ndarray(a.pool) +def _empty_like(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _alloc_ndarray(a.pool) if not result: return None - result.data = a.pool.alloc(a.size * t.CDouble.__sizeof__()) + result.data = a.pool.alloc(a.size * double.__sizeof__()) if not result.data: a.pool.free(result) return None @@ -316,7 +316,7 @@ def _empty_like(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: result.ndim = a.ndim result.size = a.size result.owns_data = 1 - i: t.CInt = 0 + i: int = 0 for i in range(a.ndim): result.shape[i] = a.shape[i] _compute_strides(result) @@ -326,14 +326,14 @@ def _empty_like(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: # ============================================================ # Array creation functions (float64 default) # ============================================================ -def array(pool: rawptr[memhub.MemManager], data: t.CDouble | t.CPtr, n: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = _alloc_ndarray(pool) +def array(pool: rawptr[memhub.MemManager], data: double*, n: sizet) -> ndarray[double]*: + a: ndarray[double]* = _alloc_ndarray(pool) if not a: return None - a.data = pool.alloc(n * t.CDouble.__sizeof__()) + a.data = pool.alloc(n * double.__sizeof__()) if not a.data: pool.free(a) return None - string.memcpy(a.data, data, n * t.CDouble.__sizeof__()) + string.memcpy(a.data, data, n * double.__sizeof__()) a.pool = pool a.ndim = 1 a.size = n @@ -342,14 +342,14 @@ def array(pool: rawptr[memhub.MemManager], data: t.CDouble | t.CPtr, n: sizet) - a.owns_data = 1 return a -def zeros(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = _alloc_ndarray(pool) +def zeros(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[double]*: + a: ndarray[double]* = _alloc_ndarray(pool) if not a: return None - a.data = pool.alloc(n * t.CDouble.__sizeof__()) + a.data = pool.alloc(n * double.__sizeof__()) if not a.data: pool.free(a) return None - string.memset(a.data, 0, n * t.CDouble.__sizeof__()) + string.memset(a.data, 0, n * double.__sizeof__()) a.pool = pool a.ndim = 1 a.size = n @@ -358,33 +358,33 @@ def zeros(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[t.CDouble] | t.C a.owns_data = 1 return a -def ones(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = zeros(pool, n) +def ones(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[double]*: + a: ndarray[double]* = zeros(pool, n) if not a: return None - a.fill(t.CDouble(1.0)) + a.fill(double(1.0)) return a -def full(pool: rawptr[memhub.MemManager], n: sizet, val: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = zeros(pool, n) +def full(pool: rawptr[memhub.MemManager], n: sizet, val: double) -> ndarray[double]*: + a: ndarray[double]* = zeros(pool, n) if not a: return None a.fill(val) return a -def arange(pool: rawptr[memhub.MemManager], start: t.CDouble, stop: t.CDouble, step: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - if step == t.CDouble(0.0): return None +def arange(pool: rawptr[memhub.MemManager], start: double, stop: double, step: double) -> ndarray[double]*: + if step == double(0.0): return None n: sizet = 0 - if step > t.CDouble(0.0): - v: t.CDouble = start + if step > double(0.0): + v: double = start while v < stop: n += 1 v += step else: - v: t.CDouble = start + v: double = start while v > stop: n += 1 v += step if n == 0: return None - a: ndarray[t.CDouble] | t.CPtr = zeros(pool, n) + a: ndarray[double]* = zeros(pool, n) if not a: return None i: sizet = 0 v = start @@ -394,29 +394,29 @@ def arange(pool: rawptr[memhub.MemManager], start: t.CDouble, stop: t.CDouble, s i += 1 return a -def linspace(pool: rawptr[memhub.MemManager], start: t.CDouble, stop: t.CDouble, num: sizet) -> ndarray[t.CDouble] | t.CPtr: +def linspace(pool: rawptr[memhub.MemManager], start: double, stop: double, num: sizet) -> ndarray[double]*: if num == 0: return None - a: ndarray[t.CDouble] | t.CPtr = zeros(pool, num) + a: ndarray[double]* = zeros(pool, num) if not a: return None if num == 1: a.data[0] = start return a - step: t.CDouble = (stop - start) / t.CDouble(num - 1) + step: double = (stop - start) / double(num - 1) i: sizet = 0 while i < num: - a.data[i] = start + t.CDouble(i) * step + a.data[i] = start + double(i) * step i += 1 return a -def empty2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = _alloc_ndarray(pool) +def empty2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[double]*: + a: ndarray[double]* = _alloc_ndarray(pool) if not a: return None total: sizet = rows * cols - a.data = pool.alloc(total * t.CDouble.__sizeof__()) + a.data = pool.alloc(total * double.__sizeof__()) if not a.data: pool.free(a) return None - string.memset(a.data, 0, total * t.CDouble.__sizeof__()) + string.memset(a.data, 0, total * double.__sizeof__()) a.pool = pool a.ndim = 2 a.size = total @@ -426,27 +426,27 @@ def empty2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarra _compute_strides(a) return a -def zeros2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[t.CDouble] | t.CPtr: +def zeros2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[double]*: return empty2d(pool, rows, cols) -def ones2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = empty2d(pool, rows, cols) +def ones2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet) -> ndarray[double]*: + a: ndarray[double]* = empty2d(pool, rows, cols) if not a: return None - a.fill(t.CDouble(1.0)) + a.fill(double(1.0)) return a -def eye(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = empty2d(pool, n, n) +def eye(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[double]*: + a: ndarray[double]* = empty2d(pool, n, n) if not a: return None i: sizet = 0 while i < n: - a.data[i * n + i] = t.CDouble(1.0) + a.data[i * n + i] = double(1.0) i += 1 return a -def diag(pool: rawptr[memhub.MemManager], vals: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def diag(pool: rawptr[memhub.MemManager], vals: ndarray[double]*) -> ndarray[double]*: n: sizet = vals.size - a: ndarray[t.CDouble] | t.CPtr = empty2d(pool, n, n) + a: ndarray[double]* = empty2d(pool, n, n) if not a: return None i: sizet = 0 while i < n: @@ -458,18 +458,18 @@ def diag(pool: rawptr[memhub.MemManager], vals: ndarray[t.CDouble] | t.CPtr) -> # ============================================================ # Mathematical functions (element-wise, float64 default) # ============================================================ -def np_abs(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_abs(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - v: t.CDouble = a.data[i] - result.data[i] = v if v >= t.CDouble(0.0) else -v + v: double = a.data[i] + result.data[i] = v if v >= double(0.0) else -v i += 1 return result -def np_sqrt(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_sqrt(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -477,8 +477,8 @@ def np_sqrt(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_exp(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_exp(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -486,8 +486,8 @@ def np_exp(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_log(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_log(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -495,8 +495,8 @@ def np_log(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_sin(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_sin(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -504,8 +504,8 @@ def np_sin(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_cos(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_cos(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -513,8 +513,8 @@ def np_cos(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_tan(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_tan(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -522,8 +522,8 @@ def np_tan(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_pow(a: ndarray[t.CDouble] | t.CPtr, p: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_pow(a: ndarray[double]*, p: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -535,8 +535,8 @@ def np_pow(a: ndarray[t.CDouble] | t.CPtr, p: t.CDouble) -> ndarray[t.CDouble] | # ============================================================ # Scalar operations (float64 default) # ============================================================ -def add_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def add_scalar(a: ndarray[double]*, s: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -544,8 +544,8 @@ def add_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDoubl i += 1 return result -def mul_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def mul_scalar(a: ndarray[double]*, s: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -553,8 +553,8 @@ def mul_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDoubl i += 1 return result -def sub_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def sub_scalar(a: ndarray[double]*, s: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -562,15 +562,15 @@ def sub_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDoubl i += 1 return result -def div_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def div_scalar(a: ndarray[double]*, s: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - if s != t.CDouble(0.0): + if s != double(0.0): result.data[i] = a.data[i] / s else: - result.data[i] = t.CDouble(0.0) + result.data[i] = double(0.0) i += 1 return result @@ -578,7 +578,7 @@ def div_scalar(a: ndarray[t.CDouble] | t.CPtr, s: t.CDouble) -> ndarray[t.CDoubl # ============================================================ # Matrix operations (float64 default) # ============================================================ -def matmul(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def matmul(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: # 2D matrix multiply: a(m,k) x b(k,n) = c(m,n) if a.ndim != 2 or b.ndim != 2: return None m: sizet = a.shape[0] @@ -586,13 +586,13 @@ def matmul(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> nd k2: sizet = b.shape[0] n: sizet = b.shape[1] if k != k2: return None - c: ndarray[t.CDouble] | t.CPtr = empty2d(a.pool, m, n) + c: ndarray[double]* = empty2d(a.pool, m, n) if not c: return None i: sizet = 0 while i < m: j: sizet = 0 while j < n: - s: t.CDouble = t.CDouble(0.0) + s: double = double(0.0) p: sizet = 0 while p < k: s += a.data[i * k + p] * b.data[p * n + j] @@ -602,80 +602,80 @@ def matmul(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> nd i += 1 return c -def dot_product(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def dot_product(a: ndarray[double]*, b: ndarray[double]*) -> double: return a.dot(b) # ============================================================ # Reduction operations (float64 default) # ============================================================ -def np_sum(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def np_sum(a: ndarray[double]*) -> double: return a.sum() -def np_mean(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def np_mean(a: ndarray[double]*) -> double: return a.mean() -def np_min(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def np_min(a: ndarray[double]*) -> double: return a.min() -def np_max(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def np_max(a: ndarray[double]*) -> double: return a.max() -def np_argmax(a: ndarray[t.CDouble] | t.CPtr) -> t.CInt: +def np_argmax(a: ndarray[double]*) -> int: return a.argmax() -def np_argmin(a: ndarray[t.CDouble] | t.CPtr) -> t.CInt: +def np_argmin(a: ndarray[double]*) -> int: return a.argmin() # ============================================================ # Utility (float64 default) # ============================================================ -def var(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: - if a.size == 0: return t.CDouble(0.0) - m: t.CDouble = a.mean() - s: t.CDouble = t.CDouble(0.0) +def var(a: ndarray[double]*) -> double: + if a.size == 0: return double(0.0) + m: double = a.mean() + s: double = double(0.0) i: sizet = 0 while i < a.size: - d: t.CDouble = a.data[i] - m + d: double = a.data[i] - m s += d * d i += 1 - return s / t.CDouble(a.size) + return s / double(a.size) -def std(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def std(a: ndarray[double]*) -> double: return math.sqrt(var(a)) -def norm(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def norm(a: ndarray[double]*) -> double: return math.sqrt(a.dot(a)) -def clip(a: ndarray[t.CDouble] | t.CPtr, lo: t.CDouble, hi: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def clip(a: ndarray[double]*, lo: double, hi: double) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - v: t.CDouble = a.data[i] + v: double = a.data[i] if v < lo: v = lo if v > hi: v = hi result.data[i] = v i += 1 return result -def concatenate(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def concatenate(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: if a.ndim != 1 or b.ndim != 1: return None total: sizet = a.size + b.size - result: ndarray[t.CDouble] | t.CPtr = zeros(a.pool, total) + result: ndarray[double]* = zeros(a.pool, total) if not result: return None - string.memcpy(result.data, a.data, a.size * t.CDouble.__sizeof__()) - string.memcpy(result.data + a.size, b.data, b.size * t.CDouble.__sizeof__()) + string.memcpy(result.data, a.data, a.size * double.__sizeof__()) + string.memcpy(result.data + a.size, b.data, b.size * double.__sizeof__()) return result -def sort_arr(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = a.copy() +def sort_arr(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = a.copy() if not result: return None # Simple insertion sort i: sizet = 1 while i < result.size: - key: t.CDouble = result.data[i] + key: double = result.data[i] j: sizet = i - 1 while j < result.size and result.data[j] > key: result.data[j + 1] = result.data[j] @@ -689,8 +689,8 @@ def sort_arr(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def reverse(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def reverse(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -702,8 +702,8 @@ def reverse(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: # ============================================================ # Additional math functions (element-wise, float64 default) # ============================================================ -def np_log10(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_log10(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -711,8 +711,8 @@ def np_log10(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_log2(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_log2(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -720,8 +720,8 @@ def np_log2(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_floor(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_floor(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -729,8 +729,8 @@ def np_floor(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_ceil(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_ceil(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -738,8 +738,8 @@ def np_ceil(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_round(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_round(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -747,22 +747,22 @@ def np_round(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_sign(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_sign(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - if a.data[i] > t.CDouble(0.0): - result.data[i] = t.CDouble(1.0) - elif a.data[i] < t.CDouble(0.0): - result.data[i] = t.CDouble(-1.0) + if a.data[i] > double(0.0): + result.data[i] = double(1.0) + elif a.data[i] < double(0.0): + result.data[i] = double(-1.0) else: - result.data[i] = t.CDouble(0.0) + result.data[i] = double(0.0) i += 1 return result -def np_tanh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_tanh(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -770,8 +770,8 @@ def np_tanh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_sinh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_sinh(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -779,8 +779,8 @@ def np_sinh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_cosh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_cosh(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -788,8 +788,8 @@ def np_cosh(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_arcsin(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_arcsin(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -797,8 +797,8 @@ def np_arcsin(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_arccos(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_arccos(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -806,8 +806,8 @@ def np_arccos(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_arctan(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_arctan(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -815,8 +815,8 @@ def np_arctan(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_arctan2(y: ndarray[t.CDouble] | t.CPtr, x: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(y) +def np_arctan2(y: ndarray[double]*, x: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(y) if not result: return None i: sizet = 0 while i < y.size: @@ -824,8 +824,8 @@ def np_arctan2(y: ndarray[t.CDouble] | t.CPtr, x: ndarray[t.CDouble] | t.CPtr) - i += 1 return result -def np_degrees(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_degrees(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -833,8 +833,8 @@ def np_degrees(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_radians(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_radians(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -842,26 +842,26 @@ def np_radians(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def np_isnan(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_isnan(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(math.isnan(a.data[i])) + result.data[i] = double(math.isnan(a.data[i])) i += 1 return result -def np_isinf(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_isinf(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(math.isinf(a.data[i])) + result.data[i] = double(math.isinf(a.data[i])) i += 1 return result -def np_maximum(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_maximum(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -869,8 +869,8 @@ def np_maximum(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) - i += 1 return result -def np_minimum(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_minimum(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: @@ -882,10 +882,10 @@ def np_minimum(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) - # ============================================================ # Additional array operations (float64 default) # ============================================================ -def cumsum(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def cumsum(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None - s: t.CDouble = t.CDouble(0.0) + s: double = double(0.0) i: sizet = 0 while i < a.size: s += a.data[i] @@ -893,9 +893,9 @@ def cumsum(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def diff(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def diff(a: ndarray[double]*) -> ndarray[double]*: if a.size < 2: return None - result: ndarray[t.CDouble] | t.CPtr = zeros(a.pool, a.size - 1) + result: ndarray[double]* = zeros(a.pool, a.size - 1) if not result: return None i: sizet = 0 while i < a.size - 1: @@ -903,27 +903,27 @@ def diff(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: i += 1 return result -def flatten(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def flatten(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None result.ndim = 1 result.shape[0] = a.size result.strides[0] = 1 - string.memcpy(result.data, a.data, a.size * t.CDouble.__sizeof__()) + string.memcpy(result.data, a.data, a.size * double.__sizeof__()) return result -def trace(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: - if a.ndim != 2: return t.CDouble(0.0) +def trace(a: ndarray[double]*) -> double: + if a.ndim != 2: return double(0.0) n: sizet = a.shape[0] if a.shape[0] < a.shape[1] else a.shape[1] - s: t.CDouble = t.CDouble(0.0) + s: double = double(0.0) i: sizet = 0 while i < n: s += a.data[i * a.shape[1] + i] i += 1 return s -def outer(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = empty2d(a.pool, a.size, b.size) +def outer(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = empty2d(a.pool, a.size, b.size) if not result: return None i: sizet = 0 while i < a.size: @@ -934,94 +934,94 @@ def outer(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> nda i += 1 return result -def np_where(condition: ndarray[t.CDouble] | t.CPtr, x: ndarray[t.CDouble] | t.CPtr, y: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(x) +def np_where(condition: ndarray[double]*, x: ndarray[double]*, y: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(x) if not result: return None i: sizet = 0 while i < x.size: - if condition.data[i] != t.CDouble(0.0): + if condition.data[i] != double(0.0): result.data[i] = x.data[i] else: result.data[i] = y.data[i] i += 1 return result -def np_count_nonzero(a: ndarray[t.CDouble] | t.CPtr) -> t.CInt: - count: t.CInt = 0 +def np_count_nonzero(a: ndarray[double]*) -> int: + count: int = 0 i: sizet = 0 while i < a.size: - if a.data[i] != t.CDouble(0.0): + if a.data[i] != double(0.0): count += 1 i += 1 return count -def np_all(a: ndarray[t.CDouble] | t.CPtr) -> t.CInt: +def np_all(a: ndarray[double]*) -> int: i: sizet = 0 while i < a.size: - if a.data[i] == t.CDouble(0.0): + if a.data[i] == double(0.0): return 0 i += 1 return 1 -def np_any(a: ndarray[t.CDouble] | t.CPtr) -> t.CInt: +def np_any(a: ndarray[double]*) -> int: i: sizet = 0 while i < a.size: - if a.data[i] != t.CDouble(0.0): + if a.data[i] != double(0.0): return 1 i += 1 return 0 -def np_equal(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_equal(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] == b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] == b.data[i] else double(0.0) i += 1 return result -def np_not_equal(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_not_equal(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] != b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] != b.data[i] else double(0.0) i += 1 return result -def np_less(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_less(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] < b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] < b.data[i] else double(0.0) i += 1 return result -def np_greater(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_greater(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] > b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] > b.data[i] else double(0.0) i += 1 return result -def np_less_equal(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_less_equal(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] <= b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] <= b.data[i] else double(0.0) i += 1 return result -def np_greater_equal(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def np_greater_equal(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None i: sizet = 0 while i < a.size: - result.data[i] = t.CDouble(1.0) if a.data[i] >= b.data[i] else t.CDouble(0.0) + result.data[i] = double(1.0) if a.data[i] >= b.data[i] else double(0.0) i += 1 return result @@ -1029,49 +1029,49 @@ def np_greater_equal(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.C # ============================================================ # Additional creation functions (float64 default) # ============================================================ -def empty(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[t.CDouble] | t.CPtr: +def empty(pool: rawptr[memhub.MemManager], n: sizet) -> ndarray[double]*: return zeros(pool, n) -def full2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet, val: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - a: ndarray[t.CDouble] | t.CPtr = empty2d(pool, rows, cols) +def full2d(pool: rawptr[memhub.MemManager], rows: sizet, cols: sizet, val: double) -> ndarray[double]*: + a: ndarray[double]* = empty2d(pool, rows, cols) if not a: return None a.fill(val) return a -def zeros_like(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _alloc_ndarray(a.pool) +def zeros_like(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _alloc_ndarray(a.pool) if not result: return None - result.data = a.pool.alloc(a.size * t.CDouble.__sizeof__()) + result.data = a.pool.alloc(a.size * double.__sizeof__()) if not result.data: a.pool.free(result) return None - string.memset(result.data, 0, a.size * t.CDouble.__sizeof__()) + string.memset(result.data, 0, a.size * double.__sizeof__()) result.pool = a.pool result.ndim = a.ndim result.size = a.size result.owns_data = 1 - i: t.CInt = 0 + i: int = 0 for i in range(a.ndim): result.shape[i] = a.shape[i] _compute_strides(result) return result -def ones_like(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: - result: ndarray[t.CDouble] | t.CPtr = _empty_like(a) +def ones_like(a: ndarray[double]*) -> ndarray[double]*: + result: ndarray[double]* = _empty_like(a) if not result: return None - result.fill(t.CDouble(1.0)) + result.fill(double(1.0)) return result -def arange1(pool: rawptr[memhub.MemManager], stop: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: - return arange(pool, t.CDouble(0.0), stop, t.CDouble(1.0)) +def arange1(pool: rawptr[memhub.MemManager], stop: double) -> ndarray[double]*: + return arange(pool, double(0.0), stop, double(1.0)) -def linspace2(pool: rawptr[memhub.MemManager], start: t.CDouble, stop: t.CDouble) -> ndarray[t.CDouble] | t.CPtr: +def linspace2(pool: rawptr[memhub.MemManager], start: double, stop: double) -> ndarray[double]*: return linspace(pool, start, stop, 50) -def meshgrid(x: ndarray[t.CDouble] | t.CPtr, y: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def meshgrid(x: ndarray[double]*, y: ndarray[double]*) -> ndarray[double]*: # Returns flattened grid pairs - simplified version # Returns X grid as 2D array (each row is x) - result: ndarray[t.CDouble] | t.CPtr = empty2d(x.pool, y.size, x.size) + result: ndarray[double]* = empty2d(x.pool, y.size, x.size) if not result: return None i: sizet = 0 while i < y.size: @@ -1086,17 +1086,17 @@ def meshgrid(x: ndarray[t.CDouble] | t.CPtr, y: ndarray[t.CDouble] | t.CPtr) -> # ============================================================ # Linear algebra helpers (float64 default) # ============================================================ -def det2x2(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def det2x2(a: ndarray[double]*) -> double: # Determinant of 2x2 matrix - if a.ndim != 2: return t.CDouble(0.0) - if a.shape[0] != 2 or a.shape[1] != 2: return t.CDouble(0.0) + if a.ndim != 2: return double(0.0) + if a.shape[0] != 2 or a.shape[1] != 2: return double(0.0) return a.data[0] * a.data[3] - a.data[1] * a.data[2] -def inv2x2(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def inv2x2(a: ndarray[double]*) -> ndarray[double]*: # Inverse of 2x2 matrix - d: t.CDouble = det2x2(a) - if d == t.CDouble(0.0): return None - result: ndarray[t.CDouble] | t.CPtr = empty2d(a.pool, 2, 2) + d: double = det2x2(a) + if d == double(0.0): return None + result: ndarray[double]* = empty2d(a.pool, 2, 2) if not result: return None result.data[0] = a.data[3] / d result.data[1] = -a.data[1] / d @@ -1104,56 +1104,56 @@ def inv2x2(a: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: result.data[3] = a.data[0] / d return result -def cross3(a: ndarray[t.CDouble] | t.CPtr, b: ndarray[t.CDouble] | t.CPtr) -> ndarray[t.CDouble] | t.CPtr: +def cross3(a: ndarray[double]*, b: ndarray[double]*) -> ndarray[double]*: # Cross product of 3D vectors - result: ndarray[t.CDouble] | t.CPtr = zeros(a.pool, 3) + result: ndarray[double]* = zeros(a.pool, 3) if not result: return None result.data[0] = a.data[1] * b.data[2] - a.data[2] * b.data[1] result.data[1] = a.data[2] * b.data[0] - a.data[0] * b.data[2] result.data[2] = a.data[0] * b.data[1] - a.data[1] * b.data[0] return result -def np_interp(x: t.CDouble, xp: ndarray[t.CDouble] | t.CPtr, fp: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: +def np_interp(x: double, xp: ndarray[double]*, fp: ndarray[double]*) -> double: # 1D linear interpolation - if xp.size == 0: return t.CDouble(0.0) + if xp.size == 0: return double(0.0) if x <= xp.data[0]: return fp.data[0] if x >= xp.data[xp.size - 1]: return fp.data[xp.size - 1] i: sizet = 0 while i < xp.size - 1: if x >= xp.data[i] and x <= xp.data[i + 1]: - t_val: t.CDouble = (x - xp.data[i]) / (xp.data[i + 1] - xp.data[i]) + t_val: double = (x - xp.data[i]) / (xp.data[i + 1] - xp.data[i]) return fp.data[i] + t_val * (fp.data[i + 1] - fp.data[i]) i += 1 return fp.data[xp.size - 1] -def prod(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: - p: t.CDouble = t.CDouble(1.0) +def prod(a: ndarray[double]*) -> double: + p: double = double(1.0) i: sizet = 0 while i < a.size: p *= a.data[i] i += 1 return p -def median(a: ndarray[t.CDouble] | t.CPtr) -> t.CDouble: - if a.size == 0: return t.CDouble(0.0) - s: ndarray[t.CDouble] | t.CPtr = sort_arr(a) - if not s: return t.CDouble(0.0) +def median(a: ndarray[double]*) -> double: + if a.size == 0: return double(0.0) + s: ndarray[double]* = sort_arr(a) + if not s: return double(0.0) mid: sizet = a.size / 2 if a.size % 2 == 1: - result: t.CDouble = s.data[mid] + result: double = s.data[mid] else: - result = (s.data[mid - 1] + s.data[mid]) / t.CDouble(2.0) + result = (s.data[mid - 1] + s.data[mid]) / double(2.0) s.delete() return result -def percentile(a: ndarray[t.CDouble] | t.CPtr, q: t.CDouble) -> t.CDouble: - if a.size == 0: return t.CDouble(0.0) - s: ndarray[t.CDouble] | t.CPtr = sort_arr(a) - if not s: return t.CDouble(0.0) - idx: t.CDouble = q / t.CDouble(100.0) * t.CDouble(a.size - 1) +def percentile(a: ndarray[double]*, q: double) -> double: + if a.size == 0: return double(0.0) + s: ndarray[double]* = sort_arr(a) + if not s: return double(0.0) + idx: double = q / double(100.0) * double(a.size - 1) lo: sizet = sizet(math.floor(idx)) hi: sizet = sizet(math.ceil(idx)) - frac: t.CDouble = idx - math.floor(idx) - result: t.CDouble = s.data[lo] + frac * (s.data[hi] - s.data[lo]) + frac: double = idx - math.floor(idx) + result: double = s.data[lo] + frac * (s.data[hi] - s.data[lo]) s.delete() return result diff --git a/openssl/bio.vp b/openssl/bio.vp index 7d765ce..2971354 100644 --- a/openssl/bio.vp +++ b/openssl/bio.vp @@ -54,15 +54,15 @@ extern def BIO_ctrl_wpending(b: BioPtr) -> sizet # ---- BIO 控制（宏的底层 ctrl；连接/非阻塞等由它实现）---- # long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg) -extern def BIO_ctrl(bp: BioPtr, cmd: int, larg: t.CInt32T, parg: bytes) -> t.CInt32T +extern def BIO_ctrl(bp: BioPtr, cmd: int, larg: int32, parg: bytes) -> int32 # int BIO_do_connect(BIO *b) —— 宏：BIO_ctrl(b, BIO_C_DO_STATE_MACHINE, 0, NULL) -BioCDoStateMachine: t.CDefine = 101 -BioCSetConnect: t.CDefine = 100 -BioCSetNbio: t.CDefine = 102 -BioCSetFd: t.CDefine = 104 -BioCGetFd: t.CDefine = 105 -BioNoclose: t.CDefine = 0x00 -BioClose: t.CDefine = 0x01 +define BioCDoStateMachine = 101 +define BioCSetConnect = 100 +define BioCSetNbio = 102 +define BioCSetFd = 104 +define BioCGetFd = 105 +define BioNoclose = 0x00 +define BioClose = 0x01 # BIO 链 # BIO *BIO_push(BIO *b, BIO *append) / BIO *BIO_pop(BIO *b) extern def BIO_push(b: BioPtr, append: BioPtr) -> BioPtr @@ -88,11 +88,11 @@ def bio_do_connect(b: BioPtr) -> int: # ============================================================ # Socket 原语（BIO 层直接管 fd） # ============================================================ -BioSockReuseaddr: t.CDefine = 0x01 -BioSockV6Only: t.CDefine = 0x02 -BioSockKeepalive: t.CDefine = 0x04 -BioSockNonblock: t.CDefine = 0x08 -BioSockNodelay: t.CDefine = 0x10 +define BioSockReuseaddr = 0x01 +define BioSockV6Only = 0x02 +define BioSockKeepalive = 0x04 +define BioSockNonblock = 0x08 +define BioSockNodelay = 0x10 # int BIO_socket(int domain, int socktype, int protocol, int options) extern def BIO_socket(domain: int, socktype: int, protocol: int, options: int) -> int @@ -125,7 +125,7 @@ extern def BIO_ADDR_free(ap: BioAddrPtr) # int BIO_ADDR_family(const BIO_ADDR *ap) extern def BIO_ADDR_family(ap: BioAddrPtr) -> int # unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap) -extern def BIO_ADDR_rawport(ap: BioAddrPtr) -> t.CUInt16T +extern def BIO_ADDR_rawport(ap: BioAddrPtr) -> uint16 # int BIO_ADDR_rawaddress(const BIO_ADDR *ap, void *p, size_t *l) extern def BIO_ADDR_rawaddress(ap: BioAddrPtr, p: bytes, l: bytes) -> int # char *BIO_ADDR_hostname_string(const BIO_ADDR *ap, int numeric) → 返回需 CRYPTO_free @@ -149,8 +149,8 @@ extern def BIO_ADDRINFO_protocol(bai: BioAddrInfoPtr) -> int extern def BIO_ADDRINFO_address(bai: BioAddrInfoPtr) -> BioAddrPtr # 主机名解析（getaddrinfo 封装） -BioLookupClient: t.CDefine = 0 -BioLookupServer: t.CDefine = 1 +define BioLookupClient = 0 +define BioLookupServer = 1 # int BIO_lookup(const char *host, const char *service, int lookup_type, # int family, int socktype, BIO_ADDRINFO **res) extern def BIO_lookup(host: str, service: str, lookup_type: int, diff --git a/openssl/crypto.vp b/openssl/crypto.vp index 53d84c9..5c3eb25 100644 --- a/openssl/crypto.vp +++ b/openssl/crypto.vp @@ -7,44 +7,44 @@ from openssl.types import * # ============================================================ # ---- 版本查询类型（OpenSSL_version(type) 的 type 取值）---- -OpenSslVersion: t.CDefine = 0 # OPENSSL_VERSION 完整版本文本 -OpenSslBuiltOn: t.CDefine = 2 # OPENSSL_BUILT_ON 编译时间 -OpenSslPlatform: t.CDefine = 3 # OPENSSL_PLATFORM 平台 -OpenSslDir: t.CDefine = 4 # OPENSSL_DIR -OpenSslEnginesDir: t.CDefine = 5 # OPENSSL_ENGINES_DIR -OpenSslVersionString: t.CDefine = 6 # OPENSSL_VERSION_STRING "3.x.y" -OpenSslModulesDir: t.CDefine = 8 # OPENSSL_MODULES_DIR -OpenSslCpuInfo: t.CDefine = 9 # OPENSSL_CPU_INFO +define OpenSslVersion = 0# OPENSSL_VERSION 完整版本文本 +define OpenSslBuiltOn = 2# OPENSSL_BUILT_ON 编译时间 +define OpenSslPlatform = 3# OPENSSL_PLATFORM 平台 +define OpenSslDir = 4# OPENSSL_DIR +define OpenSslEnginesDir = 5# OPENSSL_ENGINES_DIR +define OpenSslVersionString = 6# OPENSSL_VERSION_STRING "3.x.y" +define OpenSslModulesDir = 8# OPENSSL_MODULES_DIR +define OpenSslCpuInfo = 9# OPENSSL_CPU_INFO # ---- OPENSSL_init_crypto / OPENSSL_init_ssl 选项位 ---- -OpenSslInitNoLoadCryptoStrings: t.CDefine = 0x00000001 -OpenSslInitNoLoadConfig: t.CDefine = 0x00000004 -OpenSslInitNoAddAllCiphers: t.CDefine = 0x00000008 -OpenSslInitNoAddAllDigests: t.CDefine = 0x00000010 -OpenSslInitLoadConfig: t.CDefine = 0x00000040 -OpenSslInitAsync: t.CDefine = 0x00000080 -OpenSslInitDebugFile: t.CDefine = 0x00010000 -OpenSslInitAtFork: t.CDefine = 0x00020000 -OpenSslInitNoLoadSslStrings: t.CDefine = 0x00100000 -OpenSslInitNoAtomics: t.CDefine = 0x00200000 +define OpenSslInitNoLoadCryptoStrings = 0x00000001 +define OpenSslInitNoLoadConfig = 0x00000004 +define OpenSslInitNoAddAllCiphers = 0x00000008 +define OpenSslInitNoAddAllDigests = 0x00000010 +define OpenSslInitLoadConfig = 0x00000040 +define OpenSslInitAsync = 0x00000080 +define OpenSslInitDebugFile = 0x00010000 +define OpenSslInitAtFork = 0x00020000 +define OpenSslInitNoLoadSslStrings = 0x00100000 +define OpenSslInitNoAtomics = 0x00200000 # ---- 版本号（3.6.2，随链接库而定）---- -OpenSslVersionMajor: t.CDefine = 3 -OpenSslVersionMinor: t.CDefine = 6 -OpenSslVersionPatch: t.CDefine = 2 +define OpenSslVersionMajor = 3 +define OpenSslVersionMinor = 6 +define OpenSslVersionPatch = 2 # ---- 全局初始化 / 清理 ---- # int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) -extern def OPENSSL_init_crypto(opts: t.CUInt64T, settings: bytes) -> int +extern def OPENSSL_init_crypto(opts: uint64, settings: bytes) -> int # int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) -extern def OPENSSL_init_ssl(opts: t.CUInt64T, settings: bytes) -> int +extern def OPENSSL_init_ssl(opts: uint64, settings: bytes) -> int extern def OPENSSL_cleanup() # ---- 版本查询 ---- # const char *OpenSSL_version(int type) extern def OpenSSL_version(type: int) -> str # unsigned long OpenSSL_version_num(void) -extern def OpenSSL_version_num() -> t.CUInt32T +extern def OpenSSL_version_num() -> uint32 extern def OPENSSL_version_pre_release() -> str extern def OPENSSL_version_build_metadata() -> str @@ -58,9 +58,9 @@ extern def CRYPTO_malloc(num: sizet, file: str, line: int) -> bytes # int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len) extern def CRYPTO_memcmp(in_a: bytes, in_b: bytes, len: sizet) -> int # char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen) → 由 ossl_free 释放 -extern def OPENSSL_buf2hexstr(buf: bytes, buflen: t.CInt32T) -> str +extern def OPENSSL_buf2hexstr(buf: bytes, buflen: int32) -> str # int OPENSSL_hexchar2int(unsigned char c) -extern def OPENSSL_hexchar2int(c: t.CUInt8T) -> int +extern def OPENSSL_hexchar2int(c: uint8) -> int # int OPENSSL_strcasecmp(const char *s1, const char *s2) extern def OPENSSL_strcasecmp(s1: str, s2: str) -> int # int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n) diff --git a/openssl/err.vp b/openssl/err.vp index ba04dbc..5a3caf6 100644 --- a/openssl/err.vp +++ b/openssl/err.vp @@ -7,24 +7,24 @@ from openssl.types import * # ============================================================ # unsigned long ERR_get_error(void) — 弹出队列头并返回错误码 -extern def ERR_get_error() -> t.CUInt32T +extern def ERR_get_error() -> uint32 # unsigned long ERR_peek_error(void) -extern def ERR_peek_error() -> t.CUInt32T +extern def ERR_peek_error() -> uint32 # unsigned long ERR_peek_last_error(void) -extern def ERR_peek_last_error() -> t.CUInt32T +extern def ERR_peek_last_error() -> uint32 # void ERR_clear_error(void) extern def ERR_clear_error() # char *ERR_error_string(unsigned long e, char *buf) — buf 可为 NULL（用内部静态缓冲） -extern def ERR_error_string(e: t.CUInt32T, buf: bytes) -> str +extern def ERR_error_string(e: uint32, buf: bytes) -> str # void ERR_error_string_n(unsigned long e, char *buf, size_t len) -extern def ERR_error_string_n(e: t.CUInt32T, buf: bytes, len: sizet) +extern def ERR_error_string_n(e: uint32, buf: bytes, len: sizet) # const char *ERR_lib_error_string(unsigned long e) -extern def ERR_lib_error_string(e: t.CUInt32T) -> str +extern def ERR_lib_error_string(e: uint32) -> str # const char *ERR_func_error_string(unsigned long e) -extern def ERR_func_error_string(e: t.CUInt32T) -> str +extern def ERR_func_error_string(e: uint32) -> str # const char *ERR_reason_error_string(unsigned long e) -extern def ERR_reason_error_string(e: t.CUInt32T) -> str +extern def ERR_reason_error_string(e: uint32) -> str # 栈标记（用于部分失败回滚） extern def ERR_set_mark() -> int @@ -37,15 +37,15 @@ extern def ERR_print_errors(bp: BioPtr) # ---- 错误码拆包（内联宏等价物）---- # OpenSSL 错误码布局：系统位 0x80000000，库 24-31，原因 0-15 -ErrLibMask: t.CDefine = 0xff000000 -ErrReasonMask: t.CDefine = 0x0000ffff -ErrSystemFlag: t.CDefine = 0x80000000 +define ErrLibMask = 0xff000000 +define ErrReasonMask = 0x0000ffff +define ErrSystemFlag = 0x80000000 -def err_get_lib(code: t.CUInt32T) -> int: +def err_get_lib(code: uint32) -> int: if (code & ErrSystemFlag) != 0: return 0 return (code >> 24) & 0xff -def err_get_reason(code: t.CUInt32T) -> int: +def err_get_reason(code: uint32) -> int: return code & ErrReasonMask diff --git a/openssl/evp.vp b/openssl/evp.vp index 049ceee..a98ef21 100644 --- a/openssl/evp.vp +++ b/openssl/evp.vp @@ -9,10 +9,10 @@ from openssl.types import * # Base64 编解码（EVP_EncodeBlock/DecodeBlock）、非对称（EVP_PKEY* 签名/验签/加解密） # ============================================================ -EvpMaxMdSize: t.CDefine = 64 -EvpMaxKeyLength: t.CDefine = 64 -EvpMaxIvLength: t.CDefine = 16 -EvpMaxBlockLength: t.CDefine = 32 +define EvpMaxMdSize = 64 +define EvpMaxKeyLength = 64 +define EvpMaxIvLength = 16 +define EvpMaxBlockLength = 32 # ============================================================ # 1) 摘要算法对象（const EVP_MD*） @@ -160,9 +160,9 @@ extern def EVP_CIPHER_CTX_get_iv(ctx: EvpCipherCtxPtr, iv: bytes, len: sizet) -> extern def EVP_CIPHER_CTX_set_iv(ctx: EvpCipherCtxPtr, iv: bytes, len: sizet) -> int # ---- GCM 相关 ctrl 常量（EVP_CIPHER_CTX_ctrl 使用）---- -EvpCtrlGcmSetIvl: t.CDefine = 0x9 # EVP_CTRL_AEAD_SET_IVLEN -EvpCtrlGcmGetTag: t.CDefine = 0x10 # EVP_CTRL_AEAD_GET_TAG -EvpCtrlGcmSetTag: t.CDefine = 0x11 # EVP_CTRL_AEAD_SET_TAG +define EvpCtrlGcmSetIvl = 0x9# EVP_CTRL_AEAD_SET_IVLEN +define EvpCtrlGcmGetTag = 0x10# EVP_CTRL_AEAD_GET_TAG +define EvpCtrlGcmSetTag = 0x11# EVP_CTRL_AEAD_SET_TAG # ============================================================ # 5) Base64（EVP 编解码块函数） diff --git a/openssl/md5.vp b/openssl/md5.vp index b3ba8db..0881825 100644 --- a/openssl/md5.vp +++ b/openssl/md5.vp @@ -6,7 +6,7 @@ from openssl.types import * # 对应头文件: md5.h # ============================================================ -Md5DigestLength: t.CDefine = 16 +define Md5DigestLength = 16 # unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) extern def MD5(d: bytes, n: sizet, md: bytes) -> bytes diff --git a/openssl/objects.vp b/openssl/objects.vp index 0fa1e0b..0889404 100644 --- a/openssl/objects.vp +++ b/openssl/objects.vp @@ -7,28 +7,28 @@ from openssl.types import * # ============================================================ # ---- 常用 NID（obj_mac.h 常量）---- -NidCommonName: t.CDefine = 13 -NidCountryName: t.CDefine = 14 -NidLocalityName: t.CDefine = 15 -NidStateOrProvinceName: t.CDefine = 16 -NidOrganizationName: t.CDefine = 17 -NidOrganizationalUnitName: t.CDefine = 18 -NidEmailAddress: t.CDefine = 48 -NidSerialNumber: t.CDefine = 105 -NidSubjectKeyIdentifier: t.CDefine = 82 -NidKeyUsage: t.CDefine = 83 -NidSubjectAltName: t.CDefine = 85 -NidIssuerAltName: t.CDefine = 86 -NidBasicConstraints: t.CDefine = 87 -NidAuthorityKeyIdentifier: t.CDefine = 90 -NidCrlDistributionPoints: t.CDefine = 103 -NidExtKeyUsage: t.CDefine = 126 -NidRsaEncryption: t.CDefine = 6 -NidSha1: t.CDefine = 64 -NidSha256: t.CDefine = 672 -NidMd5: t.CDefine = 4 -NidHmac: t.CDefine = 855 -NidX9_62IdEcPublicKey: t.CDefine = 408 +define NidCommonName = 13 +define NidCountryName = 14 +define NidLocalityName = 15 +define NidStateOrProvinceName = 16 +define NidOrganizationName = 17 +define NidOrganizationalUnitName = 18 +define NidEmailAddress = 48 +define NidSerialNumber = 105 +define NidSubjectKeyIdentifier = 82 +define NidKeyUsage = 83 +define NidSubjectAltName = 85 +define NidIssuerAltName = 86 +define NidBasicConstraints = 87 +define NidAuthorityKeyIdentifier = 90 +define NidCrlDistributionPoints = 103 +define NidExtKeyUsage = 126 +define NidRsaEncryption = 6 +define NidSha1 = 64 +define NidSha256 = 672 +define NidMd5 = 4 +define NidHmac = 855 +define NidX9_62IdEcPublicKey = 408 # ---- OBJ / NID 转换 ---- # int OBJ_txt2nid(const char *s) diff --git a/openssl/rand.vp b/openssl/rand.vp index 1886a47..3f90426 100644 --- a/openssl/rand.vp +++ b/openssl/rand.vp @@ -15,7 +15,7 @@ extern def RAND_status() -> int # int RAND_poll(void) extern def RAND_poll() -> int # int RAND_load_file(const char *file, long max_bytes) -extern def RAND_load_file(file: str, max_bytes: t.CInt32T) -> int +extern def RAND_load_file(file: str, max_bytes: int32) -> int # int RAND_write_file(const char *file) extern def RAND_write_file(file: str) -> int # void RAND_seed(const void *buf, int num) diff --git a/openssl/sha.vp b/openssl/sha.vp index 8e26d80..2ed85ab 100644 --- a/openssl/sha.vp +++ b/openssl/sha.vp @@ -9,11 +9,11 @@ from openssl.types import * # 这里保留传统一次性接口，方便快速算摘要。 # ============================================================ -ShaDigestLength: t.CDefine = 20 -Sha224DigestLength: t.CDefine = 28 -Sha256DigestLength: t.CDefine = 32 -Sha384DigestLength: t.CDefine = 48 -Sha512DigestLength: t.CDefine = 64 +define ShaDigestLength = 20 +define Sha224DigestLength = 28 +define Sha256DigestLength = 32 +define Sha384DigestLength = 48 +define Sha512DigestLength = 64 # unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) extern def SHA1(d: bytes, n: sizet, md: bytes) -> bytes diff --git a/openssl/ssl.vp b/openssl/ssl.vp index b0a80e6..700620e 100644 --- a/openssl/ssl.vp +++ b/openssl/ssl.vp @@ -17,60 +17,60 @@ from openssl.types import * # ============================================================ # ---- 证书文件格式（SSL_CTX_use_*_file / use_certificate_file 的 type）---- -X509FiletypePem: t.CDefine = 1 -X509FiletypeAsn1: t.CDefine = 2 +define X509FiletypePem = 1 +define X509FiletypeAsn1 = 2 # SSL_FILETYPE_* 与 X509_FILETYPE_* 同值 -SslFiletypePem: t.CDefine = 1 -SslFiletypeAsn1: t.CDefine = 2 +define SslFiletypePem = 1 +define SslFiletypeAsn1 = 2 # ---- 校验模式（SSL_CTX_set_verify mode）---- -SslVerifyNone: t.CDefine = 0x00 -SslVerifyPeer: t.CDefine = 0x01 -SslVerifyFailIfNoPeerCert: t.CDefine = 0x02 -SslVerifyClientOnce: t.CDefine = 0x04 +define SslVerifyNone = 0x00 +define SslVerifyPeer = 0x01 +define SslVerifyFailIfNoPeerCert = 0x02 +define SslVerifyClientOnce = 0x04 # ---- 协议版本（SSL_CTX_ctrl SSL_CTRL_SET_MIN/MAX_PROTO_VERSION 的 arg）---- -Tls1Version: t.CDefine = 0x0301 -Tls1_1Version: t.CDefine = 0x0302 -Tls1_2Version: t.CDefine = 0x0303 -Tls1_3Version: t.CDefine = 0x0304 +define Tls1Version = 0x0301 +define Tls1_1Version = 0x0302 +define Tls1_2Version = 0x0303 +define Tls1_3Version = 0x0304 # ---- ctrl 命令 ---- -SslCtrlSetTlsextHostname: t.CDefine = 55 # SSL_ctrl(ssl, ..., TLSEXT_NAMETYPE_host_name, (void*)name) -SslCtrlSetMinProtoVersion: t.CDefine = 123 -SslCtrlSetMaxProtoVersion: t.CDefine = 124 -SslCtrlMode: t.CDefine = 33 -SslCtrlClearMode: t.CDefine = 34 -TlsextNametypeHostName: t.CDefine = 0 +define SslCtrlSetTlsextHostname = 55# SSL_ctrl(ssl, ..., TLSEXT_NAMETYPE_host_name, (void*)name) +define SslCtrlSetMinProtoVersion = 123 +define SslCtrlSetMaxProtoVersion = 124 +define SslCtrlMode = 33 +define SslCtrlClearMode = 34 +define TlsextNametypeHostName = 0 # ---- shutdown 状态 ---- -SslSentShutdown: t.CDefine = 1 -SslReceivedShutdown: t.CDefine = 2 +define SslSentShutdown = 1 +define SslReceivedShutdown = 2 # ---- SSL_get_error 返回码 ---- -SslErrorNone: t.CDefine = 0 -SslErrorSsl: t.CDefine = 1 -SslErrorWantRead: t.CDefine = 2 -SslErrorWantWrite: t.CDefine = 3 -SslErrorWantX509Lookup: t.CDefine = 4 -SslErrorSyscall: t.CDefine = 5 -SslErrorZeroReturn: t.CDefine = 6 -SslErrorWantConnect: t.CDefine = 7 -SslErrorWantAccept: t.CDefine = 8 -SslErrorWantAsync: t.CDefine = 9 -SslErrorWantAsyncJob: t.CDefine = 10 -SslErrorWantClientHelloCb: t.CDefine = 11 -SslErrorWantRetryVerify: t.CDefine = 12 +define SslErrorNone = 0 +define SslErrorSsl = 1 +define SslErrorWantRead = 2 +define SslErrorWantWrite = 3 +define SslErrorWantX509Lookup = 4 +define SslErrorSyscall = 5 +define SslErrorZeroReturn = 6 +define SslErrorWantConnect = 7 +define SslErrorWantAccept = 8 +define SslErrorWantAsync = 9 +define SslErrorWantAsyncJob = 10 +define SslErrorWantClientHelloCb = 11 +define SslErrorWantRetryVerify = 12 # ---- SSL_OP_* 选项 ---- # SSL_CTX_set_options(ctx, uint64_t) -SslOpNoSslv2: t.CDefine = 0x01000000 -SslOpNoSslv3: t.CDefine = 0x02000000 -SslOpNoTlsv1: t.CDefine = 0x04000000 -SslOpNoTlsv1_2: t.CDefine = 0x08000000 -SslOpNoTlsv1_1: t.CDefine = 0x10000000 -SslOpNoTlsv1_3: t.CDefine = 0x20000000 -SslOpAll: t.CDefine = 0x00000fff +define SslOpNoSslv2 = 0x01000000 +define SslOpNoSslv3 = 0x02000000 +define SslOpNoTlsv1 = 0x04000000 +define SslOpNoTlsv1_2 = 0x08000000 +define SslOpNoTlsv1_1 = 0x10000000 +define SslOpNoTlsv1_3 = 0x20000000 +define SslOpAll = 0x00000fff # ============================================================ # 初始化 / 方法 @@ -113,11 +113,11 @@ extern def SSL_CTX_set_cipher_list(ctx: SslCtxPtr, cipher_list: str) -> int # int SSL_CTX_set_ciphersuites(SSL_CTX *ctx, const char *str) (TLS1.3) extern def SSL_CTX_set_ciphersuites(ctx: SslCtxPtr, suites: str) -> int # int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos, unsigned int protos_len) -extern def SSL_CTX_set_alpn_protos(ctx: SslCtxPtr, protos: bytes, protos_len: t.CUInt32T) -> int +extern def SSL_CTX_set_alpn_protos(ctx: SslCtxPtr, protos: bytes, protos_len: uint32) -> int # uint64_t SSL_CTX_set_options(SSL_CTX *ctx, uint64_t op) -extern def SSL_CTX_set_options(ctx: SslCtxPtr, op: t.CUInt64T) -> t.CUInt64T +extern def SSL_CTX_set_options(ctx: SslCtxPtr, op: uint64) -> uint64 # long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) -extern def SSL_CTX_ctrl(ctx: SslCtxPtr, cmd: int, larg: t.CInt32T, parg: bytes) -> t.CInt32T +extern def SSL_CTX_ctrl(ctx: SslCtxPtr, cmd: int, larg: int32, parg: bytes) -> int32 # long SSL_CTX_set_timeout(SSL_CTX *ctx, long t) -- 用 ctrl? 不是，是函数 # int SSL_CTX_set_session_cache_mode(SSL_CTX *ctx, int mode) @@ -157,7 +157,7 @@ extern def SSL_get_error(s: SslPtr, ret_code: int) -> int # const char *SSL_get_version(const SSL *s) extern def SSL_get_version(s: SslPtr) -> str # long SSL_get_verify_result(const SSL *ssl) -extern def SSL_get_verify_result(ssl: SslPtr) -> t.CInt32T +extern def SSL_get_verify_result(ssl: SslPtr) -> int32 # int SSL_get_verify_mode(const SSL *ssl) extern def SSL_get_verify_mode(ssl: SslPtr) -> int # X509 *SSL_get_peer_certificate(const SSL *s) / SSL_get1_peer_certificate @@ -178,9 +178,9 @@ extern def SSL_get_servername(s: SslPtr, type: int) -> str extern def SSL_get0_alpn_selected(ssl: SslPtr, data: bytes, len: bytes) # 控制 / 选项 # long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg) -extern def SSL_ctrl(ssl: SslPtr, cmd: int, larg: t.CInt32T, parg: bytes) -> t.CInt32T +extern def SSL_ctrl(ssl: SslPtr, cmd: int, larg: int32, parg: bytes) -> int32 # uint64_t SSL_set_options(SSL *ssl, uint64_t op) -extern def SSL_set_options(ssl: SslPtr, op: t.CUInt64T) -> t.CUInt64T +extern def SSL_set_options(ssl: SslPtr, op: uint64) -> uint64 # int SSL_set1_host(SSL *s, const char *hostname) (主机名校验) extern def SSL_set1_host(s: SslPtr, hostname: str) -> int # void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio) diff --git a/openssl/x509.vp b/openssl/x509.vp index db1abc2..4052c0b 100644 --- a/openssl/x509.vp +++ b/openssl/x509.vp @@ -8,10 +8,10 @@ from openssl.types import * # 证书网络解析场景：读取 subject/issuer/SAN/有效期/公钥、链式校验。 # ============================================================ -X509VOk: t.CDefine = 0 -X509Version1: t.CDefine = 0 -X509Version2: t.CDefine = 1 -X509Version3: t.CDefine = 2 +define X509VOk = 0 +define X509Version1 = 0 +define X509Version2 = 1 +define X509Version3 = 2 # ============================================================ # 1) 证书对象生命周期 @@ -28,7 +28,7 @@ extern def i2d_X509_bio(bp: BioPtr, x509: X509Ptr) -> int # 2) 证书字段读取 # ============================================================ # long X509_get_version(const X509 *x) -extern def X509_get_version(x: X509Ptr) -> t.CInt32T +extern def X509_get_version(x: X509Ptr) -> int32 # ASN1_INTEGER *X509_get_serialNumber(X509 *x) extern def X509_get_serialNumber(x: X509Ptr) -> Asn1IntegerPtr # X509_NAME *X509_get_subject_name(const X509 *a) @@ -85,7 +85,7 @@ extern def X509_EXTENSION_get_object(ex: X509ExtensionPtr) -> Asn1ObjectPtr extern def X509_EXTENSION_get_data(ne: X509ExtensionPtr) -> Asn1OctetStringPtr # int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent) extern def X509V3_EXT_print(out: BioPtr, ext: X509ExtensionPtr, - flag: t.CUInt32T, indent: int) -> int + flag: uint32, indent: int) -> int # GENERAL_NAME 遍历（SAN：DNS/URI/IP/email） extern def GENERAL_NAME_free(a: GeneralNamePtr) @@ -100,10 +100,10 @@ extern def OPENSSL_sk_value(st: bytes, i: int) -> GeneralNamePtr # void OPENSSL_sk_free(OPENSSL_STACK *st) extern def OPENSSL_sk_free(st: bytes) # const char *OBJ_nid2sn ... 已放 objects.vp；此处放 GNR 常量 -GenEmail: t.CDefine = 1 -GenDns: t.CDefine = 2 -GenUri: t.CDefine = 6 -GenIpadd: t.CDefine = 7 +define GenEmail = 1 +define GenDns = 2 +define GenUri = 6 +define GenIpadd = 7 # ---- SAN 便捷读取（把某类 GENERAL_NAME 数量统计）---- def x509_san_count(gns: GeneralNamesPtr) -> int: @@ -146,7 +146,7 @@ extern def X509_STORE_CTX_get_error_depth(ctx: X509StoreCtxPtr) -> int # X509 *X509_STORE_CTX_get_current_cert(const X509_STORE_CTX *ctx) extern def X509_STORE_CTX_get_current_cert(ctx: X509StoreCtxPtr) -> X509Ptr # const char *X509_verify_cert_error_string(long n) -extern def X509_verify_cert_error_string(n: t.CInt32T) -> str +extern def X509_verify_cert_error_string(n: int32) -> str # ============================================================ # 6) ASN.1 字符串 / 时间助手（asn1.h） @@ -162,15 +162,15 @@ extern def ASN1_STRING_to_UTF8(out: bytes, inn: Asn1StringPtr) -> int # int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v) extern def ASN1_STRING_print(bp: BioPtr, v: Asn1StringPtr) -> int # int ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags) -extern def ASN1_STRING_print_ex(out: BioPtr, str: Asn1StringPtr, flags: t.CUInt32T) -> int +extern def ASN1_STRING_print_ex(out: BioPtr, str: Asn1StringPtr, flags: uint32) -> int # int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm) extern def ASN1_TIME_print(bp: BioPtr, tm: Asn1TimePtr) -> int # int ASN1_TIME_compare(const ASN1_TIME *a, const ASN1_TIME *b) extern def ASN1_TIME_compare(a: Asn1TimePtr, b: Asn1TimePtr) -> int # int ASN1_INTEGER_get(const ASN1_INTEGER *a) -extern def ASN1_INTEGER_get(a: Asn1IntegerPtr) -> t.CInt32T +extern def ASN1_INTEGER_get(a: Asn1IntegerPtr) -> int32 # int ASN1_INTEGER_set(ASN1_INTEGER *a, long v) -extern def ASN1_INTEGER_set(a: Asn1IntegerPtr, v: t.CInt32T) -> int +extern def ASN1_INTEGER_set(a: Asn1IntegerPtr, v: int32) -> int # int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a) → 十进制打印到 BIO extern def i2a_ASN1_INTEGER(bp: BioPtr, a: Asn1IntegerPtr) -> int # const char *ASN1_tag2str(int tag) diff --git a/os/__init__.vp b/os/__init__.vp index a59972a..373b107 100644 --- a/os/__init__.vp +++ b/os/__init__.vp @@ -40,7 +40,7 @@ def isfile(path: str) -> bool: return os._posix.isfile(path) -def getsize(path: str) -> t.CInt64T: +def getsize(path: str) -> int64: """Returns the file size (in bytes). Returns -1 on failure.""" if platmacro.IS_WINDOWS: return os._win32.getsize(path) diff --git a/os/_posix.vp b/os/_posix.vp index 3ce8887..dda9f84 100644 --- a/os/_posix.vp +++ b/os/_posix.vp @@ -6,7 +6,7 @@ import stdlib # POSIX 路径最大长度 -MAX_PATH_LEN: t.CDefine = 4096 +define MAX_PATH_LEN = 4096 # 模块级全局 MBuddy 指针（由用户在 main 中赋值初始化） _mbuddy: memhub.MemBuddy* @@ -20,10 +20,10 @@ def _stat(path: str) -> rawptr[posix.Stat]: """调用 stat 并返回 Stat 结构体指针。失败返回 None。 注意：Stat 结构体通过 _mbuddy 分配，调用者负责释放。""" st: posix.Stat = posix.Stat() - result: INT = posix.stat(path, t.CPtr(c.Addr(st))) + result: INT = posix.stat(path, t.CPtr(&st)) if result != 0: return None - return t.CPtr(c.Addr(st)) + return t.CPtr(&st) def exists(path: str) -> bool: @@ -37,7 +37,7 @@ def exists(path: str) -> bool: def isdir(path: str) -> bool: """检查路径是否为目录""" st: posix.Stat = posix.Stat() - result: INT = posix.stat(path, t.CPtr(c.Addr(st))) + result: INT = posix.stat(path, t.CPtr(&st)) if result != 0: return False if posix.S_ISDIR(st.st_mode): @@ -48,7 +48,7 @@ def isdir(path: str) -> bool: def isfile(path: str) -> bool: """检查路径是否为普通文件""" st: posix.Stat = posix.Stat() - result: INT = posix.stat(path, t.CPtr(c.Addr(st))) + result: INT = posix.stat(path, t.CPtr(&st)) if result != 0: return False if posix.S_ISREG(st.st_mode): @@ -56,10 +56,10 @@ def isfile(path: str) -> bool: return False -def getsize(path: str) -> t.CInt64T: +def getsize(path: str) -> int64: """返回文件大小（字节）。失败返回 -1。""" st: posix.Stat = posix.Stat() - result: INT = posix.stat(path, t.CPtr(c.Addr(st))) + result: INT = posix.stat(path, t.CPtr(&st)) if result != 0: return -1 return st.st_size diff --git a/os/_win32.vp b/os/_win32.vp index 20f368a..f2376e0 100644 --- a/os/_win32.vp +++ b/os/_win32.vp @@ -7,10 +7,10 @@ import stdlib # Windows 路径最大长度 -MAX_PATH_LEN: t.CDefine = 260 +define MAX_PATH_LEN = 260 # INVALID_FILE_ATTRIBUTES -INVALID_FILE_ATTRIBUTES: t.CDefine = 0xFFFFFFFF +define INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF # 模块级全局 MBuddy 指针（由用户在 main 中赋值初始化） _mbuddy: memhub.MemBuddy* @@ -53,7 +53,7 @@ def isfile(path: str) -> bool: return True -def getsize(path: str) -> t.CInt64T: +def getsize(path: str) -> int64: """返回文件大小（字节）。失败返回 -1。""" handle: w32.win32base.HANDLE = w32.win32file.CreateFileA( path, w32.win32file.GENERIC_READ, w32.win32file.FILE_SHARE_READ, @@ -62,7 +62,7 @@ def getsize(path: str) -> t.CInt64T: if handle == w32.win32base.INVALID_HANDLE_VALUE: return -1 li: w32.win32base.LARGE_INTEGER = w32.win32base.LARGE_INTEGER() - result: BOOL = w32.win32file.GetFileSizeEx(handle, t.CPtr(c.Addr(li))) + result: BOOL = w32.win32file.GetFileSizeEx(handle, t.CPtr(&li)) w32.win32base.CloseHandle(handle) if result == 0: return -1 @@ -197,7 +197,7 @@ def listdir(path: str, out_names: str*, max_count: ULONG) -> ULONG: pattern[i] = 0 find_data: w32.win32file.WIN32_FIND_DATAA = w32.win32file.WIN32_FIND_DATAA() - handle: w32.win32base.HANDLE = w32.win32file.FindFirstFileA(pattern, t.CPtr(c.Addr(find_data))) + handle: w32.win32base.HANDLE = w32.win32file.FindFirstFileA(pattern, t.CPtr(&find_data)) if handle == w32.win32base.INVALID_HANDLE_VALUE: return 0 @@ -208,12 +208,12 @@ def listdir(path: str, out_names: str*, max_count: ULONG) -> ULONG: if name[0] == '.': if name[1] == 0: # "." - if w32.win32file.FindNextFileA(handle, t.CPtr(c.Addr(find_data))) == 0: + if w32.win32file.FindNextFileA(handle, t.CPtr(&find_data)) == 0: break continue if name[1] == '.' and name[2] == 0: # ".." - if w32.win32file.FindNextFileA(handle, t.CPtr(c.Addr(find_data))) == 0: + if w32.win32file.FindNextFileA(handle, t.CPtr(&find_data)) == 0: break continue @@ -229,7 +229,7 @@ def listdir(path: str, out_names: str*, max_count: ULONG) -> ULONG: out_names[count] = str(name_buf) count += 1 - if w32.win32file.FindNextFileA(handle, t.CPtr(c.Addr(find_data))) == 0: + if w32.win32file.FindNextFileA(handle, t.CPtr(&find_data)) == 0: break w32.win32file.FindClose(handle) diff --git a/posix.vp b/posix.vp index 6485e93..1343c1c 100644 --- a/posix.vp +++ b/posix.vp @@ -7,17 +7,17 @@ from stdint import * # Note: ssize_t has already been defined as t.CPtrDiffT in stdint.py, so we won’t repeat it here. # ============================================================================= DIR: t.CTypedef = t.CPtr # Opaque directory stream handle -mode_t: t.CTypedef = t.CUInt32T # File mode/permission bits -pid_t: t.CTypedef = t.CInt32T # Process ID -off_t: t.CTypedef = t.CInt64T # File offset (Linux x86_64) -dev_t: t.CTypedef = t.CUInt64T # Device number -ino_t: t.CTypedef = t.CUInt64T # inode number -nlink_t: t.CTypedef = t.CUInt64T # Hard link count -uid_t: t.CTypedef = t.CUInt32T # User ID -gid_t: t.CTypedef = t.CUInt32T # Group ID -blksize_t: t.CTypedef = t.CInt64T # File I/O block size -blkcnt_t: t.CTypedef = t.CInt64T # Allocated block count -time_t: t.CTypedef = t.CInt64T # Calendar time seconds +mode_t: t.CTypedef = uint32 # File mode/permission bits +pid_t: t.CTypedef = int32 # Process ID +off_t: t.CTypedef = int64 # File offset (Linux x86_64) +dev_t: t.CTypedef = uint64 # Device number +ino_t: t.CTypedef = uint64 # inode number +nlink_t: t.CTypedef = uint64 # Hard link count +uid_t: t.CTypedef = uint32 # User ID +gid_t: t.CTypedef = uint32 # Group ID +blksize_t: t.CTypedef = int64 # File I/O block size +blkcnt_t: t.CTypedef = int64 # Allocated block count +time_t: t.CTypedef = int64 # Calendar time seconds # ============================================================================= @@ -176,15 +176,15 @@ extern def chmod(path: t.CConst | str, mode: mode_t) -> INT # ============================================================================= # stat series (2) # ============================================================================= -extern def stat(path: t.CConst | str, buf: Stat | t.CPtr) -> INT -extern def fstat(fd: INT, buf: Stat | t.CPtr) -> INT +extern def stat(path: t.CConst | str, buf: Stat*) -> INT +extern def fstat(fd: INT, buf: Stat*) -> INT # ============================================================================= # Directory operations (6) # ============================================================================= extern def opendir(name: t.CConst | str) -> DIR -extern def readdir(dirp: DIR) -> Dirent | t.CPtr +extern def readdir(dirp: DIR) -> Dirent* extern def closedir(dirp: DIR) -> INT extern def mkdir(path: t.CConst | str, mode: mode_t) -> INT extern def rmdir(path: t.CConst | str) -> INT @@ -196,10 +196,10 @@ extern def chdir(path: t.CConst | str) -> INT # Process operations (8) # ============================================================================= extern def fork() -> pid_t -extern def execvp(file: t.CConst | str, argv: CHARPTR | t.CPtr) -> INT -extern def execv(path: t.CConst | str, argv: CHARPTR | t.CPtr) -> INT -extern def waitpid(pid: pid_t, status: INT | t.CPtr, options: INT) -> pid_t -extern def pipe(fds: INT | t.CPtr) -> INT +extern def execvp(file: t.CConst | str, argv: CHARPTR*) -> INT +extern def execv(path: t.CConst | str, argv: CHARPTR*) -> INT +extern def waitpid(pid: pid_t, status: INT*, options: INT) -> pid_t +extern def pipe(fds: INT*) -> INT extern def dup2(oldfd: INT, newfd: INT) -> INT extern def _exit(status: INT) extern def getpid() -> pid_t diff --git a/random.vp b/random.vp index 25047b1..6125aeb 100644 --- a/random.vp +++ b/random.vp @@ -14,23 +14,23 @@ define RDSEED_RETRY_LIMIT = 100 # ============================================================ def rdrand16() -> uint16: val: uint32 = 0 - c.Asm(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return uint16(val) def rdrand32() -> uint32: val: uint32 = 0 - c.Asm(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return val def rdrand64() -> uint64: val: uint64 = 0 - c.Asm(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return val @@ -39,23 +39,23 @@ def rdrand64() -> uint64: # ============================================================ def rdseed16() -> uint16: val: uint32 = 0 - c.Asm(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return uint16(val) def rdseed32() -> uint32: val: uint32 = 0 - c.Asm(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return val def rdseed64() -> uint64: val: uint64 = 0 - c.Asm(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC]) + __asm__(f"rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)}", + out=[asmout(val, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC]) return val @@ -69,8 +69,8 @@ def rdrand16_step(p: rawptr[uint16]) -> int: c.Asm(f"""rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = uint16(val) return int(ok) @@ -80,8 +80,8 @@ def rdrand32_step(p: rawptr[uint32]) -> int: c.Asm(f"""rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = val return int(ok) @@ -91,8 +91,8 @@ def rdrand64_step(p: rawptr[uint64]) -> int: c.Asm(f"""rdrand {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = val return int(ok) @@ -102,8 +102,8 @@ def rdseed16_step(p: rawptr[uint16]) -> int: c.Asm(f"""rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = uint16(val) return int(ok) @@ -113,8 +113,8 @@ def rdseed32_step(p: rawptr[uint32]) -> int: c.Asm(f"""rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = val return int(ok) @@ -124,8 +124,8 @@ def rdseed64_step(p: rawptr[uint64]) -> int: c.Asm(f"""rdseed {c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG)} setc al movzx {c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)}, al""", - out=[c.AsmOut(val, t.ASM_DESCR.OUTPUT_REG), c.AsmOut(ok, t.ASM_DESCR.OUTPUT_REG)], - op=[t.ASM_DESCR.CLOBBER_CC, t.ASM_DESCR.CLOBBER_AL]) + out=[asmout(val, ASM_DESCR.OUTPUT_REG), asmout(ok, ASM_DESCR.OUTPUT_REG)], + op=[ASM_DESCR.CLOBBER_CC, ASM_DESCR.CLOBBER_AL]) p[0] = val return int(ok) diff --git a/requests/__init__.vp b/requests/__init__.vp index fb255d3..1862d9b 100644 --- a/requests/__init__.vp +++ b/requests/__init__.vp @@ -30,9 +30,9 @@ _mbuddy: memhub.MemBuddy* # Socket initialization flag _socket_ready: bool = False -HTTP_PORT: t.CDefine = 80 -HTTP_BUFSIZ: t.CDefine = 4096 -GZIP_BUFSIZ: t.CDefine = 65536 +define HTTP_PORT = 80 +define HTTP_BUFSIZ = 4096 +define GZIP_BUFSIZ = 65536 # 模块内重定向 / 失败诊断（静态缓冲） _http_err_store: t.CArray[char, 512] @@ -79,10 +79,10 @@ def _EnsureSocketInit() -> INT: return result -def _AllocResponse() -> Response | t.CPtr: +def _AllocResponse() -> Response*: """Allocate Response struct from _mbuddy and initialize it in-place.""" if _mbuddy is None: return None - resp: Response | t.CPtr = _mbuddy.alloc(Response.__sizeof__()) + resp: Response* = _mbuddy.alloc(Response.__sizeof__()) if resp is None: return None resp.status_code = 0 resp.text = None @@ -92,7 +92,7 @@ def _AllocResponse() -> Response | t.CPtr: return resp -def _ParseUrl(url: str, host_buf: str, host_size: INT, path_buf: str, path_size: INT, port: INT | t.CPtr) -> INT: +def _ParseUrl(url: str, host_buf: str, host_size: INT, path_buf: str, path_size: INT, port: INT*) -> INT: """Parse URL and extract host, port, and path.""" if url is None: return -1 if host_buf is None or path_buf is None or port is None: return -1 @@ -143,7 +143,7 @@ def _ParseUrl(url: str, host_buf: str, host_size: INT, path_buf: str, path_size: return 0 -def _ParseStatusLine(resp_text: str, out_code: INT | t.CPtr) -> INT: +def _ParseStatusLine(resp_text: str, out_code: INT*) -> INT: """Parse HTTP status line and extract status code.""" if resp_text is None or out_code is None: return -1 @@ -167,7 +167,7 @@ def _ParseStatusLine(resp_text: str, out_code: INT | t.CPtr) -> INT: p += 1 if p[0] == '\n': p += 1 - return INT(t.CUInt64T(p) - t.CUInt64T(resp_text)) + return INT(uint64(p) - uint64(resp_text)) def _FindBodyStart(resp_text: str, resp_len: INT) -> INT: @@ -179,16 +179,16 @@ def _FindBodyStart(resp_text: str, resp_len: INT) -> INT: end_of_headers = string.strstr(resp_text, "\n\n") if end_of_headers is None: return -1 - return INT(t.CUInt64T(end_of_headers) - t.CUInt64T(resp_text)) + 2 + return INT(uint64(end_of_headers) - uint64(resp_text)) + 2 - return INT(t.CUInt64T(end_of_headers) - t.CUInt64T(resp_text)) + 4 + return INT(uint64(end_of_headers) - uint64(resp_text)) + 4 # ============================================================ # 公共辅助（供 requests.https 等子模块复用） # ============================================================ -def create_response() -> Response | t.CPtr: +def create_response() -> Response*: """Create and initialize an empty HTTP Response (allocated from _mbuddy). Call release(resp) to free it after use. @@ -196,7 +196,7 @@ def create_response() -> Response | t.CPtr: return _AllocResponse() -def parse_status_line(resp_text: str, out_code: INT | t.CPtr) -> INT: +def parse_status_line(resp_text: str, out_code: INT*) -> INT: """Parse HTTP status line, write status code into out_code.""" return _ParseStatusLine(resp_text, out_code) @@ -217,7 +217,7 @@ def _CIEq(a: char, b: char) -> bool: return a == b -def header_value(resp: Response | t.CPtr, name: str, out: str, out_size: INT) -> INT: +def header_value(resp: Response*, name: str, out: str, out_size: INT) -> INT: """在原始响应中按名查询响应头（大小写不敏感，返回首值）。 Args: @@ -322,7 +322,7 @@ def decode_chunked(src: str, src_len: INT, dst: str, dst_cap: INT) -> INT: return w -def parse_response(resp: Response | t.CPtr, total: INT) -> INT: +def parse_response(resp: Response*, total: INT) -> INT: """统一解析已接收的原始响应并填充 Response 字段。 - 解析状态码 / 定位正文 @@ -335,7 +335,7 @@ def parse_response(resp: Response | t.CPtr, total: INT) -> INT: buf: str = resp._raw_buf buf[total] = 0 - _ParseStatusLine(buf, c.Addr(resp.status_code)) + _ParseStatusLine(buf, &resp.status_code) body_offset: INT = _FindBodyStart(buf, total) if body_offset < 0 or body_offset >= total: resp.text = None @@ -376,12 +376,12 @@ def parse_response(resp: Response | t.CPtr, total: INT) -> INT: and resp.text is not None and resp.body_len > 0: src_len2: sizet = sizet(resp.body_len) olen2: sizet = 0 - gz_out: BYTEPTR = pyzlib.decompress(_mbuddy, BYTEPTR(resp.text), src_len2, 15, GZIP_BUFSIZ, c.Addr(olen2)) + gz_out: BYTEPTR = pyzlib.decompress(_mbuddy, BYTEPTR(resp.text), src_len2, 15, GZIP_BUFSIZ, &olen2) if gz_out is not None: old_owned: str = resp._body_owned if old_owned is not None: _mbuddy.free(old_owned) - gz_str: str = char(t.CUInt64T(gz_out), t.CPtr) + gz_str: str = char(uint64(gz_out), t.CPtr) gz_str[olen2] = 0 resp._body_owned = gz_str resp.text = gz_str @@ -397,11 +397,11 @@ def parse_response(resp: Response | t.CPtr, total: INT) -> INT: # 公共 API # ============================================================ -def _HttpGetOnce(url: str) -> Response | t.CPtr: +def _HttpGetOnce(url: str) -> Response*: """HTTP GET 单次请求（不跟随重定向）。请求头带 Accept-Encoding: gzip。""" if _mbuddy is None: return None - resp: Response | t.CPtr = _AllocResponse() + resp: Response* = _AllocResponse() if resp is None: return None if _EnsureSocketInit() != 0: @@ -413,7 +413,7 @@ def _HttpGetOnce(url: str) -> Response | t.CPtr: path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: release(resp) return None @@ -470,11 +470,11 @@ def _HttpGetOnce(url: str) -> Response | t.CPtr: return resp -def _HttpPostOnce(url: str, data: str = None, content_type: str = "application/x-www-form-urlencoded") -> Response | t.CPtr: +def _HttpPostOnce(url: str, data: str = None, content_type: str = "application/x-www-form-urlencoded") -> Response*: """HTTP POST 单次请求（不跟随重定向）。请求头带 Accept-Encoding: gzip。""" if _mbuddy is None: return None - resp: Response | t.CPtr = _AllocResponse() + resp: Response* = _AllocResponse() if resp is None: return None if _EnsureSocketInit() != 0: @@ -486,7 +486,7 @@ def _HttpPostOnce(url: str, data: str = None, content_type: str = "application/x path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: release(resp) return None @@ -571,7 +571,7 @@ def _ResolveRedirectUrl(base: str, loc: str, out: str, cap: INT) -> INT: if q[0] != '/': return -1 q += 1 while q[0] != '\0' and q[0] != '/': q += 1 - prefix_len: INT = INT(t.CUInt64T(q) - t.CUInt64T(base)) + prefix_len: INT = INT(uint64(q) - uint64(base)) need: INT = prefix_len + lb + 2 if need >= cap: return -1 i: INT = 0 @@ -594,7 +594,7 @@ def _ResolveRedirectUrl(base: str, loc: str, out: str, cap: INT) -> INT: return 0 -def _HttpRedirectLoop(method: str, url: str, data: str, content_type: str) -> Response | t.CPtr: +def _HttpRedirectLoop(method: str, url: str, data: str, content_type: str) -> Response*: """GET/POST + 重定向跟随（http:// 链，最多 5 跳）。""" if _mbuddy is None: return None @@ -608,7 +608,7 @@ def _HttpRedirectLoop(method: str, url: str, data: str, content_type: str) -> Re hop: INT = 0 while hop < 5: - resp: Response | t.CPtr = None + resp: Response* = None if string.strcmp(method, "POST") == 0: resp = _HttpPostOnce(cur, data, content_type) else: @@ -665,7 +665,7 @@ def _IsHttpRedirect(code: INT) -> bool: return code >= 300 and code < 400 -def get(url: str) -> Response | t.CPtr: +def get(url: str) -> Response*: """HTTP GET（自动跟随 3xx 重定向，最多 5 跳）。 Args: @@ -676,12 +676,12 @@ def get(url: str) -> Response | t.CPtr: return _HttpRedirectLoop("GET", url, None, None) -def post(url: str, data: str = None, content_type: str = "application/x-www-form-urlencoded") -> Response | t.CPtr: +def post(url: str, data: str = None, content_type: str = "application/x-www-form-urlencoded") -> Response*: """HTTP POST（自动跟随 3xx 重定向，最多 5 跳）。""" return _HttpRedirectLoop("POST", url, data, content_type) -def release(resp: Response | t.CPtr): +def release(resp: Response*): """Release Response object and its internal buffers. Args: @@ -693,7 +693,7 @@ def release(resp: Response | t.CPtr): _mbuddy.free(resp._body_owned) if resp._raw_buf is not None: _mbuddy.free(resp._raw_buf) - _mbuddy.free(t.CPtr(t.CUInt64T(resp))) + _mbuddy.free(t.CPtr(uint64(resp))) # ============================================================ @@ -796,14 +796,14 @@ def _CRTotalOf(buf: str, total: INT) -> sizet: def _DlOnce(url: str, start: sizet, count: INT, dst: str, dst_cap: INT, - out_status: INT | t.CPtr, out_loc: str, out_loccap: INT, + out_status: INT*, out_loc: str, out_loccap: INT, out_total: sizet*) -> INT: """HTTP 单次 Range 拉取（线程安全，见模块注释）。""" if url is None or dst is None or dst_cap <= 0 \ or out_status is None or out_total is None: return -1 - c.Set(c.Deref(out_status), 0) - c.Set(c.Deref(out_total), 0) + c.Set(*out_status, 0) + c.Set(*out_total, 0) if out_loc is not None and out_loccap > 0: out_loc[0] = 0 @@ -814,7 +814,7 @@ def _DlOnce(url: str, start: sizet, count: INT, dst: str, dst_cap: INT, host_buf: t.CArray[char, 256] path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: _SetHttpError("bad http url") return -3 @@ -870,7 +870,7 @@ def _DlOnce(url: str, start: sizet, count: INT, dst: str, dst_cap: INT, dst[total] = 0 st: INT = _StatusRaw(dst) - c.Set(c.Deref(out_status), st) + c.Set(*out_status, st) if st == 0: _SetHttpError("empty response") return -3 @@ -884,11 +884,11 @@ def _DlOnce(url: str, start: sizet, count: INT, dst: str, dst_cap: INT, return -3 if st == 206: - c.Set(c.Deref(out_total), _CRTotalOf(dst, total)) + c.Set(*out_total, _CRTotalOf(dst, total)) else: cl2: INT = _CLenOf(dst, total) if cl2 > 0: - c.Set(c.Deref(out_total), sizet(cl2)) + c.Set(*out_total, sizet(cl2)) bo: INT = _FindBodyStart(dst, total) if bo < 0 or bo >= total: return 0 diff --git a/requests/download.vp b/requests/download.vp index 79a6d45..3dcd378 100644 --- a/requests/download.vp +++ b/requests/download.vp @@ -32,9 +32,9 @@ import w32.win32sync as wsync # - 每片请求不带 Accept-Encoding，响应为原始字节，直接落盘。 # ============================================================ -DL_MAX_THREADS: t.CDefine = 8 -DL_DEFAULT_CHUNK: t.CDefine = 262144 -DL_REDIRECT_MAX: t.CDefine = 5 +define DL_MAX_THREADS = 8 +define DL_DEFAULT_CHUNK = 262144 +define DL_REDIRECT_MAX = 5 _dl_err_store: t.CArray[char, 512] @@ -87,10 +87,10 @@ def _dl_slice(url: str, pos: sizet, want: INT, verify: bool, ca_file: str, loc: t.CArray[char, 512] if is_https != 0: rc = rhttps._DlOnce(cur, pos, want, verify, ca_file, dst, dst_cap, - c.Addr(st), loc, 512, c.Addr(tot)) + &st, loc, 512, &tot) else: rc = requests._DlOnce(cur, pos, want, dst, dst_cap, - c.Addr(st), loc, 512, c.Addr(tot)) + &st, loc, 512, &tot) if rc == -2 and loc[0] != 0: hops += 1 if hops > DL_REDIRECT_MAX: @@ -113,7 +113,7 @@ def _dl_slice(url: str, pos: sizet, want: INT, verify: bool, ca_file: str, stdlib.free(cur) if rc < 0: return rc - c.Set(c.Deref(out_total), tot) + c.Set(*out_total, tot) return rc @@ -155,11 +155,11 @@ def _dl_write_at(path: str, src: str, length: INT, offset: sizet) -> INT: wb.CloseHandle(h) return -1 written: ULONG = 0 - ok_w: BOOL = wf.WriteFile(h, src, t.CUnsignedLong(length), c.Addr(written), None) + ok_w: BOOL = wf.WriteFile(h, src, uint32(length), &written, None) wb.CloseHandle(h) if ok_w == 0: return -1 - if t.CInt(written) != length: + if int(written) != length: return -1 return 0 @@ -185,19 +185,19 @@ def _dl_probe(url: str, verify: bool, ca_file: str, """探测服务器总大小与 Range 支持。 返回 0=支持 Range 且 out_total 有效；1=服务器返回 200（不支持 Range， 退化为整段下载，out_total=Content-Length）；-3 失败。""" - c.Set(c.Deref(out_total), 0) + c.Set(*out_total, 0) buf: str = stdlib.malloc(8192) if buf is None: _dl_set_err("out of memory") return -3 tot: sizet = 0 - rc: INT = _dl_slice(url, 0, 0, verify, ca_file, buf, 8192, c.Addr(tot)) + rc: INT = _dl_slice(url, 0, 0, verify, ca_file, buf, 8192, &tot) stdlib.free(buf) if rc < 0: _dl_set_err("probe failed") return -3 if tot > 0: - c.Set(c.Deref(out_total), tot) + c.Set(*out_total, tot) return 0 _dl_set_err("cannot determine size") return -3 @@ -218,7 +218,7 @@ def _dl_download_band(path: str, url: str, is_https: INT, verify: bool, ca_file: if b_end - pos < sizet(want): want = INT(b_end - pos) tot: sizet = 0 - rc: INT = _dl_slice(url, pos, want, verify, ca_file, buf, buf_cap, c.Addr(tot)) + rc: INT = _dl_slice(url, pos, want, verify, ca_file, buf, buf_cap, &tot) if rc <= 0: _dl_set_err("slice fetch failed") return -1 @@ -235,7 +235,7 @@ def _dl_download_band(path: str, url: str, is_https: INT, verify: bool, ca_file: if _dl_write_at(path, buf + bo, got, pos) != 0: _dl_set_err("write file failed") return -2 - c.Set(c.Deref(p_done), c.Deref(p_done) + sizet(got)) + c.Set(*p_done, *p_done + sizet(got)) pos += sizet(got) if got < want: # 服务端提前结束（正常收尾时仅末片 < want） @@ -267,13 +267,13 @@ class DlJob: def _dl_worker(arg: VOIDPTR) -> t.CPtr: if arg is None: return None - job: DlJob | t.CPtr = arg + job: DlJob* = arg rc: INT = _dl_download_band( job.path, job.url, job.is_https, True if job.verify != 0 else False, job.ca_file, job.start, job.end, job.chunk, job.buf, job.buf_cap, - c.Addr(job.done)) + &job.done) if rc != 0: job.status = rc return None @@ -315,7 +315,7 @@ def download(url: str, path: str, threads: INT = 1, # 探测总大小与 Range 支持 total: sizet = 0 - prc: INT = _dl_probe(url, verify, ca_file, c.Addr(total)) + prc: INT = _dl_probe(url, verify, ca_file, &total) if prc < 0: return -3 if total == 0: @@ -340,7 +340,7 @@ def download(url: str, path: str, threads: INT = 1, return -3 done: sizet = 0 rc: INT = _dl_download_band(path, url, 0, verify, ca_file, - 0, total, chunk_size, buf, slab, c.Addr(done)) + 0, total, chunk_size, buf, slab, &done) stdlib.free(buf) if rc != 0: return -3 if rc == -1 else -4 @@ -361,7 +361,7 @@ def download(url: str, path: str, threads: INT = 1, b_end: sizet = b_start + band if b_end > total: b_end = total - job: DlJob | t.CPtr = stdlib.calloc(1, DlJob.__sizeof__()) + job: DlJob* = stdlib.calloc(1, DlJob.__sizeof__()) if job is None: break job.path = _dl_strdup(path) @@ -369,7 +369,7 @@ def download(url: str, path: str, threads: INT = 1, if job.path is None or job.url is None: stdlib.free(job.path) stdlib.free(job.url) - stdlib.free(t.CPtr(t.CUInt64T(job))) + stdlib.free(t.CPtr(uint64(job))) break job.is_https = 1 if (string.strncmp(url, "https://", 8) == 0) else 0 job.verify = 1 if verify else 0 @@ -384,11 +384,11 @@ def download(url: str, path: str, threads: INT = 1, stdlib.free(job.url) if job.ca_file is not None: stdlib.free(job.ca_file) - stdlib.free(t.CPtr(t.CUInt64T(job))) + stdlib.free(t.CPtr(uint64(job))) break job.done = 0 job.status = 0 - ctxs[i] = t.CPtr(t.CUInt64T(job)) + ctxs[i] = t.CPtr(uint64(job)) th: rawptr[vt.Thread] = vt.Thread(_dl_worker, ctxs[i]) if th is None: @@ -397,7 +397,7 @@ def download(url: str, path: str, threads: INT = 1, stdlib.free(job.url) if job.ca_file is not None: stdlib.free(job.ca_file) - stdlib.free(t.CPtr(t.CUInt64T(job))) + stdlib.free(t.CPtr(uint64(job))) break th.start() handles[i] = th.handle @@ -420,7 +420,7 @@ def download(url: str, path: str, threads: INT = 1, failed_job: INT = 0 k: INT = 0 while k < threads_ok: - jobk: DlJob | t.CPtr = ctxs[k] + jobk: DlJob* = ctxs[k] total_done += jobk.done if jobk.status != 0: failed_job = 1 @@ -429,13 +429,13 @@ def download(url: str, path: str, threads: INT = 1, # 释放线程上下文 m: INT = 0 while m < threads_ok: - jobm: DlJob | t.CPtr = ctxs[m] + jobm: DlJob* = ctxs[m] stdlib.free(jobm.path) stdlib.free(jobm.url) if jobm.ca_file is not None: stdlib.free(jobm.ca_file) stdlib.free(jobm.buf) - stdlib.free(t.CPtr(t.CUInt64T(jobm))) + stdlib.free(t.CPtr(uint64(jobm))) m += 1 if failed_job != 0 or total_done != total: diff --git a/requests/https.vp b/requests/https.vp index f2c472b..da659fa 100644 --- a/requests/https.vp +++ b/requests/https.vp @@ -29,7 +29,7 @@ import memhub # - 握手成功后可用 last_tls_info() 查看 TLS 版本 / 加密套件 / 对端证书主题。 # ============================================================ -HTTPS_PORT: t.CDefine = 443 +define HTTPS_PORT = 443 # 模块内部状态 _ossl_ready: bool = False @@ -47,7 +47,7 @@ _last_verify_flag: INT = -1 # 最近一次请求 verify 标志（1= # _st_state: 0=运行中 1=完成(2xx) 2=失败 # _st_status: HTTP 状态码（失败网络路径为负错误码） # ============================================================ -STREAM_CAP: t.CDefine = 262144 +define STREAM_CAP = 262144 _st_buf: t.CArray[char, 262144] _st_len: sizet = 0 _st_consumed: sizet = 0 @@ -154,7 +154,7 @@ def _EnsureReady() -> INT: return 0 -def _ParseHttpsUrl(url: str, host_buf: str, host_size: INT, path_buf: str, path_size: INT, port: INT | t.CPtr) -> INT: +def _ParseHttpsUrl(url: str, host_buf: str, host_size: INT, path_buf: str, path_size: INT, port: INT*) -> INT: """解析 https://host[:port][/path]，端口缺省 443。""" if url is None: return -1 if host_buf is None or path_buf is None or port is None: return -1 @@ -212,7 +212,7 @@ def _ScratchBuf() -> str: def _TlsErrText(): """把最近一次 openssl 错误队列文本写入静态 scratch 缓冲。""" - e: t.CUInt32T = openssl.ERR_get_error() + e: uint32 = openssl.ERR_get_error() if e == 0: _scratch_store[0] = 0 string.strncpy(_scratch_store, "openssl error (no detail)", 26) @@ -255,7 +255,7 @@ def _HttpsRequest(method: str, url: str, verify: bool, ca_file: str, data: str, path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: stdio.snprintf(errmsg, 512, "bad https url: %s", url) _RecordErrorText(errmsg) requests._mbuddy.free(errmsg) @@ -343,7 +343,7 @@ def _HttpsRequest(method: str, url: str, verify: bool, ca_file: str, data: str, # ---- 证书链校验结果复核 ---- if verify: - vres: t.CInt32T = openssl.SSL_get_verify_result(ssl) + vres: int32 = openssl.SSL_get_verify_result(ssl) if vres != 0: reason: str = openssl.X509_verify_cert_error_string(vres) if reason is None: @@ -461,7 +461,7 @@ def _HttpsRequest(method: str, url: str, verify: bool, ca_file: str, data: str, requests._mbuddy.free(errmsg) requests.release(resp) return None - resp_buf = char(t.CUInt64T(nb), t.CPtr) + resp_buf = char(uint64(nb), t.CPtr) room = resp_cap - 1 - total n: INT = openssl.SSL_read(ssl, resp_buf + total, room) if n <= 0: @@ -669,7 +669,7 @@ def post_stream(url: str, data: str, content_type: str = "application/json", host_buf: t.CArray[char, 256] path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: stdio.snprintf(errmsg, 512, "bad https url: %s", url) _RecordErrorText(errmsg) _SetStreamFail(-1) @@ -743,7 +743,7 @@ def post_stream(url: str, data: str, content_type: str = "application/json", return -1 if verify: - vres: t.CInt32T = openssl.SSL_get_verify_result(ssl) + vres: int32 = openssl.SSL_get_verify_result(ssl) if vres != 0: reason: str = openssl.X509_verify_cert_error_string(vres) if reason is None: @@ -930,7 +930,7 @@ def post_stream(url: str, data: str, content_type: str = "application/json", # ============================================================ def _DlOnce(url: str, start: sizet, count: INT, verify: bool, ca_file: str, - dst: str, dst_cap: INT, out_status: INT | t.CPtr, + dst: str, dst_cap: INT, out_status: INT*, out_loc: str, out_loccap: INT, out_total: sizet*) -> INT: """HTTPS 单次 Range 拉取（线程安全，见模块注释）。""" @@ -938,8 +938,8 @@ def _DlOnce(url: str, start: sizet, count: INT, verify: bool, ca_file: str, if url is None or dst is None or dst_cap <= 0 \ or out_status is None or out_total is None: return -1 - c.Set(c.Deref(out_status), 0) - c.Set(c.Deref(out_total), 0) + c.Set(*out_status, 0) + c.Set(*out_total, 0) if out_loc is not None and out_loccap > 0: out_loc[0] = 0 _last_verify_flag = 1 if verify else 0 @@ -950,7 +950,7 @@ def _DlOnce(url: str, start: sizet, count: INT, verify: bool, ca_file: str, host_buf: t.CArray[char, 256] path_buf: t.CArray[char, 1024] port: INT = 0 - if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, c.Addr(port)) != 0: + if _ParseHttpsUrl(url, host_buf, 256, path_buf, 1024, &port) != 0: _RecordErrorText("bad https url") return -3 @@ -1064,7 +1064,7 @@ def _DlOnce(url: str, start: sizet, count: INT, verify: bool, ca_file: str, dst[total] = 0 st: INT = requests._StatusRaw(dst) - c.Set(c.Deref(out_status), st) + c.Set(*out_status, st) if st == 0: _RecordErrorText("empty response") return -3 @@ -1078,11 +1078,11 @@ def _DlOnce(url: str, start: sizet, count: INT, verify: bool, ca_file: str, return -3 if st == 206: - c.Set(c.Deref(out_total), requests._CRTotalOf(dst, total)) + c.Set(*out_total, requests._CRTotalOf(dst, total)) else: cl2: INT = requests._CLenOf(dst, total) if cl2 > 0: - c.Set(c.Deref(out_total), sizet(cl2)) + c.Set(*out_total, sizet(cl2)) bo: INT = requests._FindBodyStart(dst, total) if bo < 0 or bo >= total: return 0 diff --git a/rwlock.vp b/rwlock.vp index 5e11a75..a015afc 100644 --- a/rwlock.vp +++ b/rwlock.vp @@ -24,19 +24,19 @@ class RWLock: lock: SRWLOCK def __init__(self): - InitializeSRWLock(c.Addr(self.lock)) + InitializeSRWLock(&self.lock) def acquire_read(self): - AcquireSRWLockShared(c.Addr(self.lock)) + AcquireSRWLockShared(&self.lock) def release_read(self): - ReleaseSRWLockShared(c.Addr(self.lock)) + ReleaseSRWLockShared(&self.lock) def acquire_write(self): - AcquireSRWLockExclusive(c.Addr(self.lock)) + AcquireSRWLockExclusive(&self.lock) def release_write(self): - ReleaseSRWLockExclusive(c.Addr(self.lock)) + ReleaseSRWLockExclusive(&self.lock) def __enter__(self) -> 'RWLock' | t.CPtr: self.acquire_write() diff --git a/shutil.vp b/shutil.vp index 8e4ff1d..53539a9 100644 --- a/shutil.vp +++ b/shutil.vp @@ -91,7 +91,7 @@ def _copy_posix(src: str, dst: str) -> int: if result != 0: return -1 st: posix.Stat = posix.Stat() - if posix.stat(src, t.CPtr(c.Addr(st))) == 0: + if posix.stat(src, t.CPtr(&st)) == 0: posix.chmod(dst, st.st_mode) return 0 @@ -127,7 +127,7 @@ def _rmtree_win32(path: str) -> int: pattern[i] = 0 find_data: w32.win32file.WIN32_FIND_DATAA = w32.win32file.WIN32_FIND_DATAA() - handle: w32.win32base.HANDLE = w32.win32file.FindFirstFileA(pattern, t.CPtr(c.Addr(find_data))) + handle: w32.win32base.HANDLE = w32.win32file.FindFirstFileA(pattern, t.CPtr(&find_data)) _mbuddy.free(pattern) if handle == w32.win32base.INVALID_HANDLE_VALUE: return -1 @@ -174,7 +174,7 @@ def _rmtree_win32(path: str) -> int: result = -1 _mbuddy.free(full_path) # Continue searching next entry - if w32.win32file.FindNextFileA(handle, t.CPtr(c.Addr(find_data))) == 0: + if w32.win32file.FindNextFileA(handle, t.CPtr(&find_data)) == 0: has_more = 0 w32.win32file.FindClose(handle) diff --git a/socket.vp b/socket.vp index 81703ca..af05390 100644 --- a/socket.vp +++ b/socket.vp @@ -83,14 +83,14 @@ class timeval: # ============================================================ extern def socket(family: INT, type: INT, protocol: INT) -> u64 -extern def connect(fd: u64, addr: SocketAddr | t.CPtr, addrlen: INT) -> INT +extern def connect(fd: u64, addr: SocketAddr*, addrlen: INT) -> INT extern def send(fd: u64, buf: t.CPtr, len: INT, flags: INT) -> INT extern def recv(fd: u64, buf: t.CPtr, len: INT, flags: INT) -> INT -extern def bind(fd: u64, addr: SocketAddr | t.CPtr, addrlen: INT) -> INT +extern def bind(fd: u64, addr: SocketAddr*, addrlen: INT) -> INT extern def listen(fd: u64, backlog: INT) -> INT -extern def accept(fd: u64, addr: SocketAddr | t.CPtr, addrlen: INT | t.CPtr) -> u64 +extern def accept(fd: u64, addr: SocketAddr*, addrlen: INT*) -> u64 extern def setsockopt(fd: u64, level: INT, optname: INT, optval: t.CPtr, optlen: INT) -> INT -extern def gethostbyname(name: t.CConst | str) -> HostEnt | t.CPtr +extern def gethostbyname(name: t.CConst | str) -> HostEnt* extern def ntohs(netshort: u16) -> u16 extern def htons(hostshort: u16) -> u16 extern def close(fd: u64) -> INT @@ -111,12 +111,12 @@ def _MakeAddr(host: str, port: INT) -> SocketAddr: If decimal IP fails, try DNS resolution. If DNS resolution fails, return INADDR_ANY.""" addr: SocketAddr - string.memset(c.Addr(addr), 0, 16) + string.memset(&addr, 0, 16) addr.family = u16(AF_INET) addr.port = htons(u16(port)) ip: u32 = 0 - if _ParseIPv4(host, c.Addr(ip)): + if _ParseIPv4(host, &ip): addr.addr = ip return addr @@ -131,7 +131,7 @@ def _MakeAddr(host: str, port: INT) -> SocketAddr: if ip_ptr != 0: addr.addr = u32(c.Deref(uint32(ip_ptr, t.CPtr))) else: - he: HostEnt | t.CPtr = gethostbyname(host) + he: HostEnt* = gethostbyname(host) if he is not None: ip_ptr: u64 = u64(c.Deref(uint64(he.h_addr_list, t.CPtr))) if ip_ptr != 0: @@ -140,7 +140,7 @@ def _MakeAddr(host: str, port: INT) -> SocketAddr: return addr -def _ParseIPv4(ip_str: str, out_addr: u32 | t.CPtr) -> bool: +def _ParseIPv4(ip_str: str, out_addr: u32*) -> bool: """Parse IPv4 address.""" if ip_str is None or out_addr is None: return False @@ -229,11 +229,11 @@ class Socket: result: INT = 0 if platmacro.IS_WINDOWS: - result = w32.winsock2.connect(u64(self.fd), c.Addr(addr), 16) + result = w32.winsock2.connect(u64(self.fd), &addr, 16) if result != 0: err: INT = w32.winsock2.WSAGetLastError() else: - result = connect(self.fd, c.Addr(addr), 16) + result = connect(self.fd, &addr, 16) return result def send(self, data: t.CPtr, length: INT) -> INT: @@ -295,8 +295,8 @@ class Socket: addr: SocketAddr = _MakeAddr(host, port) if platmacro.IS_WINDOWS: - return w32.winsock2.bind(u64(self.fd), c.Addr(addr), 16) - return bind(self.fd, c.Addr(addr), 16) + return w32.winsock2.bind(u64(self.fd), &addr, 16) + return bind(self.fd, &addr, 16) def listen(self, backlog: INT) -> INT: """Start for incoming connections (server-side). @@ -322,11 +322,11 @@ class Socket: if out_client is None: return SOCKET_ERROR addr: SocketAddr - string.memset(c.Addr(addr), 0, 16) + string.memset(&addr, 0, 16) addrlen: INT = 16 if platmacro.IS_WINDOWS: - client_fd: u64 = w32.winsock2.accept(u64(self.fd), c.Addr(addr), c.Addr(addrlen)) + client_fd: u64 = w32.winsock2.accept(u64(self.fd), &addr, &addrlen) if client_fd == w32.winsock2.INVALID_SOCKET: return SOCKET_ERROR out_client.fd = INT(client_fd) @@ -335,7 +335,7 @@ class Socket: out_client.protocol = self.protocol return INT(client_fd) - client_fd: INT = accept(self.fd, c.Addr(addr), c.Addr(addrlen)) + client_fd: INT = accept(self.fd, &addr, &addrlen) if client_fd == SOCKET_ERROR: return SOCKET_ERROR out_client.fd = client_fd @@ -358,11 +358,11 @@ class Socket: optlen: INT = 8 if platmacro.IS_WINDOWS: - r1: INT = w32.winsock2.setsockopt(u64(self.fd), SOL_SOCKET, SO_RCVTIMEO, c.Addr(tv), optlen) - r2: INT = w32.winsock2.setsockopt(u64(self.fd), SOL_SOCKET, SO_SNDTIMEO, c.Addr(tv), optlen) + r1: INT = w32.winsock2.setsockopt(u64(self.fd), SOL_SOCKET, SO_RCVTIMEO, &tv, optlen) + r2: INT = w32.winsock2.setsockopt(u64(self.fd), SOL_SOCKET, SO_SNDTIMEO, &tv, optlen) else: - r1 = setsockopt(self.fd, SOL_SOCKET, SO_RCVTIMEO, c.Addr(tv), optlen) - r2 = setsockopt(self.fd, SOL_SOCKET, SO_SNDTIMEO, c.Addr(tv), optlen) + r1 = setsockopt(self.fd, SOL_SOCKET, SO_RCVTIMEO, &tv, optlen) + r2 = setsockopt(self.fd, SOL_SOCKET, SO_SNDTIMEO, &tv, optlen) if r1 != 0: return r1 return r2 @@ -380,8 +380,8 @@ def SocketInit() -> INT: """Initialize the Socket library. On Windows, call WSAStartup; on POSIX, do nothing.""" if platmacro.IS_WINDOWS: wsa_data: t.CArray[BYTE, 400] - string.memset(c.Addr(wsa_data), 0, 400) - return w32.winsock2.WSAStartup(w32.winsock2.WINSOCK_VERSION, c.Addr(wsa_data)) + string.memset(&wsa_data, 0, 400) + return w32.winsock2.WSAStartup(w32.winsock2.WINSOCK_VERSION, &wsa_data) return 0 @@ -396,7 +396,7 @@ def SocketCleanup() -> INT: # Compatibility with old procedural API (delegates to Socket methods) # ============================================================ -def SocketCreate(family: INT, type: INT, protocol: INT, out_sock: Socket | t.CPtr) -> INT: +def SocketCreate(family: INT, type: INT, protocol: INT, out_sock: Socket*) -> INT: """Create a Socket handle (compatible with old API). It is recommended to use Socket(...) constructor.""" if out_sock is None: return -1 out_sock.family = family @@ -415,39 +415,39 @@ def SocketCreate(family: INT, type: INT, protocol: INT, out_sock: Socket | t.CPt # But maybe using OOP would be better, though that can be wrapped up later. -def SocketConnect(sock: Socket | t.CPtr, host: str, port: INT) -> INT: +def SocketConnect(sock: Socket*, host: str, port: INT) -> INT: return sock.connect(host, port) -def SocketSend(sock: Socket | t.CPtr, data: t.CPtr, length: INT) -> INT: +def SocketSend(sock: Socket*, data: t.CPtr, length: INT) -> INT: return sock.send(data, length) -def SocketRecv(sock: Socket | t.CPtr, buf: t.CPtr, bufsize: INT) -> INT: +def SocketRecv(sock: Socket*, buf: t.CPtr, bufsize: INT) -> INT: return sock.recv(buf, bufsize) -def SocketClose(sock: Socket | t.CPtr) -> INT: +def SocketClose(sock: Socket*) -> INT: return sock.close() -def SocketBind(sock: Socket | t.CPtr, host: str, port: INT) -> INT: +def SocketBind(sock: Socket*, host: str, port: INT) -> INT: return sock.bind(host, port) -def SocketListen(sock: Socket | t.CPtr, backlog: INT) -> INT: +def SocketListen(sock: Socket*, backlog: INT) -> INT: return sock.listen(backlog) -def SocketAccept(sock: Socket | t.CPtr, out_client: Socket | t.CPtr) -> INT: +def SocketAccept(sock: Socket*, out_client: Socket*) -> INT: return sock.accept(out_client) -def SocketSetTimeout(sock: Socket | t.CPtr, timeout_ms: INT) -> INT: +def SocketSetTimeout(sock: Socket*, timeout_ms: INT) -> INT: return sock.settimeout(timeout_ms) -def SocketIsValid(sock: Socket | t.CPtr) -> bool: +def SocketIsValid(sock: Socket*) -> bool: """Check if a Socket is valid.""" if sock is None: return False return sock.fd != INVALID_SOCKET \ No newline at end of file diff --git a/stdint.vp b/stdint.vp index 2ae2941..a389cfa 100644 --- a/stdint.vp +++ b/stdint.vp @@ -6,69 +6,69 @@ import t # 注意：INTPTR/UINTPTR 在此模块中是 int*/unsigned int* 指针类型（历史命名）。 # 它们与 C 标准的 intptr_t/uintptr_t 整数类型不同，后者见下方小写 _t 区域。 # ============================================================================= -INT: t.CTypedef = t.CInt -INTPTR: t.CTypedef = t.CInt | t.CPtr +INT: t.CTypedef = int +INTPTR: t.CTypedef = int | t.CPtr -BOOL: t.CTypedef = t.CInt -UINT: t.CTypedef = t.CUnsignedInt +BOOL: t.CTypedef = int +UINT: t.CTypedef = uint UINTPTR: t.CTypedef = UINT | t.CPtr -BYTE: t.CTypedef = t.CUnsignedChar +BYTE: t.CTypedef = uchar BYTEPTR: t.CTypedef = BYTE | t.CPtr -WORD: t.CTypedef = t.CUInt16T -DWORD: t.CTypedef = t.CUInt32T -QWORD: t.CTypedef = t.CUInt64T -TCHAR: t.CTypedef = t.CChar +WORD: t.CTypedef = uint16 +DWORD: t.CTypedef = uint32 +QWORD: t.CTypedef = uint64 +TCHAR: t.CTypedef = char CHARLIST: t.CTypedef = str | t.CPtr -VOID: t.CTypedef = t.CVoid +VOID: t.CTypedef = void -SHORT: t.CTypedef = t.CShort -SHORTPTR: t.CTypedef = t.CShort | t.CPtr -USHORT: t.CTypedef = t.CUnsignedShort -USHORTPTR: t.CTypedef = t.CUnsignedShort | t.CPtr +SHORT: t.CTypedef = int16 +SHORTPTR: t.CTypedef = int16 | t.CPtr +USHORT: t.CTypedef = uint16 +USHORTPTR: t.CTypedef = uint16 | t.CPtr -LONGLONG: t.CTypedef = t.CLongLong -ULONGLONG: t.CTypedef = t.CUnsignedLongLong -LONG: t.CTypedef = t.CLong -ULONG: t.CTypedef = t.CUnsignedLong +LONGLONG: t.CTypedef = int64 +ULONGLONG: t.CTypedef = uint64 +LONG: t.CTypedef = int32 +ULONG: t.CTypedef = uint32 WCHAR: t.CTypedef = WORD WCHARPTR: t.CTypedef = WORD | t.CPtr -CHARPTR: t.CTypedef = t.CChar | t.CPtr -LPCSTR: t.CTypedef = t.CConst | t.CChar | t.CPtr +CHARPTR: t.CTypedef = char | t.CPtr +LPCSTR: t.CTypedef = t.CConst | char | t.CPtr VOIDPTR: t.CTypedef = t.CPtr -FLOAT: t.CTypedef = t.CFloat -DOUBLE: t.CTypedef = t.CDouble +FLOAT: t.CTypedef = float +DOUBLE: t.CTypedef = double FLOAT8: t.CTypedef = t.CFloat8T FLOAT16: t.CTypedef = t.CFloat16T FLOAT32: t.CTypedef = t.CFloat32T -FLOAT64: t.CTypedef = t.CFloat64T +FLOAT64: t.CTypedef = double FLOAT128: t.CTypedef = t.CFloat128T # ============================================================================= # 定长整数大写别名 # ============================================================================= -INT8: t.CTypedef = t.CInt8T -INT16: t.CTypedef = t.CInt16T -INT32: t.CTypedef = t.CInt32T -INT64: t.CTypedef = t.CInt64T +INT8: t.CTypedef = int8 +INT16: t.CTypedef = int16 +INT32: t.CTypedef = int32 +INT64: t.CTypedef = int64 -UINT8: t.CTypedef = t.CUInt8T -UINT16: t.CTypedef = t.CUInt16T -UINT32: t.CTypedef = t.CUInt32T -UINT64: t.CTypedef = t.CUInt64T +UINT8: t.CTypedef = uint8 +UINT16: t.CTypedef = uint16 +UINT32: t.CTypedef = uint32 +UINT64: t.CTypedef = uint64 -INT8PTR: t.CTypedef = t.CInt8T | t.CPtr -INT16PTR: t.CTypedef = t.CInt16T | t.CPtr -INT32PTR: t.CTypedef = t.CInt32T | t.CPtr -INT64PTR: t.CTypedef = t.CInt64T | t.CPtr +INT8PTR: t.CTypedef = int8 | t.CPtr +INT16PTR: t.CTypedef = int16 | t.CPtr +INT32PTR: t.CTypedef = int32 | t.CPtr +INT64PTR: t.CTypedef = int64 | t.CPtr -UINT8PTR: t.CTypedef = t.CUInt8T | t.CPtr -UINT16PTR: t.CTypedef = t.CUInt16T | t.CPtr -UINT32PTR: t.CTypedef = t.CUInt32T | t.CPtr -UINT64PTR: t.CTypedef = t.CUInt64T | t.CPtr +UINT8PTR: t.CTypedef = uint8 | t.CPtr +UINT16PTR: t.CTypedef = uint16 | t.CPtr +UINT32PTR: t.CTypedef = uint32 | t.CPtr +UINT64PTR: t.CTypedef = uint64 | t.CPtr CHAR8: t.CTypedef = t.CChar8T CHAR16: t.CTypedef = t.CChar16T @@ -77,15 +77,15 @@ CHAR8PTR: t.CTypedef = t.CChar8T | t.CPtr CHAR16PTR: t.CTypedef = t.CChar16T | t.CPtr CHAR32PTR: t.CTypedef = t.CChar32T | t.CPtr -i8: t.CTypedef = t.CInt8T -i16: t.CTypedef = t.CInt16T -i32: t.CTypedef = t.CInt32T -i64: t.CTypedef = t.CInt64T +i8: t.CTypedef = int8 +i16: t.CTypedef = int16 +i32: t.CTypedef = int32 +i64: t.CTypedef = int64 -u8: t.CTypedef = t.CUInt8T -u16: t.CTypedef = t.CUInt16T -u32: t.CTypedef = t.CUInt32T -u64: t.CTypedef = t.CUInt64T +u8: t.CTypedef = uint8 +u16: t.CTypedef = uint16 +u32: t.CTypedef = uint32 +u64: t.CTypedef = uint64 SIZE_T: t.CTypedef = sizet SSIZE_T: t.CTypedef = t.CPtrDiffT @@ -97,15 +97,15 @@ PTRDIFF_T: t.CTypedef = t.CPtrDiffT # 这些是 C 语言标准类型名，从 _CNAME_ALIAS 挪到此处作为 typedef 提供。 # 用户 `from stdint import *` 后即可直接使用 int8_t / size_t 等。 # ============================================================================= -int8_t: t.CTypedef = t.CInt8T -int16_t: t.CTypedef = t.CInt16T -int32_t: t.CTypedef = t.CInt32T -int64_t: t.CTypedef = t.CInt64T +int8_t: t.CTypedef = int8 +int16_t: t.CTypedef = int16 +int32_t: t.CTypedef = int32 +int64_t: t.CTypedef = int64 -uint8_t: t.CTypedef = t.CUInt8T -uint16_t: t.CTypedef = t.CUInt16T -uint32_t: t.CTypedef = t.CUInt32T -uint64_t: t.CTypedef = t.CUInt64T +uint8_t: t.CTypedef = uint8 +uint16_t: t.CTypedef = uint16 +uint32_t: t.CTypedef = uint32 +uint64_t: t.CTypedef = uint64 size_t: t.CTypedef = sizet ssize_t: t.CTypedef = t.CPtrDiffT @@ -126,7 +126,7 @@ char32_t: t.CTypedef = t.CChar32T float8_t: t.CTypedef = t.CFloat8T float16_t: t.CTypedef = t.CFloat16T float32_t: t.CTypedef = t.CFloat32T -float64_t: t.CTypedef = t.CFloat64T +float64_t: t.CTypedef = double float128_t: t.CTypedef = t.CFloat128T -_Bool: t.CTypedef = t.CBool +_Bool: t.CTypedef = bool diff --git a/string.vp b/string.vp index d4d7ed8..fab530b 100644 --- a/string.vp +++ b/string.vp @@ -195,12 +195,12 @@ export def memset(ptr: t.CPtr, value: int, num: sizet) -> t.CPtr: mov eax, {c.AsmInp(value, t.ASM_DESCR.REG_ANY)} mov rcx, {c.AsmInp(num, t.ASM_DESCR.REG_ANY)} rep stosb""", - op=[t.ASM_DESCR.CLOBBER_MEMORY, t.ASM_DESCR.CLOBBER_RAX, - t.ASM_DESCR.CLOBBER_RCX, t.ASM_DESCR.CLOBBER_RDI]) + op=[ASM_DESCR.CLOBBER_MEMORY, ASM_DESCR.CLOBBER_RAX, + ASM_DESCR.CLOBBER_RCX, ASM_DESCR.CLOBBER_RDI]) return ptr -def memset32(ptr: t.CPtr, value: t.CUInt32T, count: sizet) -> t.CPtr: +def memset32(ptr: t.CPtr, value: uint32, count: sizet) -> t.CPtr: # Original implementation: # p: UINT32PTR = UINT32PTR(ptr) # i: sizet @@ -211,8 +211,8 @@ def memset32(ptr: t.CPtr, value: t.CUInt32T, count: sizet) -> t.CPtr: mov eax, {c.AsmInp(value, t.ASM_DESCR.REG_ANY)} mov rcx, {c.AsmInp(count, t.ASM_DESCR.REG_ANY)} rep stosd""", - op=[t.ASM_DESCR.CLOBBER_MEMORY, t.ASM_DESCR.CLOBBER_RAX, - t.ASM_DESCR.CLOBBER_RCX, t.ASM_DESCR.CLOBBER_RDI]) + op=[ASM_DESCR.CLOBBER_MEMORY, ASM_DESCR.CLOBBER_RAX, + ASM_DESCR.CLOBBER_RCX, ASM_DESCR.CLOBBER_RDI]) return ptr @@ -229,8 +229,8 @@ export def memcpy(dest: t.CPtr, src: t.CPtr, num: sizet) -> t.CPtr: mov rsi, {c.AsmInp(src, t.ASM_DESCR.REG_ANY)} mov rcx, {c.AsmInp(num, t.ASM_DESCR.REG_ANY)} rep movsb""", - op=[t.ASM_DESCR.CLOBBER_MEMORY, t.ASM_DESCR.CLOBBER_RCX, - t.ASM_DESCR.CLOBBER_RDI, t.ASM_DESCR.CLOBBER_RSI]) + op=[ASM_DESCR.CLOBBER_MEMORY, ASM_DESCR.CLOBBER_RCX, + ASM_DESCR.CLOBBER_RDI, ASM_DESCR.CLOBBER_RSI]) return dest @@ -263,8 +263,8 @@ def memmove(dest: t.CPtr, src: t.CPtr, num: sizet) -> t.CPtr: 2: rep movsb 3:""", - op=[t.ASM_DESCR.CLOBBER_MEMORY, t.ASM_DESCR.CLOBBER_RCX, - t.ASM_DESCR.CLOBBER_RDI, t.ASM_DESCR.CLOBBER_RSI]) + op=[ASM_DESCR.CLOBBER_MEMORY, ASM_DESCR.CLOBBER_RCX, + ASM_DESCR.CLOBBER_RDI, ASM_DESCR.CLOBBER_RSI]) return dest @@ -289,9 +289,9 @@ def atoi(src: str) -> int: return num * sign -def atoll(src: str) -> t.CInt64T: - num: t.CInt64T = 0 - sign: t.CInt64T = 1 +def atoll(src: str) -> int64: + num: int64 = 0 + sign: int64 = 1 s: str = src if s == None: return 0 while s[0] == ' ' or s[0] == '\t' or s[0] == '\n' or s[0] == '\r': @@ -317,13 +317,13 @@ def atoll(src: str) -> t.CInt64T: d = ch - 'A' + 10 else: break - digit: t.CInt64T = t.CInt64T(d) + digit: int64 = int64(d) num = num * 16 + digit else: for ch in s: if ch < '0' or ch > '9': break d: int = ch - '0' - digit: t.CInt64T = t.CInt64T(d) + digit: int64 = int64(d) num = num * 10 + digit return num * sign @@ -406,11 +406,11 @@ def _dd_div(ah: double, al: double, bh: double, bl: double, # _dd_from_u64 - u64 → 双 double（精确：hi 为四舍五入值，lo 为精确残差） -def _dd_from_u64(m: t.CUInt64T, out: t.CArray[double, 2]): +def _dd_from_u64(m: uint64, out: t.CArray[double, 2]): hi: double = double(m) lo: double = 0.0 - if m >= t.CUInt64T(9007199254740992): - lo = double(m - t.CUInt64T(hi)) + if m >= uint64(9007199254740992): + lo = double(m - uint64(hi)) s: double = hi + lo bb: double = s - hi out[0] = s @@ -479,7 +479,7 @@ def atof(src: str) -> double: elif s[0] == '+': s += 1 # 尾数：有效数字装进 u64（≤19 位），同时维护十进制指数 - mant: t.CUInt64T = 0 + mant: uint64 = 0 nd: int = 0 dexp: int = 0 seen_dot: int = 0 @@ -493,14 +493,14 @@ def atof(src: str) -> double: # 前导零不进尾数；小数部分的前导零要占十进制位 if d != 0: started = 1 - mant = t.CUInt64T(d) + mant = uint64(d) nd = 1 if seen_dot != 0: dexp -= 1 elif seen_dot != 0: dexp -= 1 elif nd < 19: - mant = mant * t.CUInt64T(10) + t.CUInt64T(d) + mant = mant * uint64(10) + uint64(d) nd += 1 if seen_dot != 0: dexp -= 1 @@ -511,7 +511,7 @@ def atof(src: str) -> double: dexp += 1 elif rounded == 0: if d >= 5: - mant += t.CUInt64T(1) + mant += uint64(1) rounded = 1 elif ch == '.': seen_dot = 1 @@ -521,8 +521,8 @@ def atof(src: str) -> double: if started == 0: return sign * 0.0 # 进位：舍入可能使 19 位变 20 位 - if mant >= t.CUInt64T(10000000000000000000): - mant = mant // t.CUInt64T(10) + if mant >= uint64(10000000000000000000): + mant = mant // uint64(10) dexp += 1 # 指数部分 exp: int = 0 @@ -578,7 +578,7 @@ def atof(src: str) -> double: return sign * _atof_scale_stepwise(double(mant), p) -def atof_out(src: str, out: double | t.CPtr) -> int: +def atof_out(src: str, out: double*) -> int: """atof 结果写入 out[0]（输出参数方式，避免跨模块 double 返回值传递 bug） 返回值仅表示成功与否（1=成功，0=失败），结果值通过 out 指针传递， diff --git a/subprocess.vp b/subprocess.vp index c1cbaa7..9a105ae 100644 --- a/subprocess.vp +++ b/subprocess.vp @@ -15,7 +15,7 @@ import posix # Subprocess output buffer size -OUTPUT_BUF_SIZE: t.CDefine = 65536 +define OUTPUT_BUF_SIZE = 65536 # Module global MBuddy pointer (initialized in main) _mbuddy: memhub.MemBuddy* @@ -47,7 +47,7 @@ class CompletedProcess: # Entry function # ============================================================================= -def run(args: str, capture_output: bool = True, text: bool = True) -> CompletedProcess | t.CPtr: +def run(args: str, capture_output: bool = True, text: bool = True) -> CompletedProcess*: """Run a subprocess synchronously and wait for it to finish. The args are the full command line string. If capture_output=True, stdout/stderr will be captured. If text=True, the output will be a string (currently it always returns a string). @@ -61,7 +61,7 @@ def run(args: str, capture_output: bool = True, text: bool = True) -> CompletedP # Windows backend implementation # ============================================================================= -def _run_win32(args: str, capture_output: bool, text: bool) -> CompletedProcess | t.CPtr: +def _run_win32(args: str, capture_output: bool, text: bool) -> CompletedProcess*: """Windows platform subprocess execution (CreateProcessA pipe)""" # Copy command line (CreateProcessA requires a modifiable lpCommandLine) args_len: sizet = len(args) @@ -173,7 +173,7 @@ def _run_win32(args: str, capture_output: bool, text: bool) -> CompletedProcess # Get exit code exit_code: ULONG = 0 - w32.win32process.GetExitCodeProcess(pi.hProcess, t.CPtr(c.Addr(exit_code))) + w32.win32process.GetExitCodeProcess(pi.hProcess, t.CPtr(&exit_code)) # Close handles w32.win32base.CloseHandle(pi.hProcess) @@ -188,7 +188,7 @@ def _run_win32(args: str, capture_output: bool, text: bool) -> CompletedProcess # POSIX backend implementation # ============================================================================= -def _run_posix(args: str, capture_output: bool, text: bool) -> CompletedProcess | t.CPtr: +def _run_posix(args: str, capture_output: bool, text: bool) -> CompletedProcess*: """POSIX platform subprocess execution (fork, execvp, pipe, waitpid) Note: Currently this is a stub function. POSIX implementation requires pipe/fork/waitpid, which are not available on Windows MinGW. diff --git a/torch/__init__.vp b/torch/__init__.vp index 83d6003..0f4a057 100644 --- a/torch/__init__.vp +++ b/torch/__init__.vp @@ -36,7 +36,7 @@ novirtual class Tensor: Cols: sizet # 字段: Data/Grad/Rows/Cols = 32 字节(无 vtable) -TENSOR_SIZE: t.CDefine = 32 +define TENSOR_SIZE = 32 def _zeros_block(pool: memhub.MemBuddy*, bytes_n: sizet) -> t.CPtr: @@ -48,7 +48,7 @@ def _zeros_block(pool: memhub.MemBuddy*, bytes_n: sizet) -> t.CPtr: def zeros(pool: memhub.MemBuddy*, rows: sizet, - cols: sizet, with_grad: int = 1) -> Tensor | t.CPtr: + cols: sizet, with_grad: int = 1) -> Tensor*: """torch.zeros: 创建 rows x cols 的全零 Tensor, 可选分配 Grad 缓冲""" if pool is None: return None @@ -69,7 +69,7 @@ def zeros(pool: memhub.MemBuddy*, rows: sizet, def from_raw(pool: memhub.MemBuddy*, data: t.CPtr, rows: sizet, cols: sizet, - with_grad: int = 0) -> Tensor | t.CPtr: + with_grad: int = 0) -> Tensor*: """torch.from_raw: 包装一块已有内存为 Tensor(不复制, 不拥有)""" if pool is None: return None @@ -84,40 +84,40 @@ def from_raw(pool: memhub.MemBuddy*, data: t.CPtr, return t0 -def tensor_free(t0: Tensor | t.CPtr): +def tensor_free(t0: Tensor*): """释放 Tensor 外壳(数据由 MemBuddy 池统一回收, 无需手动 free)""" pass -def tensor_data(t0: Tensor | t.CPtr) -> t.CPtr: +def tensor_data(t0: Tensor*) -> t.CPtr: if t0 is None: return None return t0.Data -def tensor_grad(t0: Tensor | t.CPtr) -> t.CPtr: +def tensor_grad(t0: Tensor*) -> t.CPtr: if t0 is None: return None return t0.Grad -def tensor_rows(t0: Tensor | t.CPtr) -> sizet: +def tensor_rows(t0: Tensor*) -> sizet: if t0 is None: return 0 return t0.Rows -def tensor_cols(t0: Tensor | t.CPtr) -> sizet: +def tensor_cols(t0: Tensor*) -> sizet: if t0 is None: return 0 return t0.Cols -def fill(t0: Tensor | t.CPtr, val: double): +def fill(t0: Tensor*, val: double): """torch.fill: 全部元素置为 val""" if t0 is None or t0.Data is None: return - d: double | t.CPtr = t0.Data + d: double* = t0.Data n: sizet = t0.Rows * t0.Cols i: sizet = 0 while i < n: @@ -125,7 +125,7 @@ def fill(t0: Tensor | t.CPtr, val: double): i += 1 -def zero_grad(t0: Tensor | t.CPtr): +def zero_grad(t0: Tensor*): """torch.zero_grad: Grad 缓冲清零""" if t0 is None or t0.Grad is None: return @@ -154,11 +154,11 @@ def _next_rand() -> double: return _rng_state / LCG_M -def uniform_fill(t0: Tensor | t.CPtr, lo: double, hi: double): +def uniform_fill(t0: Tensor*, lo: double, hi: double): """U(lo, hi) 填充""" if t0 is None or t0.Data is None: return - d: double | t.CPtr = t0.Data + d: double* = t0.Data n: sizet = t0.Rows * t0.Cols span: double = hi - lo i: sizet = 0 @@ -167,7 +167,7 @@ def uniform_fill(t0: Tensor | t.CPtr, lo: double, hi: double): i += 1 -def kaiming_uniform_fill(w: Tensor | t.CPtr, fan_in: sizet, +def kaiming_uniform_fill(w: Tensor*, fan_in: sizet, fan_out: sizet): """PyTorch Linear 默认初始化: U(-sqrt(6/(fan_in+fan_out)), +...)""" bound: double = math.sqrt( @@ -190,10 +190,10 @@ def vector_mul_scalar4(src: t.CPtr, scalar_ptr: t.CPtr, dst: t.CPtr, scalar_ptr, t.CPtr(uint64(dst) + uint64(i) * 8)) i += 4 - sd: double | t.CPtr = src - dd: double | t.CPtr = dst + sd: double* = src + dd: double* = dst # 尾部标量 - sp: double | t.CPtr = scalar_ptr + sp: double* = scalar_ptr sval: double = sp[0] while i < n: dd[i] = sd[i] * sval @@ -214,8 +214,8 @@ def vector_add_inplace(a: t.CPtr, b: t.CPtr, n: sizet): t.CPtr(uint64(b) + uint64(i) * 8), t.CPtr(uint64(a) + uint64(i) * 8)) i += 4 - da: double | t.CPtr = a - db: double | t.CPtr = b + da: double* = a + db: double* = b while i < n: da[i] = da[i] + db[i] i += 1 @@ -226,21 +226,21 @@ def vector_add_inplace(a: t.CPtr, b: t.CPtr, n: sizet): # 线性层: forward = x @ W^T + b (W: out x in, x: m x in, out: m x out) # 内积按 k%4 用 vipersimd.simd_dot4d —— MNIST 主计算热点 # ------------------------------------------------------------ -def linear_fwd(w: Tensor | t.CPtr, b: Tensor | t.CPtr, - x: Tensor | t.CPtr, out: Tensor | t.CPtr): +def linear_fwd(w: Tensor*, b: Tensor*, + x: Tensor*, out: Tensor*): if w is None or b is None or x is None or out is None: return m: sizet = x.Rows k: sizet = x.Cols n: sizet = w.Rows - wd: double | t.CPtr = w.Data - bd: double | t.CPtr = b.Data - xd: double | t.CPtr = x.Data - od: double | t.CPtr = out.Data + wd: double* = w.Data + bd: double* = b.Data + xd: double* = x.Data + od: double* = out.Data acc_buf: t.CPtr = stdlib.malloc(8) if acc_buf is None: return - accp: double | t.CPtr = acc_buf + accp: double* = acc_buf i: sizet = 0 while i < m: j: sizet = 0 @@ -269,9 +269,9 @@ def linear_fwd(w: Tensor | t.CPtr, b: Tensor | t.CPtr, # dx[b,i] = sum_j g[b,j]*w[j,i] # 注意 dw/db 按"累加"语义(调用前清零 Grad) # ------------------------------------------------------------ -def linear_bwd(w: Tensor | t.CPtr, x: Tensor | t.CPtr, - g: Tensor | t.CPtr, dw: Tensor | t.CPtr, - db: Tensor | t.CPtr, dx: Tensor | t.CPtr, +def linear_bwd(w: Tensor*, x: Tensor*, + g: Tensor*, dw: Tensor*, + db: Tensor*, dx: Tensor*, accum: int = 0): if w is None or x is None or g is None: return @@ -280,12 +280,12 @@ def linear_bwd(w: Tensor | t.CPtr, x: Tensor | t.CPtr, m: sizet = x.Rows k: sizet = x.Cols n: sizet = w.Rows - wd: double | t.CPtr = w.Data - xd: double | t.CPtr = x.Data - gd: double | t.CPtr = g.Data - dwd: double | t.CPtr = dw.Data - dbd: double | t.CPtr = db.Data - dxd: double | t.CPtr = dx.Data + wd: double* = w.Data + xd: double* = x.Data + gd: double* = g.Data + dwd: double* = dw.Data + dbd: double* = db.Data + dxd: double* = dx.Data # dw/db/dx 清零(dx 恒清零: 它是本样本的输入梯度, 不跨样本累积) # accum=1 时保留 dw/db 现值 —— 逐样本反向累积整批参数梯度的调用方用 @@ -313,7 +313,7 @@ def linear_bwd(w: Tensor | t.CPtr, x: Tensor | t.CPtr, # ------------------------------------------------------------ # ReLU (simd_max4d 版本) 与反向 # ------------------------------------------------------------ -def relu_fwd(x: Tensor | t.CPtr, out: Tensor | t.CPtr): +def relu_fwd(x: Tensor*, out: Tensor*): if x is None or out is None: return n: sizet = x.Rows * x.Cols @@ -321,8 +321,8 @@ def relu_fwd(x: Tensor | t.CPtr, out: Tensor | t.CPtr): if zero4 is None: return string.memset(zero4, 0, 32) - xd: double | t.CPtr = x.Data - od: double | t.CPtr = out.Data + xd: double* = x.Data + od: double* = out.Data i: sizet = 0 while i + 4 <= n: vipersimd.simd_max4d( @@ -339,15 +339,15 @@ def relu_fwd(x: Tensor | t.CPtr, out: Tensor | t.CPtr): stdlib.free(zero4) -def relu_backward(x: Tensor | t.CPtr, g: Tensor | t.CPtr, - gx: Tensor | t.CPtr): +def relu_backward(x: Tensor*, g: Tensor*, + gx: Tensor*): """gx = g * (x > 0)""" if x is None or g is None or gx is None: return n: sizet = x.Rows * x.Cols - xd: double | t.CPtr = x.Data - gd: double | t.CPtr = g.Data - od: double | t.CPtr = gx.Data + xd: double* = x.Data + gd: double* = g.Data + od: double* = gx.Data i: sizet = 0 while i < n: if xd[i] > double(0.0): @@ -362,20 +362,20 @@ def relu_backward(x: Tensor | t.CPtr, g: Tensor | t.CPtr, # logits: (m, C), labels: m 个 int (0..C-1) # loss 写入 *loss, 梯度(已按 1/m 归一)写入 grad (m, C) # ------------------------------------------------------------ -def softmax_crossentropy(logits: Tensor | t.CPtr, - labels: int | t.CPtr, +def softmax_crossentropy(logits: Tensor*, + labels: int*, n_labels: sizet, - loss: double | t.CPtr, - grad: Tensor | t.CPtr): + loss: double*, + grad: Tensor*): if logits is None or labels is None or grad is None: return if loss is None: return m: sizet = logits.Rows c: sizet = logits.Cols - ld: double | t.CPtr = logits.Data - gd: double | t.CPtr = grad.Data - lb: int | t.CPtr = labels + ld: double* = logits.Data + gd: double* = grad.Data + lb: int* = labels total: double = double(0.0) inv_m: double = double(1.0) / double(m) b: sizet = 0 @@ -411,12 +411,12 @@ def softmax_crossentropy(logits: Tensor | t.CPtr, # ------------------------------------------------------------ # 每行 argmax (分类预测) # ------------------------------------------------------------ -def row_argmax(x: Tensor | t.CPtr, pred: int | t.CPtr): +def row_argmax(x: Tensor*, pred: int*): if x is None or pred is None: return m: sizet = x.Rows c: sizet = x.Cols - d: double | t.CPtr = x.Data + d: double* = x.Data i: sizet = 0 while i < m: best: sizet = 0 @@ -434,11 +434,11 @@ def row_argmax(x: Tensor | t.CPtr, pred: int | t.CPtr): # ------------------------------------------------------------ # SGD: data -= lr * grad(全量梯度) / 重球法: v = m*v+g, data -= lr*v # ------------------------------------------------------------ -def sgd_step(param: Tensor | t.CPtr, lr: double): +def sgd_step(param: Tensor*, lr: double): if param is None or param.Data is None or param.Grad is None: return - d: double | t.CPtr = param.Data - g: double | t.CPtr = param.Grad + d: double* = param.Data + g: double* = param.Grad n: sizet = param.Rows * param.Cols i: sizet = 0 while i < n: @@ -446,7 +446,7 @@ def sgd_step(param: Tensor | t.CPtr, lr: double): i += 1 -def sgd_step_momentum(param: Tensor | t.CPtr, vel: t.CPtr, +def sgd_step_momentum(param: Tensor*, vel: t.CPtr, lr: double, momentum: double): """带动量(重球法)的 SGD: v = m*v + g ; w -= lr*v @@ -458,9 +458,9 @@ def sgd_step_momentum(param: Tensor | t.CPtr, vel: t.CPtr, if vel is None: sgd_step(param, lr) return - d: double | t.CPtr = param.Data - g: double | t.CPtr = param.Grad - v: double | t.CPtr = vel + d: double* = param.Data + g: double* = param.Grad + v: double* = vel n: sizet = param.Rows * param.Cols i: sizet = 0 while i < n: @@ -474,7 +474,7 @@ def sgd_step_momentum(param: Tensor | t.CPtr, vel: t.CPtr, # 逐元素乘加 (调试/扩展用, vipersimd fma_array) # a = a*b + c # ------------------------------------------------------------ -def fma_array_inplace(a: Tensor | t.CPtr, b: t.CPtr, c: t.CPtr): +def fma_array_inplace(a: Tensor*, b: t.CPtr, c: t.CPtr): if a is None or a.Data is None: return vipersimd.simd_fma_array(a.Data, b, c, a.Data, a.Rows * a.Cols) @@ -519,9 +519,9 @@ def conv2d_fwd(x: t.CPtr, w: t.CPtr, b: t.CPtr, out: t.CPtr, return hout: sizet = (hin + pad * 2 - k) / stride + 1 wout: sizet = (win + pad * 2 - k) / stride + 1 - xd: double | t.CPtr = x - wd: double | t.CPtr = w - od: double | t.CPtr = out + xd: double* = x + wd: double* = w + od: double* = out kk: sizet = cin * k * k # SIMD 安全区间(见文件头说明) simd_on: int = 0 @@ -542,8 +542,8 @@ def conv2d_fwd(x: t.CPtr, w: t.CPtr, b: t.CPtr, out: t.CPtr, wb = None t4 = None simd_on = 0 - wbd: double | t.CPtr = wb - t4d: double | t.CPtr = t4 + wbd: double* = wb + t4d: double* = t4 bi: sizet = 0 while bi < n: @@ -551,7 +551,7 @@ def conv2d_fwd(x: t.CPtr, w: t.CPtr, b: t.CPtr, out: t.CPtr, while co < cout: bias: double = double(0.0) if b is not None: - bd: double | t.CPtr = b + bd: double* = b bias = bd[co] # 权重标量预广播: 每个 (ci,ky,kx) 一个 4 路副本, 本通道所有输出 # 行/列共用。否则 vbroadcastsd(4 次 store) 会跟着 4 路循环重复, @@ -648,10 +648,10 @@ def conv2d_bwd_dw(x: t.CPtr, dout: t.CPtr, dw: t.CPtr, db: t.CPtr, return hout: sizet = (hin + pad * 2 - k) / stride + 1 wout: sizet = (win + pad * 2 - k) / stride + 1 - xd: double | t.CPtr = x - gd: double | t.CPtr = dout - dwd: double | t.CPtr = dw - dbd: double | t.CPtr = None + xd: double* = x + gd: double* = dout + dwd: double* = dw + dbd: double* = None if db is not None: dbd = db kk: sizet = cin * k * k @@ -665,7 +665,7 @@ def conv2d_bwd_dw(x: t.CPtr, dout: t.CPtr, dw: t.CPtr, db: t.CPtr, acc = stdlib.malloc(32) if acc is None: simd_on = 0 - accd: double | t.CPtr = acc + accd: double* = acc bi: sizet = 0 while bi < n: @@ -762,9 +762,9 @@ def conv2d_bwd_dx(w: t.CPtr, dout: t.CPtr, dx: t.CPtr, return hout: sizet = (hin + pad * 2 - k) / stride + 1 wout: sizet = (win + pad * 2 - k) / stride + 1 - wd: double | t.CPtr = w - gd: double | t.CPtr = dout - dxd: double | t.CPtr = dx + wd: double* = w + gd: double* = dout + dxd: double* = dx string.memset(dx, 0, n * cin * hin * win * sizet(8)) kk: sizet = cin * k * k simd_on: int = 0 @@ -777,7 +777,7 @@ def conv2d_bwd_dx(w: t.CPtr, dout: t.CPtr, dx: t.CPtr, wb = stdlib.malloc(cout * kk * 32) if wb is None: simd_on = 0 - wbd: double | t.CPtr = wb + wbd: double* = wb if simd_on != 0: # 权重在一次调用内不变 → 整体预广播一次(注意别在 4 路循环里重复 # vbroadcastsd: 那是 4 次 store, 会把 SIMD 的收益吃掉一半) @@ -855,9 +855,9 @@ def maxpool2d_fwd(x: t.CPtr, out: t.CPtr, argmax: t.CPtr, return hout: sizet = (hin - k) / stride + 1 wout: sizet = (win - k) / stride + 1 - xd: double | t.CPtr = x - od: double | t.CPtr = out - am: int | t.CPtr = argmax + xd: double* = x + od: double* = out + am: int* = argmax bi: sizet = 0 while bi < n: ch: sizet = 0 @@ -902,9 +902,9 @@ def maxpool2d_bwd(dout: t.CPtr, argmax: t.CPtr, dx: t.CPtr, return hout: sizet = (hin - k) / stride + 1 wout: sizet = (win - k) / stride + 1 - gd: double | t.CPtr = dout - am: int | t.CPtr = argmax - dxd: double | t.CPtr = dx + gd: double* = dout + am: int* = argmax + dxd: double* = dx string.memset(dx, 0, n * c * hin * win * sizet(8)) bi: sizet = 0 while bi < n: diff --git a/traceback.vp b/traceback.vp index a849c61..6f5cd1b 100644 --- a/traceback.vp +++ b/traceback.vp @@ -444,34 +444,34 @@ extern def GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: CHARPTR, nSize: DWO # 段、WalkViaDbgHelp 的整个函数体、DumpMainThread 的可选加强调用）在置 0 时整体不生成代码 # ——范式与依据同 includes/memhub.vp 的 MEMBUDDY_THREAD_SAFE 注释（"未取分支整体不生成 # 代码 ⇒ 函数体为空"）。故置 0 后本模块不留任何 dbghelp 链接期符号。 -TRACEBACK_USE_DBGHELP: t.CDefine = 1 +define TRACEBACK_USE_DBGHELP = 1 # Trigger event values: see includes/w32/win32console.vp (CTRL_C_EVENT=0 / CTRL_BREAK_EVENT=1). # Crash-dump filter return value (winnt.h EXCEPTION_*): the unhandled-exception dump must never # swallow a crash, so its filter always returns CONTINUE_SEARCH (= 0) and hands the exception back # to the system default handling (exit code / WER / ASan report stay exactly as before). -TRACEBACK_EXCEPTION_CONTINUE_SEARCH: t.CDefine = 0 +define TRACEBACK_EXCEPTION_CONTINUE_SEARCH = 0 # ---- Sidecar (.stackmap) format ---- # 20-byte header (magic "TPCS" read little-endian as u32); 20-byte records. -TRACEBACK_MAP_MAGIC: t.CDefine = 0x53435054 # "TPCS" ('T','P','C','S' little-endian) -TRACEBACK_MAP_VERSION: t.CDefine = 1 -TRACEBACK_MAP_HEADER: t.CDefine = 20 # header size in bytes -TRACEBACK_ENTRY_SIZE: t.CDefine = 20 # bytes per record -TRACEBACK_ENTRY_FILEOFF: t.CDefine = 8 # file_off offset within a record -TRACEBACK_ENTRY_LINE: t.CDefine = 12 # line offset within a record -TRACEBACK_ENTRY_FUNCOFF: t.CDefine = 16 # func_off offset within a record +define TRACEBACK_MAP_MAGIC = 0x53435054# "TPCS" ('T','P','C','S' little-endian) +define TRACEBACK_MAP_VERSION = 1 +define TRACEBACK_MAP_HEADER = 20# header size in bytes +define TRACEBACK_ENTRY_SIZE = 20# bytes per record +define TRACEBACK_ENTRY_FILEOFF = 8# file_off offset within a record +define TRACEBACK_ENTRY_LINE = 12# line offset within a record +define TRACEBACK_ENTRY_FUNCOFF = 16# func_off offset within a record # Sidecar size cap (defence only: a corrupt entry_count/str_bytes must not demand a huge alloc). -TRACEBACK_MAP_LIMIT: t.CDefine = 67108864 # 64 MiB +define TRACEBACK_MAP_LIMIT = 67108864# 64 MiB # ---- Runtime buffers and limits ---- -TRACEBACK_PATH_CAP: t.CDefine = 4096 # exe path + ".stackmap" buffer -TRACEBACK_LINE_CAP: t.CDefine = 1024 # single output line buffer -TRACEBACK_MAX_FRAMES: t.CDefine = 64 # max frames printed -TRACEBACK_RBP_MAX_STEP: t.CDefine = 0x100000 # max gap between adjacent rbp values (1 MiB) +define TRACEBACK_PATH_CAP = 4096# exe path + ".stackmap" buffer +define TRACEBACK_LINE_CAP = 1024# single output line buffer +define TRACEBACK_MAX_FRAMES = 64# max frames printed +define TRACEBACK_RBP_MAX_STEP = 0x100000# max gap between adjacent rbp values (1 MiB) # RBP chain sanity check: a return address is accepted only within [Base, Base+this). # 128 MiB is far above any real PE image, a coarse "obviously out of range" filter. -TRACEBACK_MODULE_MAX: t.CDefine = 0x8000000 +define TRACEBACK_MODULE_MAX = 0x8000000 # ---- Collected-frame buffer (Python-traceback output) ---- # Frames are collected innermost-first by the walk paths and printed in reverse (outermost @@ -479,24 +479,24 @@ TRACEBACK_MODULE_MAX: t.CDefine = 0x8000000 # (TRACEBACK_MAX_FRAMES) plus the ScanStack candidates (TRACEBACK_SCAN_MAX_HITS). It is an # inline array inside TracebackState, so Install's TracebackState.__sizeof__() allocation # covers it (the callback thread allocates nothing). Frames beyond the limit are dropped. -TRACEBACK_FRAME_BUF: t.CDefine = 128 # = TRACEBACK_MAX_FRAMES + TRACEBACK_SCAN_MAX_HITS +define TRACEBACK_FRAME_BUF = 128# = TRACEBACK_MAX_FRAMES + TRACEBACK_SCAN_MAX_HITS # A hit frame re-reads its source line from the .vp file at dump time, sequentially in fixed # stack chunks (no heap allocation from the callback thread). -TRACEBACK_SRC_CHUNK: t.CDefine = 4096 # bytes per ReadFile while scanning for a source line +define TRACEBACK_SRC_CHUNK = 4096# bytes per ReadFile while scanning for a source line # ---- Stack scan fallback (ScanStack) ---- # Scan window [RSP, RSP + this) towards higher addresses (caller direction). -TRACEBACK_SCAN_MAX_BYTES: t.CDefine = 0x200000 # 2 MiB +define TRACEBACK_SCAN_MAX_BYTES = 0x200000# 2 MiB # Chunked reads: one ReadProcessMemory per chunk instead of one per 8 bytes. -TRACEBACK_SCAN_CHUNK_BYTES: t.CDefine = 4096 # 4 KiB per chunk -TRACEBACK_SCAN_CHUNK_WORDS: t.CDefine = 512 # 4096 / 8 u64 words per chunk -TRACEBACK_SCAN_MAX_HITS: t.CDefine = 64 # max candidate return addresses (scan_candidates=) -TRACEBACK_SUSPEND_FAILED: t.CDefine = 0xFFFFFFFF # SuspendThread failure return value +define TRACEBACK_SCAN_CHUNK_BYTES = 4096# 4 KiB per chunk +define TRACEBACK_SCAN_CHUNK_WORDS = 512# 4096 / 8 u64 words per chunk +define TRACEBACK_SCAN_MAX_HITS = 64# max candidate return addresses (scan_candidates=) +define TRACEBACK_SUSPEND_FAILED = 0xFFFFFFFF# SuspendThread failure return value # The suffixes ".stackmap" (10) and ".stackdump.txt" (16, incl. NUL) share the same 16-byte # slack check in Install; no extra constant is needed. # FILE_APPEND_DATA(0x0004) is not defined by wf; open the dump file with it so every WriteFile # appends to the end (combined with OPEN_ALWAYS to create the file when missing). -TRACEBACK_FILE_APPEND_DATA: t.CDefine = 0x00000004 +define TRACEBACK_FILE_APPEND_DATA = 0x00000004 class TracebackState(): @@ -635,7 +635,7 @@ def EmitToFile(N: int): return _DumpFileFailWarned = 1 LB: t.CArray[char, 160] - M: int = stdio.snprintf(&LB, t.CSizeT(160), + M: int = stdio.snprintf(&LB, sizet(160), "[traceback] WARN: stack dump file write failed (further file-write failures not reported)\n") if M <= 0: return @@ -672,7 +672,7 @@ def EmitLine(N: int): if DiagEnabled() != 0: _DumpLineNo = _DumpLineNo + 1 Pfx: t.CArray[char, 32] - Pl: int = stdio.snprintf(&Pfx, t.CSizeT(32), " [dump#%d] ", _DumpLineNo) + Pl: int = stdio.snprintf(&Pfx, sizet(32), " [dump#%d] ", _DumpLineNo) if Pl > 0: # Keep room for the trailing '\0' after prefixing. if N + Pl > TRACEBACK_LINE_CAP - 1: @@ -689,7 +689,7 @@ def EmitText(Text: str): """Write one constant line with no format specifiers (same buffer / WriteFile path).""" if _State == None or _State.LineBuf == None: return - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), "%s", Text) + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "%s", Text) EmitLine(N) @@ -719,11 +719,11 @@ def EmitEarly(Text: str): def EmitEarlyCode(Text: str, Code: ULONG): """EmitEarly variant that appends a GetLastError code (same output path).""" if _State != None and _State.LineBuf != None: - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), "%s(GetLastError=%u)\n", Text, Code) + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "%s(GetLastError=%u)\n", Text, Code) EmitLine(N) return LB: t.CArray[char, 256] - N2: int = stdio.snprintf(&LB, t.CSizeT(256), "%s(GetLastError=%u)\n", Text, Code) + N2: int = stdio.snprintf(&LB, sizet(256), "%s(GetLastError=%u)\n", Text, Code) if N2 <= 0: return H: HANDLE = wf.GetStdHandle(wf.STD_ERROR_HANDLE) @@ -794,7 +794,7 @@ def MapFailPlain(Size: int64, Reason: str) -> int: """Validation failed before the header could be read: print reason + actual file size.""" if _State == None or _State.LineBuf == None: return 0 - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "[traceback] WARN: .stackmap invalid -- %s (file %lld bytes), addresses only this run\n", Reason, Size) EmitLine(N) @@ -805,7 +805,7 @@ def MapFailHdr(Size: int64, Reason: str, Head: bytes) -> int: """Validation failed with the header read: also print the actual header fields.""" if _State == None or _State.LineBuf == None: return 0 - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "[traceback] WARN: .stackmap invalid -- %s" " (read magic=0x%x version=%u entry_count=%u str_count=%u str_bytes=%u; file %lld bytes)," " addresses only this run\n", @@ -819,7 +819,7 @@ def MapFailEntry(Size: int64, Index: int, Reason: str, Got: uint64) -> int: """Record-table validation failed: print the offending index and value.""" if _State == None or _State.LineBuf == None: return 0 - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "[traceback] WARN: .stackmap invalid -- %s (entry %d, value=0x%llx; file %lld bytes)," " addresses only this run\n", Reason, Index, Got, Size) @@ -896,12 +896,12 @@ def LoadMapFile(hFile: HANDLE, Size: int64) -> int: Err: ULONG = GetLastError() stdlib.free(t.CPtr(Buf)) if _State != None and _State.LineBuf != None: - RN: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + RN: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "[traceback] WARN: read .stackmap failed (GetLastError=%u)," " addresses only this run\n", Err) EmitLine(RN) return 0 - if t.CSizeT(Got) != t.CSizeT(Size): + if sizet(Got) != sizet(Size): stdlib.free(t.CPtr(Buf)) return MapFailPlain(Size, "read fewer bytes than the file size") # Header: magic / version / entry_count / str_count / str_bytes @@ -1037,7 +1037,7 @@ def EmitSourceText(Path: str, LineNo: int): if Out == 0: return Src[Out] = char(0) - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), " %s\n", Src) + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " %s\n", Src) EmitLine(N) @@ -1069,14 +1069,14 @@ def EmitFrame(Addr: uint64, Base: uint64, Scanned: int): # coarse upper bound WalkRbpChain / ScanStack already use for "inside the main module". if Base == 0 or Addr < Base or Addr >= Base + uint64(TRACEBACK_MODULE_MAX): # Outside the main image (DLL / system / corrupt frame): address only. - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " File \"<0x%llx external>\", line 0, in %s\n", Addr, Tail) EmitLine(N) return Rva: uint64 = Addr - Base if _State.MapOk == 0: # No map (sidecar missing/corrupt): keep the address + RVA in the same File line. - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " File \"<0x%llx +0x%llx no source line mapping>\", line 0, in %s\n", Addr, Rva, Tail) EmitLine(N) @@ -1092,12 +1092,12 @@ def EmitFrame(Addr: uint64, Base: uint64, Scanned: int): else: First: uint64 = EntryRva(0) Last: uint64 = EntryRva(int(_State.EntryCount) - 1) - M: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + M: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " srcline map: rva 0x%llx not hit (%u entries: first rva=0x%llx last rva=0x%llx;" " target < first => writer RVA base mismatch)\n", Rva, _State.EntryCount, First, Last) EmitLine(M) - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " File \"<0x%llx +0x%llx no source line mapping>\", line 0, in %s\n", Addr, Rva, Tail) EmitLine(N) @@ -1110,7 +1110,7 @@ def EmitFrame(Addr: uint64, Base: uint64, Scanned: int): FuncName: str = "unknown" if FuncOff != 0: FuncName = str(_State.StrBase + int(FuncOff)) - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " File \"%s\", line %u, in %s%s\n", FileName, Line, FuncName, Tail) EmitLine(N) EmitSourceText(FileName, int(Line)) @@ -1232,10 +1232,10 @@ def WalkViaDbgHelp(hProcess: HANDLE, hThread: HANDLE, CtxPtr: VOIDPTR, Fta: uint64 = 0 if Cur != 0: Fta = uint64(dbg.SymFunctionTableAccess64(hProcess, Cur)) - D0: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D0: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] StackWalk64 first: ret=%d addrpc=0x%llx fta=0x%llx\n", int(Ok), Cur, Fta) EmitLine(D0) - D1: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D1: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] StackWalk64 in: machine=0x%x rip=0x%llx rsp=0x%llx rbp=0x%llx\n", uint32(dbg.IMAGE_FILE_MACHINE_AMD64), InRip, InRsp, InRbp) EmitLine(D1) @@ -1245,13 +1245,13 @@ def WalkViaDbgHelp(hProcess: HANDLE, hThread: HANDLE, CtxPtr: VOIDPTR, else: Reason = "stackwalk_failed" if DiagEnabled() != 0: - D2: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D2: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] StackWalk64 returned 0 at frame %d (addrpc=0x%llx), stop\n", i, Cur) EmitLine(D2) if _State.ReadMemFailed != 0 and DiagEnabled() != 0: # Right after the first-frame code, print the read-memory failure (one "0 # frames" cause: the callback returned 0 and StackWalk64 stopped). - DR: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + DR: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] readmem failed addr=0x%llx size=%u GetLastError=%u\n", _State.ReadMemAddr, _State.ReadMemSize, _State.ReadMemErr) EmitLine(DR) @@ -1259,7 +1259,7 @@ def WalkViaDbgHelp(hProcess: HANDLE, hThread: HANDLE, CtxPtr: VOIDPTR, if Cur == 0: Reason = "addrpc_zero" if DiagEnabled() != 0: - D3: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D3: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] StackWalk64 frame %d addrpc=0, stop\n", i) EmitLine(D3) break @@ -1268,7 +1268,7 @@ def WalkViaDbgHelp(hProcess: HANDLE, hThread: HANDLE, CtxPtr: VOIDPTR, Frames = i # Unified "leave walk" diagnostic covering every break and the normal end; Reason is set. if DiagEnabled() != 0: - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] walk: return reason=%s frames=%d\n", Reason, Frames) EmitLine(N) return Frames @@ -1326,7 +1326,7 @@ def WalkRbpChain(Rip: uint64, Rbp: uint64, Base: uint64) -> int: # faulting); dereferencing a wild rbp directly would crash, which the primary path # must never do. OkRead: BOOL = wm.ReadProcessMemory(HProc, t.CPtr(Cur), &Two, sizet(16), &Rd) - if OkRead == 0 or t.CSizeT(Rd) < t.CSizeT(16): + if OkRead == 0 or sizet(Rd) < sizet(16): # GetLastError must be read immediately after ReadProcessMemory. RpmErr = GetLastError() Reason = "rpm_failed" @@ -1352,14 +1352,14 @@ def WalkRbpChain(Rip: uint64, Rbp: uint64, Base: uint64) -> int: Reason = "step_too_large" Reject = 1 if DiagEnabled() != 0: - D0: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D0: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] rbp: frame=%d rbp=0x%llx [rbp]=0x%llx [rbp+8]=0x%llx\n", i, Cur, V0, V1) EmitLine(D0) Acc: int = 1 if Reject != 0: Acc = 0 if DiagEnabled() != 0: - D1: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D1: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] rbp: frame=%d rpm_ok=%d rpm_err=%u accept=%d reject_reason=%s\n", i, RpmOk, RpmErr, Acc, Reason) EmitLine(D1) @@ -1414,18 +1414,18 @@ def ScanStack(StartIndex: int, Rsp: uint64, Base: uint64) -> int: Addr: uint64 = Rsp Stop: str = "reached_scan_limit" if DiagEnabled() != 0: - D0: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D0: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] scan: rsp=0x%llx upper=0x%llx chunk=%d hits_max=%d\n", Rsp, Upper, TRACEBACK_SCAN_CHUNK_BYTES, TRACEBACK_SCAN_MAX_HITS) EmitLine(D0) while Addr < Upper: Rd: sizet = 0 OkRead: BOOL = wm.ReadProcessMemory(HProc, t.CPtr(Addr), &Words, sizet(TRACEBACK_SCAN_CHUNK_BYTES), &Rd) - N: int = int(t.CSizeT(Rd) / t.CSizeT(8)) # u64 words actually read in this chunk + N: int = int(sizet(Rd) / sizet(8)) # u64 words actually read in this chunk if OkRead == 0 or N <= 0: Er: ULONG = GetLastError() if DiagEnabled() != 0: - D1: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D1: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] scan: block read failed addr=0x%llx err=%u, stop\n", Addr, Er) EmitLine(D1) Stop = "block_read_failed" @@ -1459,7 +1459,7 @@ def ScanStack(StartIndex: int, Rsp: uint64, Base: uint64) -> int: k += 1 Addr = Addr + uint64(TRACEBACK_SCAN_CHUNK_BYTES) if DiagEnabled() != 0: - D2: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + D2: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] scan: scan_candidates=%d stop=%s\n", Hits, Stop) EmitLine(D2) # Collect the inferred frames, capped by the global frame limit (authoritative frames already @@ -1514,7 +1514,7 @@ def PrintFrames(Base: uint64): while j >= 0: EmitFrame(_State.FrameAddr[j], Base, int(_State.FrameScan[j])) j -= 1 - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " frames=%d\n", _State.FrameCount) EmitLine(N) @@ -1537,7 +1537,7 @@ def WriteDumpHeaderFile(IsBreak: int): Trig: str = "Ctrl+C" if IsBreak != 0: Trig = "Ctrl+Break" - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "\n===== 栈转储 %04u-%02u-%02u %02u:%02u:%02u.%03u pid=%u 触发=%s 主线程id=%u Seq=%d =====\n", uint32(St.wYear), uint32(St.wMonth), uint32(St.wDay), uint32(St.wHour), uint32(St.wMinute), uint32(St.wSecond), @@ -1599,16 +1599,16 @@ def DumpMainThread(IsBreak: int) -> int: MB: int = 1 if _State.ModuleBaseAddr != None else 0 N: int = 0 if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] Seq=%d cbthread=%u mainthread=%u dump_enter_prev=%d " "mapok=%d symready=%d modinited=%d\n", _State.Seq, wp.GetCurrentThreadId(), _State.MainThreadId, EnterOld, _State.MapOk, _State.SymReady, _State.ModInited) EmitLine(N) - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] modbase=0x%llx SymGetModuleBase64(main)=0x%llx\n", MBase, ModBaseRet) EmitLine(N) - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] frame_buf=%d cb_fta=%d cb_mba=%d\n", FB, FT, MB) EmitLine(N) Trigger: str = "Ctrl+C" @@ -1616,20 +1616,20 @@ def DumpMainThread(IsBreak: int) -> int: if IsBreak != 0: Trigger = "Ctrl+Break" AfterTag = "continue" - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " Trigger=%s after_dump=%s mainthread=%u cbthread=%u\n", Trigger, AfterTag, _State.MainThreadId, wp.GetCurrentThreadId()) EmitLine(N) hThread: HANDLE = wp.OpenThread(ULONG(wp.THREAD_SUSPEND_RESUME | wp.THREAD_GET_CONTEXT), 0, _State.MainThreadId) if hThread == None or hThread == INVALID_HANDLE_VALUE: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " fallback: OpenThread(main) failed (GetLastError=%u), cannot dump stack\n", GetLastError()) EmitLine(N) AtomicLeaveDump() return 0 if wp.SuspendThread(hThread) == ULONG(TRACEBACK_SUSPEND_FAILED): - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " fallback: SuspendThread(main) failed (GetLastError=%u), cannot dump stack\n", GetLastError()) EmitLine(N) @@ -1641,7 +1641,7 @@ def DumpMainThread(IsBreak: int) -> int: ctx: rawptr[wp.CONTEXT] = (rawptr[wp.CONTEXT])(_State.ContextBuf) ctx.ContextFlags = uint32(wp.CONTEXT_FULL) if wp.GetThreadContext(hThread, t.CPtr(_State.ContextBuf)) == 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " fallback: GetThreadContext failed (GetLastError=%u), cannot dump stack\n", GetLastError()) EmitLine(N) @@ -1669,7 +1669,7 @@ def DumpMainThread(IsBreak: int) -> int: AsanPresent = 1 DbgUsable: int = DbgHelpUsable() if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] symwalk: use_dbghelp=%d symready=%d asan=%d dbg_usable=%d\n", TRACEBACK_USE_DBGHELP, _State.SymReady, AsanPresent, DbgUsable) EmitLine(N) @@ -1691,19 +1691,19 @@ def DumpMainThread(IsBreak: int) -> int: SymTag: str = "rbp-chain primary (dbghelp not required)" if DbgUsable != 0: SymTag = "rbp-chain primary, dbghelp optional" - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " exe base=0x%llx RIP=0x%llx RSP=0x%llx RBP=0x%llx\n", Base, Rip, Rsp, Rbp) EmitLine(N) if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " srcline_map=%s symwalk=%s\n", MapTag, SymTag) EmitLine(N) Frames: int = 0 # "enter walk" evidence (only with diagnostics on); if it is missing after a key press while # TRACEBACK_DIAG=1, DumpMainThread returned earlier at one of the three fallbacks above. if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] walk: enter use_dbghelp=%d symready=%d modinited=%d " "frame_buf=%d mapok=%d asan=%d\n", TRACEBACK_USE_DBGHELP, _State.SymReady, _State.ModInited, FB, _State.MapOk, @@ -1712,7 +1712,7 @@ def DumpMainThread(IsBreak: int) -> int: if DbgUsable == 0: # Keep a "[diag] StackWalk64 first:" line before the RBP chain (here ret=not-called, with # the prerequisites); a real call would emit it from inside WalkViaDbgHelp. - DNC: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + DNC: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] StackWalk64 first: ret=not-called symready=%d cb_fta=%d cb_mba=%d frame_buf=%d\n", _State.SymReady, FT, MB, FB) EmitLine(DNC) @@ -1727,7 +1727,7 @@ def DumpMainThread(IsBreak: int) -> int: # able to unwind through the frameless ntdll/kernel32 frames and print the real .vp stack. RbpFrames: int = Frames if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] walk: rbp_chain frames=%d\n", Frames) EmitLine(N) # ---- Second fallback: stack scan (no RBP / frame pointer) ---- @@ -1739,7 +1739,7 @@ def DumpMainThread(IsBreak: int) -> int: Sc: int = ScanStack(Frames, Rsp, Base) Frames = Frames + Sc if DiagEnabled() != 0: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] walk: scan frames=%d total=%d\n", Sc, Frames) EmitLine(N) # ---- Optional enhancement: only when the RBP chain got <=1 frame and dbghelp is usable ---- @@ -1778,7 +1778,7 @@ def DumpMainThread(IsBreak: int) -> int: Frames = _State.FrameCount if DiagEnabled() != 0: # "leave walk" evidence, paired with walk: enter. - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [diag] walk: leave frames=%d mapok=%d\n", Frames, _State.MapOk) EmitLine(N) if Frames == 0: @@ -1788,10 +1788,10 @@ def DumpMainThread(IsBreak: int) -> int: PrintFrames(Base) # Summary after the whole traceback: dump sequence + dump-file notice. if _DumpFile != None and _DumpFile != INVALID_HANDLE_VALUE: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [traceback] dump seq=%d also appended to .stackdump.txt\n", _State.Seq) else: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [traceback] dump seq=%d console only (dump file unavailable)\n", _State.Seq) EmitLine(N) EmitText("=== stack dump end ===\n") @@ -1850,7 +1850,7 @@ def DumpCrashThread(Info: VOIDPTR) -> int: Two[0] = 0 Two[1] = 0 if wm.ReadProcessMemory(HProc, t.CPtr(Info), &Two, sizet(16), &Rd) == 0 \ - or t.CSizeT(Rd) < t.CSizeT(16): + or sizet(Rd) < sizet(16): EmitText(" fallback: EXCEPTION_POINTERS unreadable, crash dump skipped\n") AtomicLeaveDump() return 0 @@ -1871,12 +1871,12 @@ def DumpCrashThread(Info: VOIDPTR) -> int: RecWords[0] = 0 if Rec != 0: if wm.ReadProcessMemory(HProc, t.CPtr(Rec), &RecWords, sizet(48), &Rd) != 0 \ - and t.CSizeT(Rd) >= t.CSizeT(48): + and sizet(Rd) >= sizet(48): Code = RecWords[0] ExAddr = uint64(RecWords[4]) | (uint64(RecWords[5]) << 32) AvKind = RecWords[8] AvAddr = uint64(RecWords[10]) | (uint64(RecWords[11]) << 32) - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " Trigger=unhandled-exception code=0x%x addr=0x%llx" " av_kind=%u av_addr=0x%llx crashthread=%u\n", Code, ExAddr, AvKind, AvAddr, wp.GetCurrentThreadId()) @@ -1887,7 +1887,7 @@ def DumpCrashThread(Info: VOIDPTR) -> int: return 0 if wm.ReadProcessMemory(HProc, t.CPtr(CtxPtr), t.CPtr(_State.ContextBuf), wp.CONTEXT.__sizeof__(), &Rd) == 0 \ - or t.CSizeT(Rd) < t.CSizeT(wp.CONTEXT.__sizeof__()): + or sizet(Rd) < sizet(wp.CONTEXT.__sizeof__()): EmitText(" fallback: CONTEXT unreadable, crash dump skipped\n") AtomicLeaveDump() return 0 @@ -1896,7 +1896,7 @@ def DumpCrashThread(Info: VOIDPTR) -> int: Rip: uint64 = uint64(ctx.Rip) Rsp: uint64 = uint64(ctx.Rsp) Rbp: uint64 = uint64(ctx.Rbp) - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " exe base=0x%llx RIP=0x%llx RSP=0x%llx RBP=0x%llx\n", Base, Rip, Rsp, Rbp) EmitLine(N) @@ -1906,7 +1906,7 @@ def DumpCrashThread(Info: VOIDPTR) -> int: # dereference). Printed for crashes only: the Ctrl+C path has no faulting instruction whose # operands matter, and this is the one datum that distinguishes "wrong argument" from # "argument right, pointee contents wrong" without another rebuild. - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " regs: rcx=0x%llx rdx=0x%llx r8=0x%llx r9=0x%llx r12=0x%llx\n", uint64(ctx.Rcx), uint64(ctx.Rdx), uint64(ctx.R8), uint64(ctx.R9), uint64(ctx.R12)) @@ -1928,11 +1928,11 @@ def DumpCrashThread(Info: VOIDPTR) -> int: Frames = Frames + ScanStack(Frames, Rsp, Base) PrintFrames(Base) if _DumpFile != None and _DumpFile != INVALID_HANDLE_VALUE: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [traceback] crash dump seq=%d also appended to .stackdump.txt\n", _State.Seq) else: - N = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), " [traceback] crash dump seq=%d console only (dump file unavailable)\n", _State.Seq) EmitLine(N) @@ -1980,7 +1980,7 @@ def NoteError(Text: str, Code: ULONG): """Install/degradation diagnostic: one '(GetLastError=%u)' line to the dump sink.""" if _State == None or _State.LineBuf == None: return - N: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + N: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "%s(GetLastError=%u)\n", Text, Code) EmitLine(N) @@ -2006,11 +2006,11 @@ def Install() -> int: EmitEarly("[traceback] WARN: path buffer alloc failed, ctrl handler not installed\n") return 0 Plen: ULONG = wf.GetModuleFileNameA(None, Pb, ULONG(TRACEBACK_PATH_CAP)) - if Plen == 0 or t.CSizeT(Plen) >= t.CSizeT(TRACEBACK_PATH_CAP): + if Plen == 0 or sizet(Plen) >= sizet(TRACEBACK_PATH_CAP): stdlib.free(t.CPtr(Pb)) EmitEarly("[traceback] WARN: GetModuleFileNameA failed, ctrl handler not installed\n") return 0 - if t.CSizeT(Plen) + 16 > t.CSizeT(TRACEBACK_PATH_CAP): + if sizet(Plen) + 16 > sizet(TRACEBACK_PATH_CAP): # 16 bytes of slack covers both ".stackmap" (10) and ".stackdump.txt" (16). stdlib.free(t.CPtr(Pb)) EmitEarly("[traceback] WARN: exe path too long to append suffix safely, ctrl handler not installed\n") @@ -2068,7 +2068,7 @@ def Install() -> int: _DumpFile = None EmitText("[traceback] WARN: cannot open stack dump file, console-only output\n") else: - DN: int = stdio.snprintf(_State.LineBuf, t.CSizeT(TRACEBACK_LINE_CAP), + DN: int = stdio.snprintf(_State.LineBuf, sizet(TRACEBACK_LINE_CAP), "[traceback] stack dump also written to: %s\n", str(Pb)) EmitLine(DN) # (4) load the sidecar (a failure only disables the map; the handler is still installed so at diff --git a/vqt6/__init__.vp b/vqt6/__init__.vp index 6c92325..830b8db 100644 --- a/vqt6/__init__.vp +++ b/vqt6/__init__.vp @@ -153,7 +153,7 @@ novirtual class QApplication: def __init__(self, argv: list[str]*): # 把 argv 转换为 argc/argv 数组 - argc: t.CInt = 1 + argc: int = 1 # Viper 端 argv 是 c_char_p 指针数组 # 这里仅传空 argv，避免 C ABI 复杂性 argv_ptr: t.CPtr = t.CPtr(0) @@ -1889,7 +1889,7 @@ novirtual class Canvas: def mode(self) -> int: return vqt6_canvas_mode(self._ptr) - def setPen(self, r: int, g: int, b: int, width_norm: t.CDouble): + def setPen(self, r: int, g: int, b: int, width_norm: double): vqt6_canvas_set_pen(self._ptr, r, g, b, width_norm) def setGrid(self, on: int): @@ -1956,7 +1956,7 @@ novirtual class Graph3D: if self._ptr is None: raise RuntimeError("Failed to create Graph3D") - def setup(self, layer_sizes: t.CInt | t.CPtr, n_layers: int): + def setup(self, layer_sizes: int*, n_layers: int): """layer_sizes: int 数组指针(输入层→输出层各层节点数)""" vqt6_graph3d_setup(self._ptr, layer_sizes, n_layers) @@ -1969,31 +1969,31 @@ novirtual class Graph3D: def edgeCount(self) -> int: return vqt6_graph3d_edge_count(self._ptr) - def setLayerAlpha(self, layer: int, alpha: t.CDouble): + def setLayerAlpha(self, layer: int, alpha: double): """逐层点亮: 0..1""" vqt6_graph3d_set_layer_alpha(self._ptr, layer, alpha) - def setAllLayerAlpha(self, alpha: t.CDouble): + def setAllLayerAlpha(self, alpha: double): vqt6_graph3d_set_all_layer_alpha(self._ptr, alpha) - def setValues(self, values: t.CDouble | t.CPtr, n: int): + def setValues(self, values: double*, n: int): """每节点激活值(0..1), 影响亮度与半径""" vqt6_graph3d_set_values(self._ptr, values, n) - def setEdgeWeights(self, w: t.CDouble | t.CPtr, n: int): + def setEdgeWeights(self, w: double*, n: int): """边权重(按层间顺序), 影响颜色/透明度并按 |w| 裁剪""" vqt6_graph3d_set_edge_weights(self._ptr, w, n) - def setEdgeThreshold(self, tval: t.CDouble): + def setEdgeThreshold(self, tval: double): vqt6_graph3d_set_edge_threshold(self._ptr, tval) def setEdgeBudget(self, max_edges: int): vqt6_graph3d_set_edge_budget(self._ptr, max_edges) - def setView(self, yaw_deg: t.CDouble, pitch_deg: t.CDouble, dist: t.CDouble): + def setView(self, yaw_deg: double, pitch_deg: double, dist: double): vqt6_graph3d_set_view(self._ptr, yaw_deg, pitch_deg, dist) - def setNodeScale(self, s: t.CDouble): + def setNodeScale(self, s: double): vqt6_graph3d_set_node_scale(self._ptr, s) def setBackground(self, r: int, g: int, b: int): @@ -2002,8 +2002,8 @@ novirtual class Graph3D: def resetView(self): vqt6_graph3d_reset_view(self._ptr) - def view(self, yaw_deg: t.CDouble | t.CPtr, pitch_deg: t.CDouble | t.CPtr, - dist: t.CDouble | t.CPtr): + def view(self, yaw_deg: double*, pitch_deg: double*, + dist: double*): vqt6_graph3d_get_view(self._ptr, yaw_deg, pitch_deg, dist) def viewChanged(self, cb: bytes, data: bytes = 0): @@ -2054,7 +2054,7 @@ novirtual class ChartView: def addLine(self, name: str, r: int, g: int, b: int, right_axis: int = 0) -> QtChartSeriesPtr: return vqt6_chartview_add_line(self._ptr, name, r, g, b, right_axis) - def append(self, series: QtChartSeriesPtr, x: t.CDouble, y: t.CDouble): + def append(self, series: QtChartSeriesPtr, x: double, y: double): vqt6_chartview_append(self._ptr, series, x, y) def clearSeries(self, series: QtChartSeriesPtr): diff --git a/vqt6/_qtcore.vp b/vqt6/_qtcore.vp index 6da2194..465a589 100644 --- a/vqt6/_qtcore.vp +++ b/vqt6/_qtcore.vp @@ -13,27 +13,27 @@ from vqt6._types import * # QString — UTF-16 字符串 # ============================================================ # 创建 QString（从 UTF-8 C 字符串） -def vqt6_qstring_create(utf8: char | t.CPtr) -> QtStringPtr | t.State: pass +def vqt6_qstring_create(utf8: char*) -> QtStringPtr | t.State: pass # 获取 QString 的 UTF-8 表示（写入 buf，返回实际长度，不含 \0） # buf 需足够大（建议 4 * qstring.length() + 1） -def vqt6_qstring_to_utf8(qstr: QtStringPtr, buf: char | t.CPtr, buf_size: sizet) -> sizet | t.State: pass +def vqt6_qstring_to_utf8(qstr: QtStringPtr, buf: char*, buf_size: sizet) -> sizet | t.State: pass # 释放 QString def vqt6_qstring_free(qstr: QtStringPtr) -> t.State: pass # 获取 QString 字符数 -def vqt6_qstring_length(qstr: QtStringPtr) -> t.CInt | t.State: pass +def vqt6_qstring_length(qstr: QtStringPtr) -> int | t.State: pass # QString 是否为空 -def vqt6_qstring_is_empty(qstr: QtStringPtr) -> t.CInt | t.State: pass +def vqt6_qstring_is_empty(qstr: QtStringPtr) -> int | t.State: pass # QString 比较 -def vqt6_qstring_equals(qstr: QtStringPtr, other: QtStringPtr) -> t.CInt | t.State: pass +def vqt6_qstring_equals(qstr: QtStringPtr, other: QtStringPtr) -> int | t.State: pass # QString 拼接（返回新 QString） def vqt6_qstring_append(qstr: QtStringPtr, other: QtStringPtr) -> QtStringPtr | t.State: pass -def vqt6_asset_url_utf8(buf: char | t.CPtr, buf_size: sizet, name: char | t.CPtr) -> t.State: pass +def vqt6_asset_url_utf8(buf: char*, buf_size: sizet, name: char*) -> t.State: pass # ============================================================ @@ -60,11 +60,11 @@ def vqt6_qobject_parent(obj: QtObjectPtr) -> QtObjectPtr | t.State: pass # typedef void (*vqt6_callback_t)(void* user_data); # vqt6_qobject_connect_typed(sender, signal_id, receiver, slot_id, type) 由 C++ 桥接层处理 # 由于函数指针在 C ABI 中复杂，我们采用字符串 signal/slot 名 + 全局回调注册表 -def vqt6_qobject_connect(sender: QtObjectPtr, signal_name: char | t.CPtr, - receiver: QtObjectPtr, slot_name: char | t.CPtr) -> t.CInt | t.State: pass +def vqt6_qobject_connect(sender: QtObjectPtr, signal_name: char*, + receiver: QtObjectPtr, slot_name: char*) -> int | t.State: pass -def vqt6_qobject_disconnect(sender: QtObjectPtr, signal_name: char | t.CPtr, - receiver: QtObjectPtr, slot_name: char | t.CPtr) -> t.CInt | t.State: pass +def vqt6_qobject_disconnect(sender: QtObjectPtr, signal_name: char*, + receiver: QtObjectPtr, slot_name: char*) -> int | t.State: pass # 事件过滤器 def vqt6_qobject_install_event_filter(watched: QtObjectPtr, filter: QtObjectPtr) -> t.State: pass @@ -74,14 +74,14 @@ def vqt6_qobject_remove_event_filter(watched: QtObjectPtr, filter: QtObjectPtr) # ============================================================ # QCoreApplication — 事件循环基类 # ============================================================ -def vqt6_qcoreapp_create(app_name: char | t.CPtr) -> QtCoreAppPtr | t.State: pass +def vqt6_qcoreapp_create(app_name: char*) -> QtCoreAppPtr | t.State: pass def vqt6_qcoreapp_instance() -> QtCoreAppPtr | t.State: pass -def vqt6_qcoreapp_exec(app: QtCoreAppPtr) -> t.CInt | t.State: pass -def vqt6_qcoreapp_quit(app: QtCoreAppPtr, exit_code: t.CInt) -> t.State: pass -def vqt6_qcoreapp_exit(app: QtCoreAppPtr, exit_code: t.CInt) -> t.State: pass -def vqt6_qcoreapp_process_events(app: QtCoreAppPtr, flags: t.CInt) -> t.State: pass +def vqt6_qcoreapp_exec(app: QtCoreAppPtr) -> int | t.State: pass +def vqt6_qcoreapp_quit(app: QtCoreAppPtr, exit_code: int) -> t.State: pass +def vqt6_qcoreapp_exit(app: QtCoreAppPtr, exit_code: int) -> t.State: pass +def vqt6_qcoreapp_process_events(app: QtCoreAppPtr, flags: int) -> t.State: pass def vqt6_qcoreapp_post_event(receiver: QtObjectPtr, event: QtEventPtr) -> t.State: pass -def vqt6_qcoreapp_send_event(receiver: QtObjectPtr, event: QtEventPtr) -> t.CInt | t.State: pass +def vqt6_qcoreapp_send_event(receiver: QtObjectPtr, event: QtEventPtr) -> int | t.State: pass def vqt6_qcoreapp_organization_name(app: QtCoreAppPtr) -> QtStringPtr | t.State: pass def vqt6_qcoreapp_set_organization_name(app: QtCoreAppPtr, name: QtStringPtr) -> t.State: pass def vqt6_qcoreapp_application_name(app: QtCoreAppPtr) -> QtStringPtr | t.State: pass @@ -93,13 +93,13 @@ def vqt6_qcoreapp_set_application_name(app: QtCoreAppPtr, name: QtStringPtr) -> # ============================================================ def vqt6_qtimer_create() -> QtTimerPtr | t.State: pass def vqt6_qtimer_create_with_parent(parent: QtObjectPtr) -> QtTimerPtr | t.State: pass -def vqt6_qtimer_start(timer: QtTimerPtr, interval_ms: t.CInt) -> t.State: pass +def vqt6_qtimer_start(timer: QtTimerPtr, interval_ms: int) -> t.State: pass def vqt6_qtimer_stop(timer: QtTimerPtr) -> t.State: pass -def vqt6_qtimer_set_interval(timer: QtTimerPtr, interval_ms: t.CInt) -> t.State: pass -def vqt6_qtimer_interval(timer: QtTimerPtr) -> t.CInt | t.State: pass -def vqt6_qtimer_is_active(timer: QtTimerPtr) -> t.CInt | t.State: pass -def vqt6_qtimer_set_single_shot(timer: QtTimerPtr, single_shot: t.CInt) -> t.State: pass -def vqt6_qtimer_is_single_shot(timer: QtTimerPtr) -> t.CInt | t.State: pass +def vqt6_qtimer_set_interval(timer: QtTimerPtr, interval_ms: int) -> t.State: pass +def vqt6_qtimer_interval(timer: QtTimerPtr) -> int | t.State: pass +def vqt6_qtimer_is_active(timer: QtTimerPtr) -> int | t.State: pass +def vqt6_qtimer_set_single_shot(timer: QtTimerPtr, single_shot: int) -> t.State: pass +def vqt6_qtimer_is_single_shot(timer: QtTimerPtr) -> int | t.State: pass # timeout 信号 → 回调（cb 是 Viper 模块级函数，签名 (slot_id: int, user_data: t.CPtr)） def vqt6_qtimer_connect_timeout(timer: QtTimerPtr, cb: bytes, user_data: bytes) -> t.State: pass @@ -107,26 +107,26 @@ def vqt6_qtimer_connect_timeout(timer: QtTimerPtr, cb: bytes, user_data: bytes) # ============================================================ # QVariant — 通用数据容器 # ============================================================ -def vqt6_qvariant_create_int(value: t.CInt) -> QtVariantPtr | t.State: pass -def vqt6_qvariant_create_double(value: t.CDouble) -> QtVariantPtr | t.State: pass -def vqt6_qvariant_create_bool(value: t.CInt) -> QtVariantPtr | t.State: pass +def vqt6_qvariant_create_int(value: int) -> QtVariantPtr | t.State: pass +def vqt6_qvariant_create_double(value: double) -> QtVariantPtr | t.State: pass +def vqt6_qvariant_create_bool(value: int) -> QtVariantPtr | t.State: pass def vqt6_qvariant_create_string(s: QtStringPtr) -> QtVariantPtr | t.State: pass -def vqt6_qvariant_to_int(v: QtVariantPtr, ok: t.CInt | t.CPtr) -> t.CInt | t.State: pass -def vqt6_qvariant_to_double(v: QtVariantPtr, ok: t.CInt | t.CPtr) -> t.CDouble | t.State: pass -def vqt6_qvariant_to_bool(v: QtVariantPtr, ok: t.CInt | t.CPtr) -> t.CInt | t.State: pass +def vqt6_qvariant_to_int(v: QtVariantPtr, ok: int*) -> int | t.State: pass +def vqt6_qvariant_to_double(v: QtVariantPtr, ok: int*) -> double | t.State: pass +def vqt6_qvariant_to_bool(v: QtVariantPtr, ok: int*) -> int | t.State: pass def vqt6_qvariant_to_string(v: QtVariantPtr) -> QtStringPtr | t.State: pass -def vqt6_qvariant_type_id(v: QtVariantPtr) -> t.CInt | t.State: pass -def vqt6_qvariant_is_valid(v: QtVariantPtr) -> t.CInt | t.State: pass +def vqt6_qvariant_type_id(v: QtVariantPtr) -> int | t.State: pass +def vqt6_qvariant_is_valid(v: QtVariantPtr) -> int | t.State: pass def vqt6_qvariant_free(v: QtVariantPtr) -> t.State: pass # ============================================================ # QEvent — 事件基类 # ============================================================ -def vqt6_qevent_type(event: QtEventPtr) -> t.CInt | t.State: pass +def vqt6_qevent_type(event: QtEventPtr) -> int | t.State: pass def vqt6_qevent_accept(event: QtEventPtr) -> t.State: pass def vqt6_qevent_ignore(event: QtEventPtr) -> t.State: pass -def vqt6_qevent_is_accepted(event: QtEventPtr) -> t.CInt | t.State: pass +def vqt6_qevent_is_accepted(event: QtEventPtr) -> int | t.State: pass # ============================================================ @@ -134,8 +134,8 @@ def vqt6_qevent_is_accepted(event: QtEventPtr) -> t.CInt | t.State: pass # ============================================================ def vqt6_qstringlist_create() -> QtStringListPtr | t.State: pass def vqt6_qstringlist_append(list: QtStringListPtr, str: QtStringPtr) -> t.State: pass -def vqt6_qstringlist_size(list: QtStringListPtr) -> t.CInt | t.State: pass -def vqt6_qstringlist_at(list: QtStringListPtr, index: t.CInt) -> QtStringPtr | t.State: pass +def vqt6_qstringlist_size(list: QtStringListPtr) -> int | t.State: pass +def vqt6_qstringlist_at(list: QtStringListPtr, index: int) -> QtStringPtr | t.State: pass def vqt6_qstringlist_free(list: QtStringListPtr) -> t.State: pass @@ -144,8 +144,8 @@ def vqt6_qstringlist_free(list: QtStringListPtr) -> t.State: pass # ============================================================ def vqt6_qbytearraylist_create() -> QtByteArrayListPtr | t.State: pass def vqt6_qbytearraylist_append(list: QtByteArrayListPtr, qba: QtByteArrayPtr) -> t.State: pass -def vqt6_qbytearraylist_size(list: QtByteArrayListPtr) -> t.CInt | t.State: pass -def vqt6_qbytearraylist_at(list: QtByteArrayListPtr, index: t.CInt) -> QtByteArrayPtr | t.State: pass +def vqt6_qbytearraylist_size(list: QtByteArrayListPtr) -> int | t.State: pass +def vqt6_qbytearraylist_at(list: QtByteArrayListPtr, index: int) -> QtByteArrayPtr | t.State: pass def vqt6_qbytearraylist_free(list: QtByteArrayListPtr) -> t.State: pass @@ -155,13 +155,13 @@ def vqt6_qbytearraylist_free(list: QtByteArrayListPtr) -> t.State: pass # 用于从 C++ 端回调 Viper 代码 # Viper 注册一个 slot 函数（用整数 ID 标识），C++ 在触发信号时通过 ID 查找 # typedef void (*vqt6_slot_callback_t)(int slot_id, void* user_data); -def vqt6_register_slot(slot_id: t.CInt, user_data: t.CPtr) -> t.State: pass -def vqt6_unregister_slot(slot_id: t.CInt) -> t.State: pass -def vqt6_trigger_slot(slot_id: t.CInt) -> t.State: pass # 测试用 +def vqt6_register_slot(slot_id: int, user_data: t.CPtr) -> t.State: pass +def vqt6_unregister_slot(slot_id: int) -> t.State: pass +def vqt6_trigger_slot(slot_id: int) -> t.State: pass # 测试用 # ============================================================ # 剪贴板 — 复制链接等 # ============================================================ -def vqt6_clipboard_set_text_utf8(text: char | t.CPtr) -> t.State: pass -def vqt6_clipboard_text_utf8(buf: char | t.CPtr, buf_size: t.CInt) -> t.CInt | t.State: pass +def vqt6_clipboard_set_text_utf8(text: char*) -> t.State: pass +def vqt6_clipboard_text_utf8(buf: char*, buf_size: int) -> int | t.State: pass diff --git a/vqt6/_qtgui.vp b/vqt6/_qtgui.vp index a1ab457..cbcde31 100644 --- a/vqt6/_qtgui.vp +++ b/vqt6/_qtgui.vp @@ -9,22 +9,22 @@ from vqt6._types import * # ============================================================ # QColor — 颜色 # ============================================================ -extern def vqt6_qcolor_create_rgb(r: t.CInt, g: t.CInt, b: t.CInt) -> QtColorPtr -extern def vqt6_qcolor_create_rgba(r: t.CInt, g: t.CInt, b: t.CInt, a: t.CInt) -> QtColorPtr +extern def vqt6_qcolor_create_rgb(r: int, g: int, b: int) -> QtColorPtr +extern def vqt6_qcolor_create_rgba(r: int, g: int, b: int, a: int) -> QtColorPtr extern def vqt6_qcolor_create_name(name: QtStringPtr) -> QtColorPtr extern def vqt6_qcolor_create_hex(hex_str: QtStringPtr) -> QtColorPtr -extern def vqt6_qcolor_red(c: QtColorPtr) -> t.CInt -extern def vqt6_qcolor_green(c: QtColorPtr) -> t.CInt -extern def vqt6_qcolor_blue(c: QtColorPtr) -> t.CInt -extern def vqt6_qcolor_alpha(c: QtColorPtr) -> t.CInt -extern def vqt6_qcolor_set_red(c: QtColorPtr, r: t.CInt) -extern def vqt6_qcolor_set_green(c: QtColorPtr, g: t.CInt) -extern def vqt6_qcolor_set_blue(c: QtColorPtr, b: t.CInt) -extern def vqt6_qcolor_set_alpha(c: QtColorPtr, a: t.CInt) -extern def vqt6_qcolor_set_rgb(c: QtColorPtr, r: t.CInt, g: t.CInt, b: t.CInt) -extern def vqt6_qcolor_set_rgba(c: QtColorPtr, r: t.CInt, g: t.CInt, b: t.CInt, a: t.CInt) +extern def vqt6_qcolor_red(c: QtColorPtr) -> int +extern def vqt6_qcolor_green(c: QtColorPtr) -> int +extern def vqt6_qcolor_blue(c: QtColorPtr) -> int +extern def vqt6_qcolor_alpha(c: QtColorPtr) -> int +extern def vqt6_qcolor_set_red(c: QtColorPtr, r: int) +extern def vqt6_qcolor_set_green(c: QtColorPtr, g: int) +extern def vqt6_qcolor_set_blue(c: QtColorPtr, b: int) +extern def vqt6_qcolor_set_alpha(c: QtColorPtr, a: int) +extern def vqt6_qcolor_set_rgb(c: QtColorPtr, r: int, g: int, b: int) +extern def vqt6_qcolor_set_rgba(c: QtColorPtr, r: int, g: int, b: int, a: int) extern def vqt6_qcolor_name(c: QtColorPtr) -> QtStringPtr -extern def vqt6_qcolor_is_valid(c: QtColorPtr) -> t.CInt +extern def vqt6_qcolor_is_valid(c: QtColorPtr) -> int extern def vqt6_qcolor_free(c: QtColorPtr) @@ -33,23 +33,23 @@ extern def vqt6_qcolor_free(c: QtColorPtr) # ============================================================ extern def vqt6_qfont_create() -> QtFontPtr extern def vqt6_qfont_create_with_family(family: QtStringPtr) -> QtFontPtr -extern def vqt6_qfont_create_with_family_size(family: QtStringPtr, point_size: t.CInt) -> QtFontPtr +extern def vqt6_qfont_create_with_family_size(family: QtStringPtr, point_size: int) -> QtFontPtr extern def vqt6_qfont_set_family(font: QtFontPtr, family: QtStringPtr) extern def vqt6_qfont_family(font: QtFontPtr) -> QtStringPtr -extern def vqt6_qfont_set_point_size(font: QtFontPtr, point_size: t.CInt) -extern def vqt6_qfont_point_size(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_pixel_size(font: QtFontPtr, pixel_size: t.CInt) -extern def vqt6_qfont_pixel_size(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_bold(font: QtFontPtr, bold: t.CInt) -extern def vqt6_qfont_bold(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_italic(font: QtFontPtr, italic: t.CInt) -extern def vqt6_qfont_italic(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_underline(font: QtFontPtr, underline: t.CInt) -extern def vqt6_qfont_underline(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_strike_out(font: QtFontPtr, strike_out: t.CInt) -extern def vqt6_qfont_strike_out(font: QtFontPtr) -> t.CInt -extern def vqt6_qfont_set_weight(font: QtFontPtr, weight: t.CInt) -extern def vqt6_qfont_weight(font: QtFontPtr) -> t.CInt +extern def vqt6_qfont_set_point_size(font: QtFontPtr, point_size: int) +extern def vqt6_qfont_point_size(font: QtFontPtr) -> int +extern def vqt6_qfont_set_pixel_size(font: QtFontPtr, pixel_size: int) +extern def vqt6_qfont_pixel_size(font: QtFontPtr) -> int +extern def vqt6_qfont_set_bold(font: QtFontPtr, bold: int) +extern def vqt6_qfont_bold(font: QtFontPtr) -> int +extern def vqt6_qfont_set_italic(font: QtFontPtr, italic: int) +extern def vqt6_qfont_italic(font: QtFontPtr) -> int +extern def vqt6_qfont_set_underline(font: QtFontPtr, underline: int) +extern def vqt6_qfont_underline(font: QtFontPtr) -> int +extern def vqt6_qfont_set_strike_out(font: QtFontPtr, strike_out: int) +extern def vqt6_qfont_strike_out(font: QtFontPtr) -> int +extern def vqt6_qfont_set_weight(font: QtFontPtr, weight: int) +extern def vqt6_qfont_weight(font: QtFontPtr) -> int extern def vqt6_qfont_free(font: QtFontPtr) @@ -57,10 +57,10 @@ extern def vqt6_qfont_free(font: QtFontPtr) # QFontMetrics — 字体度量 # ============================================================ extern def vqt6_qfontmetrics_create(font: QtFontPtr) -> QtFontMetricsPtr -extern def vqt6_qfontmetrics_width(fm: QtFontMetricsPtr, text: QtStringPtr) -> t.CInt -extern def vqt6_qfontmetrics_height(fm: QtFontMetricsPtr) -> t.CInt -extern def vqt6_qfontmetrics_ascent(fm: QtFontMetricsPtr) -> t.CInt -extern def vqt6_qfontmetrics_descent(fm: QtFontMetricsPtr) -> t.CInt +extern def vqt6_qfontmetrics_width(fm: QtFontMetricsPtr, text: QtStringPtr) -> int +extern def vqt6_qfontmetrics_height(fm: QtFontMetricsPtr) -> int +extern def vqt6_qfontmetrics_ascent(fm: QtFontMetricsPtr) -> int +extern def vqt6_qfontmetrics_descent(fm: QtFontMetricsPtr) -> int extern def vqt6_qfontmetrics_free(fm: QtFontMetricsPtr) @@ -68,14 +68,14 @@ extern def vqt6_qfontmetrics_free(fm: QtFontMetricsPtr) # QPixmap — 像素图 # ============================================================ extern def vqt6_qpixmap_create() -> QtPixmapPtr -extern def vqt6_qpixmap_create_with_size(w: t.CInt, h: t.CInt) -> QtPixmapPtr -extern def vqt6_qpixmap_load(pm: QtPixmapPtr, file_name: QtStringPtr) -> t.CInt -extern def vqt6_qpixmap_load_from_data(pm: QtPixmapPtr, data: t.CPtr, size: sizet) -> t.CInt -extern def vqt6_qpixmap_save(pm: QtPixmapPtr, file_name: QtStringPtr) -> t.CInt -extern def vqt6_qpixmap_width(pm: QtPixmapPtr) -> t.CInt -extern def vqt6_qpixmap_height(pm: QtPixmapPtr) -> t.CInt -extern def vqt6_qpixmap_is_null(pm: QtPixmapPtr) -> t.CInt -extern def vqt6_qpixmap_scaled(pm: QtPixmapPtr, w: t.CInt, h: t.CInt) -> QtPixmapPtr +extern def vqt6_qpixmap_create_with_size(w: int, h: int) -> QtPixmapPtr +extern def vqt6_qpixmap_load(pm: QtPixmapPtr, file_name: QtStringPtr) -> int +extern def vqt6_qpixmap_load_from_data(pm: QtPixmapPtr, data: t.CPtr, size: sizet) -> int +extern def vqt6_qpixmap_save(pm: QtPixmapPtr, file_name: QtStringPtr) -> int +extern def vqt6_qpixmap_width(pm: QtPixmapPtr) -> int +extern def vqt6_qpixmap_height(pm: QtPixmapPtr) -> int +extern def vqt6_qpixmap_is_null(pm: QtPixmapPtr) -> int +extern def vqt6_qpixmap_scaled(pm: QtPixmapPtr, w: int, h: int) -> QtPixmapPtr extern def vqt6_qpixmap_fill(pm: QtPixmapPtr, color: QtColorPtr) extern def vqt6_qpixmap_free(pm: QtPixmapPtr) @@ -84,15 +84,15 @@ extern def vqt6_qpixmap_free(pm: QtPixmapPtr) # QImage — 图像 # ============================================================ extern def vqt6_qimage_create() -> QtImagePtr -extern def vqt6_qimage_create_with_size(w: t.CInt, h: t.CInt, format: t.CInt) -> QtImagePtr -extern def vqt6_qimage_load(img: QtImagePtr, file_name: QtStringPtr) -> t.CInt -extern def vqt6_qimage_save(img: QtImagePtr, file_name: QtStringPtr) -> t.CInt -extern def vqt6_qimage_width(img: QtImagePtr) -> t.CInt -extern def vqt6_qimage_height(img: QtImagePtr) -> t.CInt -extern def vqt6_qimage_format(img: QtImagePtr) -> t.CInt -extern def vqt6_qimage_is_null(img: QtImagePtr) -> t.CInt +extern def vqt6_qimage_create_with_size(w: int, h: int, format: int) -> QtImagePtr +extern def vqt6_qimage_load(img: QtImagePtr, file_name: QtStringPtr) -> int +extern def vqt6_qimage_save(img: QtImagePtr, file_name: QtStringPtr) -> int +extern def vqt6_qimage_width(img: QtImagePtr) -> int +extern def vqt6_qimage_height(img: QtImagePtr) -> int +extern def vqt6_qimage_format(img: QtImagePtr) -> int +extern def vqt6_qimage_is_null(img: QtImagePtr) -> int extern def vqt6_qimage_fill(img: QtImagePtr, color: QtColorPtr) -extern def vqt6_qimage_scaled(img: QtImagePtr, w: t.CInt, h: t.CInt) -> QtImagePtr +extern def vqt6_qimage_scaled(img: QtImagePtr, w: int, h: int) -> QtImagePtr extern def vqt6_qimage_free(img: QtImagePtr) @@ -100,40 +100,40 @@ extern def vqt6_qimage_free(img: QtImagePtr) # QPainter — 绘画器 # ============================================================ extern def vqt6_qpainter_create() -> QtPainterPtr -extern def vqt6_qpainter_begin(p: QtPainterPtr, device: QtPixmapPtr) -> t.CInt -extern def vqt6_qpainter_end(p: QtPainterPtr) -> t.CInt -extern def vqt6_qpainter_is_active(p: QtPainterPtr) -> t.CInt +extern def vqt6_qpainter_begin(p: QtPainterPtr, device: QtPixmapPtr) -> int +extern def vqt6_qpainter_end(p: QtPainterPtr) -> int +extern def vqt6_qpainter_is_active(p: QtPainterPtr) -> int extern def vqt6_qpainter_set_pen(p: QtPainterPtr, pen: QtPenPtr) extern def vqt6_qpainter_set_brush(p: QtPainterPtr, brush: QtBrushPtr) extern def vqt6_qpainter_set_font(p: QtPainterPtr, font: QtFontPtr) extern def vqt6_qpainter_pen(p: QtPainterPtr) -> QtPenPtr extern def vqt6_qpainter_brush(p: QtPainterPtr) -> QtBrushPtr extern def vqt6_qpainter_font(p: QtPainterPtr) -> QtFontPtr -extern def vqt6_qpainter_set_opacity(p: QtPainterPtr, opacity: t.CDouble) -extern def vqt6_qpainter_opacity(p: QtPainterPtr) -> t.CDouble +extern def vqt6_qpainter_set_opacity(p: QtPainterPtr, opacity: double) +extern def vqt6_qpainter_opacity(p: QtPainterPtr) -> double # 绘图原语 -extern def vqt6_qpainter_draw_line(p: QtPainterPtr, x1: t.CInt, y1: t.CInt, x2: t.CInt, y2: t.CInt) -extern def vqt6_qpainter_draw_rect(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt) -extern def vqt6_qpainter_fill_rect(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, color: QtColorPtr) -extern def vqt6_qpainter_draw_ellipse(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt) -extern def vqt6_qpainter_draw_arc(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, start_angle: t.CInt, span_angle: t.CInt) -extern def vqt6_qpainter_draw_chord(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, start_angle: t.CInt, span_angle: t.CInt) -extern def vqt6_qpainter_draw_pie(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, start_angle: t.CInt, span_angle: t.CInt) -extern def vqt6_qpainter_draw_polygon(p: QtPainterPtr, points: t.CInt | t.CPtr, point_count: t.CInt) -extern def vqt6_qpainter_draw_polyline(p: QtPainterPtr, points: t.CInt | t.CPtr, point_count: t.CInt) -extern def vqt6_qpainter_draw_point(p: QtPainterPtr, x: t.CInt, y: t.CInt) -extern def vqt6_qpainter_draw_points(p: QtPainterPtr, points: t.CInt | t.CPtr, point_count: t.CInt) -extern def vqt6_qpainter_draw_text(p: QtPainterPtr, x: t.CInt, y: t.CInt, text: QtStringPtr) -extern def vqt6_qpainter_draw_text_in_rect(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, flags: t.CInt, text: QtStringPtr) -extern def vqt6_qpainter_draw_pixmap(p: QtPainterPtr, x: t.CInt, y: t.CInt, pixmap: QtPixmapPtr) -extern def vqt6_qpainter_draw_image(p: QtPainterPtr, x: t.CInt, y: t.CInt, image: QtImagePtr) -extern def vqt6_qpainter_draw_tiled_pixmap(p: QtPainterPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt, pixmap: QtPixmapPtr) +extern def vqt6_qpainter_draw_line(p: QtPainterPtr, x1: int, y1: int, x2: int, y2: int) +extern def vqt6_qpainter_draw_rect(p: QtPainterPtr, x: int, y: int, w: int, h: int) +extern def vqt6_qpainter_fill_rect(p: QtPainterPtr, x: int, y: int, w: int, h: int, color: QtColorPtr) +extern def vqt6_qpainter_draw_ellipse(p: QtPainterPtr, x: int, y: int, w: int, h: int) +extern def vqt6_qpainter_draw_arc(p: QtPainterPtr, x: int, y: int, w: int, h: int, start_angle: int, span_angle: int) +extern def vqt6_qpainter_draw_chord(p: QtPainterPtr, x: int, y: int, w: int, h: int, start_angle: int, span_angle: int) +extern def vqt6_qpainter_draw_pie(p: QtPainterPtr, x: int, y: int, w: int, h: int, start_angle: int, span_angle: int) +extern def vqt6_qpainter_draw_polygon(p: QtPainterPtr, points: int*, point_count: int) +extern def vqt6_qpainter_draw_polyline(p: QtPainterPtr, points: int*, point_count: int) +extern def vqt6_qpainter_draw_point(p: QtPainterPtr, x: int, y: int) +extern def vqt6_qpainter_draw_points(p: QtPainterPtr, points: int*, point_count: int) +extern def vqt6_qpainter_draw_text(p: QtPainterPtr, x: int, y: int, text: QtStringPtr) +extern def vqt6_qpainter_draw_text_in_rect(p: QtPainterPtr, x: int, y: int, w: int, h: int, flags: int, text: QtStringPtr) +extern def vqt6_qpainter_draw_pixmap(p: QtPainterPtr, x: int, y: int, pixmap: QtPixmapPtr) +extern def vqt6_qpainter_draw_image(p: QtPainterPtr, x: int, y: int, image: QtImagePtr) +extern def vqt6_qpainter_draw_tiled_pixmap(p: QtPainterPtr, x: int, y: int, w: int, h: int, pixmap: QtPixmapPtr) # 变换 -extern def vqt6_qpainter_translate(p: QtPainterPtr, dx: t.CInt, dy: t.CInt) -extern def vqt6_qpainter_rotate(p: QtPainterPtr, angle: t.CDouble) -extern def vqt6_qpainter_scale(p: QtPainterPtr, sx: t.CDouble, sy: t.CDouble) +extern def vqt6_qpainter_translate(p: QtPainterPtr, dx: int, dy: int) +extern def vqt6_qpainter_rotate(p: QtPainterPtr, angle: double) +extern def vqt6_qpainter_scale(p: QtPainterPtr, sx: double, sy: double) extern def vqt6_qpainter_reset_transform(p: QtPainterPtr) extern def vqt6_qpainter_save(p: QtPainterPtr) extern def vqt6_qpainter_restore(p: QtPainterPtr) @@ -146,13 +146,13 @@ extern def vqt6_qpainter_free(p: QtPainterPtr) # ============================================================ extern def vqt6_qpen_create() -> QtPenPtr extern def vqt6_qpen_create_with_color(color: QtColorPtr) -> QtPenPtr -extern def vqt6_qpen_create_with_color_width(color: QtColorPtr, width: t.CInt) -> QtPenPtr +extern def vqt6_qpen_create_with_color_width(color: QtColorPtr, width: int) -> QtPenPtr extern def vqt6_qpen_set_color(pen: QtPenPtr, color: QtColorPtr) extern def vqt6_qpen_color(pen: QtPenPtr) -> QtColorPtr -extern def vqt6_qpen_set_width(pen: QtPenPtr, width: t.CInt) -extern def vqt6_qpen_width(pen: QtPenPtr) -> t.CInt -extern def vqt6_qpen_set_style(pen: QtPenPtr, style: t.CInt) -extern def vqt6_qpen_style(pen: QtPenPtr) -> t.CInt +extern def vqt6_qpen_set_width(pen: QtPenPtr, width: int) +extern def vqt6_qpen_width(pen: QtPenPtr) -> int +extern def vqt6_qpen_set_style(pen: QtPenPtr, style: int) +extern def vqt6_qpen_style(pen: QtPenPtr) -> int extern def vqt6_qpen_free(pen: QtPenPtr) @@ -161,11 +161,11 @@ extern def vqt6_qpen_free(pen: QtPenPtr) # ============================================================ extern def vqt6_qbrush_create() -> QtBrushPtr extern def vqt6_qbrush_create_with_color(color: QtColorPtr) -> QtBrushPtr -extern def vqt6_qbrush_create_with_style(style: t.CInt) -> QtBrushPtr +extern def vqt6_qbrush_create_with_style(style: int) -> QtBrushPtr extern def vqt6_qbrush_set_color(brush: QtBrushPtr, color: QtColorPtr) extern def vqt6_qbrush_color(brush: QtBrushPtr) -> QtColorPtr -extern def vqt6_qbrush_set_style(brush: QtBrushPtr, style: t.CInt) -extern def vqt6_qbrush_style(brush: QtBrushPtr) -> t.CInt +extern def vqt6_qbrush_set_style(brush: QtBrushPtr, style: int) +extern def vqt6_qbrush_style(brush: QtBrushPtr) -> int extern def vqt6_qbrush_free(brush: QtBrushPtr) @@ -176,8 +176,8 @@ extern def vqt6_qicon_create() -> QtIconPtr extern def vqt6_qicon_create_with_file(file_name: QtStringPtr) -> QtIconPtr extern def vqt6_qicon_add_file(icon: QtIconPtr, file_name: QtStringPtr) extern def vqt6_qicon_add_pixmap(icon: QtIconPtr, pixmap: QtPixmapPtr) -extern def vqt6_qicon_is_null(icon: QtIconPtr) -> t.CInt -extern def vqt6_qicon_pixmap(icon: QtIconPtr, w: t.CInt, h: t.CInt) -> QtPixmapPtr +extern def vqt6_qicon_is_null(icon: QtIconPtr) -> int +extern def vqt6_qicon_pixmap(icon: QtIconPtr, w: int, h: int) -> QtPixmapPtr extern def vqt6_qicon_free(icon: QtIconPtr) @@ -185,55 +185,55 @@ extern def vqt6_qicon_free(icon: QtIconPtr) # QCursor — 鼠标光标 # ============================================================ extern def vqt6_qcursor_create() -> QtCursorPtr -extern def vqt6_qcursor_create_with_shape(shape: t.CInt) -> QtCursorPtr -extern def vqt6_qcursor_pos(x: t.CInt | t.CPtr, y: t.CInt | t.CPtr) +extern def vqt6_qcursor_create_with_shape(shape: int) -> QtCursorPtr +extern def vqt6_qcursor_pos(x: int*, y: int*) -extern def vqt6_qcursor_set_pos(x: t.CInt, y: t.CInt) -extern def vqt6_qcursor_set_shape(cursor: QtCursorPtr, shape: t.CInt) -extern def vqt6_qcursor_shape(cursor: QtCursorPtr) -> t.CInt +extern def vqt6_qcursor_set_pos(x: int, y: int) +extern def vqt6_qcursor_set_shape(cursor: QtCursorPtr, shape: int) +extern def vqt6_qcursor_shape(cursor: QtCursorPtr) -> int extern def vqt6_qcursor_free(cursor: QtCursorPtr) # ============================================================ # QKeyEvent — 键盘事件 # ============================================================ -extern def vqt6_qkeyevent_create(type: t.CInt, key: t.CInt, modifiers: t.CInt, text: QtStringPtr) -> QtKeyEventPtr -extern def vqt6_qkeyevent_key(event: QtKeyEventPtr) -> t.CInt +extern def vqt6_qkeyevent_create(type: int, key: int, modifiers: int, text: QtStringPtr) -> QtKeyEventPtr +extern def vqt6_qkeyevent_key(event: QtKeyEventPtr) -> int extern def vqt6_qkeyevent_text(event: QtKeyEventPtr) -> QtStringPtr -extern def vqt6_qkeyevent_modifiers(event: QtKeyEventPtr) -> t.CInt -extern def vqt6_qkeyevent_is_auto_repeat(event: QtKeyEventPtr) -> t.CInt +extern def vqt6_qkeyevent_modifiers(event: QtKeyEventPtr) -> int +extern def vqt6_qkeyevent_is_auto_repeat(event: QtKeyEventPtr) -> int extern def vqt6_qkeyevent_free(event: QtKeyEventPtr) # ============================================================ # QMouseEvent — 鼠标事件 # ============================================================ -extern def vqt6_qmouseevent_create(type: t.CInt, local_pos: QtObjectPtr, button: t.CInt, buttons: t.CInt, modifiers: t.CInt) -> QtMouseEventPtr -extern def vqt6_qmouseevent_button(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_buttons(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_x(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_y(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_global_x(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_global_y(event: QtMouseEventPtr) -> t.CInt -extern def vqt6_qmouseevent_modifiers(event: QtMouseEventPtr) -> t.CInt +extern def vqt6_qmouseevent_create(type: int, local_pos: QtObjectPtr, button: int, buttons: int, modifiers: int) -> QtMouseEventPtr +extern def vqt6_qmouseevent_button(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_buttons(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_x(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_y(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_global_x(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_global_y(event: QtMouseEventPtr) -> int +extern def vqt6_qmouseevent_modifiers(event: QtMouseEventPtr) -> int extern def vqt6_qmouseevent_free(event: QtMouseEventPtr) # ============================================================ # QResizeEvent / QPaintEvent / QCloseEvent # ============================================================ -extern def vqt6_qresizeevent_create(width: t.CInt, height: t.CInt, old_width: t.CInt, old_height: t.CInt) -> QtResizeEventPtr -extern def vqt6_qresizeevent_size(event: QtResizeEventPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -extern def vqt6_qresizeevent_old_size(event: QtResizeEventPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) +extern def vqt6_qresizeevent_create(width: int, height: int, old_width: int, old_height: int) -> QtResizeEventPtr +extern def vqt6_qresizeevent_size(event: QtResizeEventPtr, w: int*, h: int*) +extern def vqt6_qresizeevent_old_size(event: QtResizeEventPtr, w: int*, h: int*) extern def vqt6_qresizeevent_free(event: QtResizeEventPtr) -extern def vqt6_qpaintevent_create(rect_x: t.CInt, rect_y: t.CInt, rect_w: t.CInt, rect_h: t.CInt) -> QtPaintEventPtr -extern def vqt6_qpaintevent_rect(event: QtPaintEventPtr, x: t.CInt | t.CPtr, y: t.CInt | t.CPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -> t.State: pass +extern def vqt6_qpaintevent_create(rect_x: int, rect_y: int, rect_w: int, rect_h: int) -> QtPaintEventPtr +extern def vqt6_qpaintevent_rect(event: QtPaintEventPtr, x: int*, y: int*, w: int*, h: int*) -> t.State: pass extern def vqt6_qpaintevent_free(event: QtPaintEventPtr) extern def vqt6_qcloseevent_create() -> QtCloseEventPtr -extern def vqt6_qcloseevent_is_accepted(event: QtCloseEventPtr) -> t.CInt +extern def vqt6_qcloseevent_is_accepted(event: QtCloseEventPtr) -> int extern def vqt6_qcloseevent_accept(event: QtCloseEventPtr) extern def vqt6_qcloseevent_ignore(event: QtCloseEventPtr) extern def vqt6_qcloseevent_free(event: QtCloseEventPtr) diff --git a/vqt6/_qtnetwork.vp b/vqt6/_qtnetwork.vp index dd7b164..a4807eb 100644 --- a/vqt6/_qtnetwork.vp +++ b/vqt6/_qtnetwork.vp @@ -10,18 +10,18 @@ from vqt6._types import * # QHostAddress — IP 地址 # ============================================================ def vqt6_qhostaddress_create() -> QtHostAddressPtr | t.State: pass -def vqt6_qhostaddress_create_with_ipv4(ipv4: t.CUInt32T) -> QtHostAddressPtr | t.State: pass +def vqt6_qhostaddress_create_with_ipv4(ipv4: uint32) -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_create_with_string(address: QtStringPtr) -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_create_with_local_host() -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_create_with_local_ipv4() -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_create_with_broadcast() -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_create_with_any_ipv4() -> QtHostAddressPtr | t.State: pass def vqt6_qhostaddress_to_string(addr: QtHostAddressPtr) -> QtStringPtr | t.State: pass -def vqt6_qhostaddress_to_ipv4(addr: QtHostAddressPtr) -> t.CUInt32T | t.State: pass -def vqt6_qhostaddress_is_null(addr: QtHostAddressPtr) -> t.CInt | t.State: pass -def vqt6_qhostaddress_is_loopback(addr: QtHostAddressPtr) -> t.CInt | t.State: pass -def vqt6_qhostaddress_is_broadcast(addr: QtHostAddressPtr) -> t.CInt | t.State: pass -def vqt6_qhostaddress_protocol(addr: QtHostAddressPtr) -> t.CInt | t.State: pass +def vqt6_qhostaddress_to_ipv4(addr: QtHostAddressPtr) -> uint32 | t.State: pass +def vqt6_qhostaddress_is_null(addr: QtHostAddressPtr) -> int | t.State: pass +def vqt6_qhostaddress_is_loopback(addr: QtHostAddressPtr) -> int | t.State: pass +def vqt6_qhostaddress_is_broadcast(addr: QtHostAddressPtr) -> int | t.State: pass +def vqt6_qhostaddress_protocol(addr: QtHostAddressPtr) -> int | t.State: pass def vqt6_qhostaddress_free(addr: QtHostAddressPtr) -> t.State: pass @@ -29,35 +29,35 @@ def vqt6_qhostaddress_free(addr: QtHostAddressPtr) -> t.State: pass # QAbstractSocket — TCP/UDP 套接字基类 # ============================================================ # 套接字状态 -QT_SOCKET_UNCONNECTED_STATE: t.CDefine = 0 -QT_SOCKET_HOST_LOOKUP_STATE: t.CDefine = 1 -QT_SOCKET_CONNECTING_STATE: t.CDefine = 2 -QT_SOCKET_CONNECTED_STATE: t.CDefine = 3 -QT_SOCKET_BOUND_STATE: t.CDefine = 4 -QT_SOCKET_LISTENING_STATE: t.CDefine = 5 -QT_SOCKET_CLOSING_STATE: t.CDefine = 6 +define QT_SOCKET_UNCONNECTED_STATE = 0 +define QT_SOCKET_HOST_LOOKUP_STATE = 1 +define QT_SOCKET_CONNECTING_STATE = 2 +define QT_SOCKET_CONNECTED_STATE = 3 +define QT_SOCKET_BOUND_STATE = 4 +define QT_SOCKET_LISTENING_STATE = 5 +define QT_SOCKET_CLOSING_STATE = 6 # 套接字类型 -QT_SOCKET_TCP: t.CDefine = 0 -QT_SOCKET_UDP: t.CDefine = 1 +define QT_SOCKET_TCP = 0 +define QT_SOCKET_UDP = 1 # 套接字错误 -QT_SOCKET_NO_ERROR: t.CDefine = 0 +define QT_SOCKET_NO_ERROR = 0 # 通用方法 -def vqt6_qabstractsocket_state(socket: QtAbstractSocketPtr) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_error(socket: QtAbstractSocketPtr) -> t.CInt | t.State: pass +def vqt6_qabstractsocket_state(socket: QtAbstractSocketPtr) -> int | t.State: pass +def vqt6_qabstractsocket_error(socket: QtAbstractSocketPtr) -> int | t.State: pass def vqt6_qabstractsocket_error_string(socket: QtAbstractSocketPtr) -> QtStringPtr | t.State: pass -def vqt6_qabstractsocket_connect_to_host(socket: QtAbstractSocketPtr, host_name: QtStringPtr, port: t.CUInt16T) -> t.State: pass -def vqt6_qabstractsocket_connect_to_host_with_addr(socket: QtAbstractSocketPtr, address: QtHostAddressPtr, port: t.CUInt16T) -> t.State: pass +def vqt6_qabstractsocket_connect_to_host(socket: QtAbstractSocketPtr, host_name: QtStringPtr, port: uint16) -> t.State: pass +def vqt6_qabstractsocket_connect_to_host_with_addr(socket: QtAbstractSocketPtr, address: QtHostAddressPtr, port: uint16) -> t.State: pass def vqt6_qabstractsocket_disconnect_from_host(socket: QtAbstractSocketPtr) -> t.State: pass -def vqt6_qabstractsocket_wait_for_connected(socket: QtAbstractSocketPtr, timeout_ms: t.CInt) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_wait_for_ready_read(socket: QtAbstractSocketPtr, timeout_ms: t.CInt) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_wait_for_bytes_written(socket: QtAbstractSocketPtr, timeout_ms: t.CInt) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_wait_for_disconnected(socket: QtAbstractSocketPtr, timeout_ms: t.CInt) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_is_valid(socket: QtAbstractSocketPtr) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_is_open(socket: QtAbstractSocketPtr) -> t.CInt | t.State: pass -def vqt6_qabstractsocket_flush(socket: QtAbstractSocketPtr) -> t.CInt | t.State: pass +def vqt6_qabstractsocket_wait_for_connected(socket: QtAbstractSocketPtr, timeout_ms: int) -> int | t.State: pass +def vqt6_qabstractsocket_wait_for_ready_read(socket: QtAbstractSocketPtr, timeout_ms: int) -> int | t.State: pass +def vqt6_qabstractsocket_wait_for_bytes_written(socket: QtAbstractSocketPtr, timeout_ms: int) -> int | t.State: pass +def vqt6_qabstractsocket_wait_for_disconnected(socket: QtAbstractSocketPtr, timeout_ms: int) -> int | t.State: pass +def vqt6_qabstractsocket_is_valid(socket: QtAbstractSocketPtr) -> int | t.State: pass +def vqt6_qabstractsocket_is_open(socket: QtAbstractSocketPtr) -> int | t.State: pass +def vqt6_qabstractsocket_flush(socket: QtAbstractSocketPtr) -> int | t.State: pass def vqt6_qabstractsocket_close(socket: QtAbstractSocketPtr) -> t.State: pass def vqt6_qabstractsocket_abort(socket: QtAbstractSocketPtr) -> t.State: pass def vqt6_qabstractsocket_read(socket: QtAbstractSocketPtr, buf: t.CPtr, max_size: sizet) -> sizet | t.State: pass @@ -66,9 +66,9 @@ def vqt6_qabstractsocket_write(socket: QtAbstractSocketPtr, data: t.CPtr, size: def vqt6_qabstractsocket_bytes_available(socket: QtAbstractSocketPtr) -> sizet | t.State: pass def vqt6_qabstractsocket_bytes_to_write(socket: QtAbstractSocketPtr) -> sizet | t.State: pass def vqt6_qabstractsocket_peer_address(socket: QtAbstractSocketPtr) -> QtHostAddressPtr | t.State: pass -def vqt6_qabstractsocket_peer_port(socket: QtAbstractSocketPtr) -> t.CUInt16T | t.State: pass +def vqt6_qabstractsocket_peer_port(socket: QtAbstractSocketPtr) -> uint16 | t.State: pass def vqt6_qabstractsocket_local_address(socket: QtAbstractSocketPtr) -> QtHostAddressPtr | t.State: pass -def vqt6_qabstractsocket_local_port(socket: QtAbstractSocketPtr) -> t.CUInt16T | t.State: pass +def vqt6_qabstractsocket_local_port(socket: QtAbstractSocketPtr) -> uint16 | t.State: pass # ============================================================ @@ -76,11 +76,11 @@ def vqt6_qabstractsocket_local_port(socket: QtAbstractSocketPtr) -> t.CUInt16T | # ============================================================ def vqt6_qtcpsocket_create() -> QtTcpSocketPtr | t.State: pass def vqt6_qtcpsocket_create_with_parent(parent: QtObjectPtr) -> QtTcpSocketPtr | t.State: pass -def vqt6_qtcpsocket_connect_to_host(socket: QtTcpSocketPtr, host_name: QtStringPtr, port: t.CUInt16T, mode: t.CInt) -> t.State: pass -def vqt6_qtcpsocket_connect_to_host_with_addr(socket: QtTcpSocketPtr, address: QtHostAddressPtr, port: t.CUInt16T, mode: t.CInt) -> t.State: pass -def vqt6_qtcpsocket_set_socket_descriptor(socket: QtTcpSocketPtr, socket_descriptor: t.CInt) -> t.CInt | t.State: pass -def vqt6_qtcpsocket_socket_descriptor(socket: QtTcpSocketPtr) -> t.CInt | t.State: pass -def vqt6_qtcpsocket_set_proxy(socket: QtTcpSocketPtr, proxy_type: t.CInt) -> t.State: pass +def vqt6_qtcpsocket_connect_to_host(socket: QtTcpSocketPtr, host_name: QtStringPtr, port: uint16, mode: int) -> t.State: pass +def vqt6_qtcpsocket_connect_to_host_with_addr(socket: QtTcpSocketPtr, address: QtHostAddressPtr, port: uint16, mode: int) -> t.State: pass +def vqt6_qtcpsocket_set_socket_descriptor(socket: QtTcpSocketPtr, socket_descriptor: int) -> int | t.State: pass +def vqt6_qtcpsocket_socket_descriptor(socket: QtTcpSocketPtr) -> int | t.State: pass +def vqt6_qtcpsocket_set_proxy(socket: QtTcpSocketPtr, proxy_type: int) -> t.State: pass def vqt6_qtcpsocket_abort(socket: QtTcpSocketPtr) -> t.State: pass @@ -89,15 +89,15 @@ def vqt6_qtcpsocket_abort(socket: QtTcpSocketPtr) -> t.State: pass # ============================================================ def vqt6_qudpsocket_create() -> QtUdpSocketPtr | t.State: pass def vqt6_qudpsocket_create_with_parent(parent: QtObjectPtr) -> QtUdpSocketPtr | t.State: pass -def vqt6_qudpsocket_bind(socket: QtUdpSocketPtr, port: t.CUInt16T) -> t.CInt | t.State: pass -def vqt6_qudpsocket_bind_with_addr(socket: QtUdpSocketPtr, address: QtHostAddressPtr, port: t.CUInt16T) -> t.CInt | t.State: pass +def vqt6_qudpsocket_bind(socket: QtUdpSocketPtr, port: uint16) -> int | t.State: pass +def vqt6_qudpsocket_bind_with_addr(socket: QtUdpSocketPtr, address: QtHostAddressPtr, port: uint16) -> int | t.State: pass def vqt6_qudpsocket_close(socket: QtUdpSocketPtr) -> t.State: pass -def vqt6_qudpsocket_write_datagram(socket: QtUdpSocketPtr, data: t.CPtr, size: sizet, host: QtHostAddressPtr, port: t.CUInt16T) -> sizet | t.State: pass -def vqt6_qudpsocket_read_datagram(socket: QtUdpSocketPtr, data: t.CPtr, max_size: sizet, host: QtHostAddressPtr, port: t.CUInt16T | t.CPtr) -> sizet | t.State: pass -def vqt6_qudpsocket_has_pending_datagrams(socket: QtUdpSocketPtr) -> t.CInt | t.State: pass +def vqt6_qudpsocket_write_datagram(socket: QtUdpSocketPtr, data: t.CPtr, size: sizet, host: QtHostAddressPtr, port: uint16) -> sizet | t.State: pass +def vqt6_qudpsocket_read_datagram(socket: QtUdpSocketPtr, data: t.CPtr, max_size: sizet, host: QtHostAddressPtr, port: uint16*) -> sizet | t.State: pass +def vqt6_qudpsocket_has_pending_datagrams(socket: QtUdpSocketPtr) -> int | t.State: pass def vqt6_qudpsocket_pending_datagram_size(socket: QtUdpSocketPtr) -> sizet | t.State: pass -def vqt6_qudpsocket_join_multicast_group(socket: QtUdpSocketPtr, group_address: QtHostAddressPtr) -> t.CInt | t.State: pass -def vqt6_qudpsocket_leave_multicast_group(socket: QtUdpSocketPtr, group_address: QtHostAddressPtr) -> t.CInt | t.State: pass +def vqt6_qudpsocket_join_multicast_group(socket: QtUdpSocketPtr, group_address: QtHostAddressPtr) -> int | t.State: pass +def vqt6_qudpsocket_leave_multicast_group(socket: QtUdpSocketPtr, group_address: QtHostAddressPtr) -> int | t.State: pass # ============================================================ @@ -107,12 +107,12 @@ def vqt6_qnetworkrequest_create() -> QtNetworkRequestPtr | t.State: pass def vqt6_qnetworkrequest_create_with_url(url: QtStringPtr) -> QtNetworkRequestPtr | t.State: pass def vqt6_qnetworkrequest_set_url(req: QtNetworkRequestPtr, url: QtStringPtr) -> t.State: pass def vqt6_qnetworkrequest_url(req: QtNetworkRequestPtr) -> QtStringPtr | t.State: pass -def vqt6_qnetworkrequest_set_header(req: QtNetworkRequestPtr, header_type: t.CInt, value: QtVariantPtr) -> t.State: pass -def vqt6_qnetworkrequest_header(req: QtNetworkRequestPtr, header_type: t.CInt) -> QtVariantPtr | t.State: pass -def vqt6_qnetworkrequest_set_raw_header(req: QtNetworkRequestPtr, header_name: char | t.CPtr, value: t.CPtr, value_size: sizet) -> t.State: pass -def vqt6_qnetworkrequest_raw_header(req: QtNetworkRequestPtr, header_name: char | t.CPtr, out_size: sizet*) -> t.CPtr | t.State: pass -def vqt6_qnetworkrequest_set_attribute(req: QtNetworkRequestPtr, attr_type: t.CInt, value: QtVariantPtr) -> t.State: pass -def vqt6_qnetworkrequest_attribute(req: QtNetworkRequestPtr, attr_type: t.CInt) -> QtVariantPtr | t.State: pass +def vqt6_qnetworkrequest_set_header(req: QtNetworkRequestPtr, header_type: int, value: QtVariantPtr) -> t.State: pass +def vqt6_qnetworkrequest_header(req: QtNetworkRequestPtr, header_type: int) -> QtVariantPtr | t.State: pass +def vqt6_qnetworkrequest_set_raw_header(req: QtNetworkRequestPtr, header_name: char*, value: t.CPtr, value_size: sizet) -> t.State: pass +def vqt6_qnetworkrequest_raw_header(req: QtNetworkRequestPtr, header_name: char*, out_size: sizet*) -> t.CPtr | t.State: pass +def vqt6_qnetworkrequest_set_attribute(req: QtNetworkRequestPtr, attr_type: int, value: QtVariantPtr) -> t.State: pass +def vqt6_qnetworkrequest_attribute(req: QtNetworkRequestPtr, attr_type: int) -> QtVariantPtr | t.State: pass def vqt6_qnetworkrequest_free(req: QtNetworkRequestPtr) -> t.State: pass @@ -134,51 +134,51 @@ def vqt6_qnetworkaccessmanager_set_cookie_store(nam: QtNetworkAccessManagerPtr, # ============================================================ def vqt6_qnetworkreply_url(reply: QtNetworkReplyPtr) -> QtStringPtr | t.State: pass def vqt6_qnetworkreply_request(reply: QtNetworkReplyPtr) -> QtNetworkRequestPtr | t.State: pass -def vqt6_qnetworkreply_error(reply: QtNetworkReplyPtr) -> t.CInt | t.State: pass +def vqt6_qnetworkreply_error(reply: QtNetworkReplyPtr) -> int | t.State: pass def vqt6_qnetworkreply_error_string(reply: QtNetworkReplyPtr) -> QtStringPtr | t.State: pass -def vqt6_qnetworkreply_is_finished(reply: QtNetworkReplyPtr) -> t.CInt | t.State: pass -def vqt6_qnetworkreply_is_running(reply: QtNetworkReplyPtr) -> t.CInt | t.State: pass +def vqt6_qnetworkreply_is_finished(reply: QtNetworkReplyPtr) -> int | t.State: pass +def vqt6_qnetworkreply_is_running(reply: QtNetworkReplyPtr) -> int | t.State: pass def vqt6_qnetworkreply_abort(reply: QtNetworkReplyPtr) -> t.State: pass def vqt6_qnetworkreply_read(reply: QtNetworkReplyPtr, buf: t.CPtr, max_size: sizet) -> sizet | t.State: pass def vqt6_qnetworkreply_read_all(reply: QtNetworkReplyPtr, out_size: sizet*) -> t.CPtr | t.State: pass def vqt6_qnetworkreply_bytes_available(reply: QtNetworkReplyPtr) -> sizet | t.State: pass -def vqt6_qnetworkreply_header(reply: QtNetworkReplyPtr, header_type: t.CInt) -> QtVariantPtr | t.State: pass -def vqt6_qnetworkreply_raw_header(reply: QtNetworkReplyPtr, header_name: char | t.CPtr, out_size: sizet*) -> t.CPtr | t.State: pass -def vqt6_qnetworkreply_attribute(reply: QtNetworkReplyPtr, attribute_code: t.CInt) -> QtVariantPtr | t.State: pass -def vqt6_qnetworkreply_attribute_int(reply: QtNetworkReplyPtr, attribute_code: t.CInt, default_value: t.CInt) -> t.CInt | t.State: pass -def vqt6_qnetworkreply_set_raw_header(reply: QtNetworkReplyPtr, header_name: char | t.CPtr, value: t.CPtr, value_size: sizet) -> t.State: pass +def vqt6_qnetworkreply_header(reply: QtNetworkReplyPtr, header_type: int) -> QtVariantPtr | t.State: pass +def vqt6_qnetworkreply_raw_header(reply: QtNetworkReplyPtr, header_name: char*, out_size: sizet*) -> t.CPtr | t.State: pass +def vqt6_qnetworkreply_attribute(reply: QtNetworkReplyPtr, attribute_code: int) -> QtVariantPtr | t.State: pass +def vqt6_qnetworkreply_attribute_int(reply: QtNetworkReplyPtr, attribute_code: int, default_value: int) -> int | t.State: pass +def vqt6_qnetworkreply_set_raw_header(reply: QtNetworkReplyPtr, header_name: char*, value: t.CPtr, value_size: sizet) -> t.State: pass # ============================================================ # 套接字类型枚举 # ============================================================ # 套接字类型 -QT_ABSTRACT_SOCKET_TCP: t.CDefine = 0 -QT_ABSTRACT_SOCKET_UDP: t.CDefine = 1 +define QT_ABSTRACT_SOCKET_TCP = 0 +define QT_ABSTRACT_SOCKET_UDP = 1 # 网络层协议 -QT_NETWORK_IPV4_PROTOCOL: t.CDefine = 0 -QT_NETWORK_IPV6_PROTOCOL: t.CDefine = 1 -QT_NETWORK_ANY_IP_PROTOCOL: t.CDefine = 2 +define QT_NETWORK_IPV4_PROTOCOL = 0 +define QT_NETWORK_IPV6_PROTOCOL = 1 +define QT_NETWORK_ANY_IP_PROTOCOL = 2 # 主机地址特殊情况 -QT_HOST_ADDRESS_LOCAL_HOST: t.CDefine = 0x00000000 -QT_HOST_ADDRESS_LOCAL_HOST_IPV6: t.CDefine = 0x00000001 -QT_HOST_ADDRESS_BROADCAST: t.CDefine = 0x00000002 -QT_HOST_ADDRESS_ANY_IPV4: t.CDefine = 0x00000004 -QT_HOST_ADDRESS_ANY_IPV6: t.CDefine = 0x00000005 +define QT_HOST_ADDRESS_LOCAL_HOST = 0x00000000 +define QT_HOST_ADDRESS_LOCAL_HOST_IPV6 = 0x00000001 +define QT_HOST_ADDRESS_BROADCAST = 0x00000002 +define QT_HOST_ADDRESS_ANY_IPV4 = 0x00000004 +define QT_HOST_ADDRESS_ANY_IPV6 = 0x00000005 # ============================================================ # 已知端口常量 # ============================================================ -QT_PORT_FTP: t.CDefine = 21 -QT_PORT_SSH: t.CDefine = 22 -QT_PORT_TELNET: t.CDefine = 23 -QT_PORT_SMTP: t.CDefine = 25 -QT_PORT_DNS: t.CDefine = 53 -QT_PORT_HTTP: t.CDefine = 80 -QT_PORT_POP3: t.CDefine = 110 -QT_PORT_IMAP: t.CDefine = 143 -QT_PORT_HTTPS: t.CDefine = 443 -QT_PORT_SMB: t.CDefine = 445 +define QT_PORT_FTP = 21 +define QT_PORT_SSH = 22 +define QT_PORT_TELNET = 23 +define QT_PORT_SMTP = 25 +define QT_PORT_DNS = 53 +define QT_PORT_HTTP = 80 +define QT_PORT_POP3 = 110 +define QT_PORT_IMAP = 143 +define QT_PORT_HTTPS = 443 +define QT_PORT_SMB = 445 diff --git a/vqt6/_qtwidgets.vp b/vqt6/_qtwidgets.vp index 0aa0279..eec690a 100644 --- a/vqt6/_qtwidgets.vp +++ b/vqt6/_qtwidgets.vp @@ -10,18 +10,18 @@ from vqt6._types import * # QApplication — GUI 应用入口 # ============================================================ # argc/argv 通过单独的 buffer 数组传入（Viper 中 C 数组使用指针+长度） -def vqt6_qapplication_create(argc: t.CInt, argv: t.CPtr | t.CPtr) -> QtAppPtr | t.State: pass +def vqt6_qapplication_create(argc: int, argv: t.CPtr*) -> QtAppPtr | t.State: pass def vqt6_qapplication_instance() -> QtAppPtr | t.State: pass -def vqt6_qapplication_exec(app: QtAppPtr) -> t.CInt | t.State: pass +def vqt6_qapplication_exec(app: QtAppPtr) -> int | t.State: pass def vqt6_qapplication_quit(app: QtAppPtr) -> t.State: pass -def vqt6_qapplication_exit(app: QtAppPtr, exit_code: t.CInt) -> t.State: pass +def vqt6_qapplication_exit(app: QtAppPtr, exit_code: int) -> t.State: pass def vqt6_qapplication_process_events(app: QtAppPtr) -> t.State: pass -def vqt6_qapplication_desktop_width(app: QtAppPtr) -> t.CInt | t.State: pass -def vqt6_qapplication_desktop_height(app: QtAppPtr) -> t.CInt | t.State: pass -def vqt6_qapplication_set_quit_on_last_window_closed(app: QtAppPtr, quit: t.CInt) -> t.State: pass -def vqt6_qapplication_quit_on_last_window_closed(app: QtAppPtr) -> t.CInt | t.State: pass -def vqt6_qapplication_set_theme_palette(app: QtAppPtr, theme: t.CInt) -> t.State: pass -def vqt6_qapplication_set_font_family_utf8(app: QtAppPtr, family: char | t.CPtr) -> t.State: pass +def vqt6_qapplication_desktop_width(app: QtAppPtr) -> int | t.State: pass +def vqt6_qapplication_desktop_height(app: QtAppPtr) -> int | t.State: pass +def vqt6_qapplication_set_quit_on_last_window_closed(app: QtAppPtr, quit: int) -> t.State: pass +def vqt6_qapplication_quit_on_last_window_closed(app: QtAppPtr) -> int | t.State: pass +def vqt6_qapplication_set_theme_palette(app: QtAppPtr, theme: int) -> t.State: pass +def vqt6_qapplication_set_font_family_utf8(app: QtAppPtr, family: char*) -> t.State: pass def vqt6_enable_custom_item_checks(app: QtAppPtr) -> t.State: pass @@ -32,21 +32,21 @@ def vqt6_qwidget_create() -> QtWidgetPtr | t.State: pass def vqt6_qwidget_create_with_parent(parent: QtWidgetPtr) -> QtWidgetPtr | t.State: pass def vqt6_qwidget_show(widget: QtWidgetPtr) -> t.State: pass def vqt6_qwidget_hide(widget: QtWidgetPtr) -> t.State: pass -def vqt6_qwidget_close(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_is_visible(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_set_visible(widget: QtWidgetPtr, visible: t.CInt) -> t.State: pass +def vqt6_qwidget_close(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_is_visible(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_set_visible(widget: QtWidgetPtr, visible: int) -> t.State: pass # 几何 -def vqt6_qwidget_set_geometry(widget: QtWidgetPtr, x: t.CInt, y: t.CInt, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qwidget_geometry(widget: QtWidgetPtr, x: t.CInt | t.CPtr, y: t.CInt | t.CPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -> t.State: pass -def vqt6_qwidget_resize(widget: QtWidgetPtr, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qwidget_size(widget: QtWidgetPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -> t.State: pass -def vqt6_qwidget_move(widget: QtWidgetPtr, x: t.CInt, y: t.CInt) -> t.State: pass -def vqt6_qwidget_pos(widget: QtWidgetPtr, x: t.CInt | t.CPtr, y: t.CInt | t.CPtr) -> t.State: pass -def vqt6_qwidget_width(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_height(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_x(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_y(widget: QtWidgetPtr) -> t.CInt | t.State: pass +def vqt6_qwidget_set_geometry(widget: QtWidgetPtr, x: int, y: int, w: int, h: int) -> t.State: pass +def vqt6_qwidget_geometry(widget: QtWidgetPtr, x: int*, y: int*, w: int*, h: int*) -> t.State: pass +def vqt6_qwidget_resize(widget: QtWidgetPtr, w: int, h: int) -> t.State: pass +def vqt6_qwidget_size(widget: QtWidgetPtr, w: int*, h: int*) -> t.State: pass +def vqt6_qwidget_move(widget: QtWidgetPtr, x: int, y: int) -> t.State: pass +def vqt6_qwidget_pos(widget: QtWidgetPtr, x: int*, y: int*) -> t.State: pass +def vqt6_qwidget_width(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_height(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_x(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_y(widget: QtWidgetPtr) -> int | t.State: pass # 文本与标题 def vqt6_qwidget_set_window_title(widget: QtWidgetPtr, title: QtStringPtr) -> t.State: pass @@ -55,8 +55,8 @@ def vqt6_qwidget_set_text(widget: QtWidgetPtr, text: QtStringPtr) -> t.State: pa def vqt6_qwidget_text(widget: QtWidgetPtr) -> QtStringPtr | t.State: pass # 启用 -def vqt6_qwidget_set_enabled(widget: QtWidgetPtr, enabled: t.CInt) -> t.State: pass -def vqt6_qwidget_is_enabled(widget: QtWidgetPtr) -> t.CInt | t.State: pass +def vqt6_qwidget_set_enabled(widget: QtWidgetPtr, enabled: int) -> t.State: pass +def vqt6_qwidget_is_enabled(widget: QtWidgetPtr) -> int | t.State: pass # 父对象 def vqt6_qwidget_set_parent(widget: QtWidgetPtr, parent: QtWidgetPtr) -> t.State: pass @@ -65,17 +65,17 @@ def vqt6_qwidget_parent_widget(widget: QtWidgetPtr) -> QtWidgetPtr | t.State: pa # 焦点 def vqt6_qwidget_set_focus(widget: QtWidgetPtr) -> t.State: pass def vqt6_qwidget_clear_focus(widget: QtWidgetPtr) -> t.State: pass -def vqt6_qwidget_has_focus(widget: QtWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qwidget_set_focus_policy(widget: QtWidgetPtr, policy: t.CInt) -> t.State: pass +def vqt6_qwidget_has_focus(widget: QtWidgetPtr) -> int | t.State: pass +def vqt6_qwidget_set_focus_policy(widget: QtWidgetPtr, policy: int) -> t.State: pass # 更新 def vqt6_qwidget_update(widget: QtWidgetPtr) -> t.State: pass def vqt6_qwidget_repaint(widget: QtWidgetPtr) -> t.State: pass -def vqt6_qwidget_set_update_enabled(widget: QtWidgetPtr, enabled: t.CInt) -> t.State: pass +def vqt6_qwidget_set_update_enabled(widget: QtWidgetPtr, enabled: int) -> t.State: pass # 窗口标志 -def vqt6_qwidget_set_window_flags(widget: QtWidgetPtr, flags: t.CInt) -> t.State: pass -def vqt6_qwidget_window_flags(widget: QtWidgetPtr) -> t.CInt | t.State: pass +def vqt6_qwidget_set_window_flags(widget: QtWidgetPtr, flags: int) -> t.State: pass +def vqt6_qwidget_window_flags(widget: QtWidgetPtr) -> int | t.State: pass # 鼠标光标 def vqt6_qwidget_set_cursor(widget: QtWidgetPtr, cursor: QtCursorPtr) -> t.State: pass @@ -85,7 +85,7 @@ def vqt6_qwidget_unset_cursor(widget: QtWidgetPtr) -> t.State: pass # 工具提示 def vqt6_qwidget_set_tool_tip(widget: QtWidgetPtr, tip: QtStringPtr) -> t.State: pass # Qt 样式表（QSS）：直接传 Viper str -def vqt6_qwidget_set_stylesheet_utf8(widget: QtWidgetPtr, qss: char | t.CPtr) -> t.State: pass +def vqt6_qwidget_set_stylesheet_utf8(widget: QtWidgetPtr, qss: char*) -> t.State: pass def vqt6_qwidget_tool_tip(widget: QtWidgetPtr) -> QtStringPtr | t.State: pass # 状态栏提示 @@ -93,11 +93,11 @@ def vqt6_qwidget_set_status_tip(widget: QtWidgetPtr, tip: QtStringPtr) -> t.Stat def vqt6_qwidget_status_tip(widget: QtWidgetPtr) -> QtStringPtr | t.State: pass # 最小/最大尺寸 -def vqt6_qwidget_set_minimum_size(widget: QtWidgetPtr, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qwidget_set_maximum_size(widget: QtWidgetPtr, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qwidget_set_fixed_size(widget: QtWidgetPtr, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qwidget_minimum_size(widget: QtWidgetPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -> t.State: pass -def vqt6_qwidget_maximum_size(widget: QtWidgetPtr, w: t.CInt | t.CPtr, h: t.CInt | t.CPtr) -> t.State: pass +def vqt6_qwidget_set_minimum_size(widget: QtWidgetPtr, w: int, h: int) -> t.State: pass +def vqt6_qwidget_set_maximum_size(widget: QtWidgetPtr, w: int, h: int) -> t.State: pass +def vqt6_qwidget_set_fixed_size(widget: QtWidgetPtr, w: int, h: int) -> t.State: pass +def vqt6_qwidget_minimum_size(widget: QtWidgetPtr, w: int*, h: int*) -> t.State: pass +def vqt6_qwidget_maximum_size(widget: QtWidgetPtr, w: int*, h: int*) -> t.State: pass # ============================================================ @@ -105,14 +105,14 @@ def vqt6_qwidget_maximum_size(widget: QtWidgetPtr, w: t.CInt | t.CPtr, h: t.CInt # ============================================================ def vqt6_qdialog_create() -> QtDialogPtr | t.State: pass def vqt6_qdialog_create_with_parent(parent: QtWidgetPtr) -> QtDialogPtr | t.State: pass -def vqt6_qdialog_exec(dialog: QtDialogPtr) -> t.CInt | t.State: pass -def vqt6_qdialog_done(dialog: QtDialogPtr, result: t.CInt) -> t.State: pass +def vqt6_qdialog_exec(dialog: QtDialogPtr) -> int | t.State: pass +def vqt6_qdialog_done(dialog: QtDialogPtr, result: int) -> t.State: pass def vqt6_qdialog_accept(dialog: QtDialogPtr) -> t.State: pass def vqt6_qdialog_reject(dialog: QtDialogPtr) -> t.State: pass -def vqt6_qdialog_set_result(dialog: QtDialogPtr, result: t.CInt) -> t.State: pass -def vqt6_qdialog_result(dialog: QtDialogPtr) -> t.CInt | t.State: pass -def vqt6_qdialog_set_modal(dialog: QtDialogPtr, modal: t.CInt) -> t.State: pass -def vqt6_qdialog_is_modal(dialog: QtDialogPtr) -> t.CInt | t.State: pass +def vqt6_qdialog_set_result(dialog: QtDialogPtr, result: int) -> t.State: pass +def vqt6_qdialog_result(dialog: QtDialogPtr) -> int | t.State: pass +def vqt6_qdialog_set_modal(dialog: QtDialogPtr, modal: int) -> t.State: pass +def vqt6_qdialog_is_modal(dialog: QtDialogPtr) -> int | t.State: pass # ============================================================ @@ -138,16 +138,16 @@ def vqt6_qlabel_create_with_text(text: QtStringPtr) -> QtLabelPtr | t.State: pas def vqt6_qlabel_create_with_text_parent(text: QtStringPtr, parent: QtWidgetPtr) -> QtLabelPtr | t.State: pass def vqt6_qlabel_set_text(label: QtLabelPtr, text: QtStringPtr) -> t.State: pass # UTF-8 便捷版：直接传 Viper str，避免手动创建/释放 QString -def vqt6_qlabel_set_text_utf8(label: QtLabelPtr, text: char | t.CPtr) -> t.State: pass +def vqt6_qlabel_set_text_utf8(label: QtLabelPtr, text: char*) -> t.State: pass def vqt6_qlabel_text(label: QtLabelPtr) -> QtStringPtr | t.State: pass -def vqt6_qlabel_set_alignment(label: QtLabelPtr, alignment: t.CInt) -> t.State: pass -def vqt6_qlabel_alignment(label: QtLabelPtr) -> t.CInt | t.State: pass +def vqt6_qlabel_set_alignment(label: QtLabelPtr, alignment: int) -> t.State: pass +def vqt6_qlabel_alignment(label: QtLabelPtr) -> int | t.State: pass def vqt6_qlabel_set_pixmap(label: QtLabelPtr, pixmap: QtPixmapPtr) -> t.State: pass def vqt6_qlabel_pixmap(label: QtLabelPtr) -> QtPixmapPtr | t.State: pass -def vqt6_qlabel_set_indent(label: QtLabelPtr, indent: t.CInt) -> t.State: pass -def vqt6_qlabel_set_margin(label: QtLabelPtr, margin: t.CInt) -> t.State: pass -def vqt6_qlabel_set_word_wrap(label: QtLabelPtr, wrap: t.CInt) -> t.State: pass -def vqt6_qlabel_word_wrap(label: QtLabelPtr) -> t.CInt | t.State: pass +def vqt6_qlabel_set_indent(label: QtLabelPtr, indent: int) -> t.State: pass +def vqt6_qlabel_set_margin(label: QtLabelPtr, margin: int) -> t.State: pass +def vqt6_qlabel_set_word_wrap(label: QtLabelPtr, wrap: int) -> t.State: pass +def vqt6_qlabel_word_wrap(label: QtLabelPtr) -> int | t.State: pass # ============================================================ @@ -160,14 +160,14 @@ def vqt6_qpushbutton_set_text(btn: QtPushButtonPtr, text: QtStringPtr) -> t.Stat def vqt6_qpushbutton_text(btn: QtPushButtonPtr) -> QtStringPtr | t.State: pass def vqt6_qpushbutton_set_icon(btn: QtPushButtonPtr, icon: QtIconPtr) -> t.State: pass def vqt6_qpushbutton_icon(btn: QtPushButtonPtr) -> QtIconPtr | t.State: pass -def vqt6_qpushbutton_set_default(btn: QtPushButtonPtr, is_default: t.CInt) -> t.State: pass -def vqt6_qpushbutton_is_default(btn: QtPushButtonPtr) -> t.CInt | t.State: pass -def vqt6_qpushbutton_set_flat(btn: QtPushButtonPtr, flat: t.CInt) -> t.State: pass -def vqt6_qpushbutton_is_flat(btn: QtPushButtonPtr) -> t.CInt | t.State: pass -def vqt6_qpushbutton_set_checkable(btn: QtPushButtonPtr, checkable: t.CInt) -> t.State: pass -def vqt6_qpushbutton_is_checkable(btn: QtPushButtonPtr) -> t.CInt | t.State: pass -def vqt6_qpushbutton_set_checked(btn: QtPushButtonPtr, checked: t.CInt) -> t.State: pass -def vqt6_qpushbutton_is_checked(btn: QtPushButtonPtr) -> t.CInt | t.State: pass +def vqt6_qpushbutton_set_default(btn: QtPushButtonPtr, is_default: int) -> t.State: pass +def vqt6_qpushbutton_is_default(btn: QtPushButtonPtr) -> int | t.State: pass +def vqt6_qpushbutton_set_flat(btn: QtPushButtonPtr, flat: int) -> t.State: pass +def vqt6_qpushbutton_is_flat(btn: QtPushButtonPtr) -> int | t.State: pass +def vqt6_qpushbutton_set_checkable(btn: QtPushButtonPtr, checkable: int) -> t.State: pass +def vqt6_qpushbutton_is_checkable(btn: QtPushButtonPtr) -> int | t.State: pass +def vqt6_qpushbutton_set_checked(btn: QtPushButtonPtr, checked: int) -> t.State: pass +def vqt6_qpushbutton_is_checked(btn: QtPushButtonPtr) -> int | t.State: pass def vqt6_qpushbutton_click(btn: QtPushButtonPtr) -> t.State: pass @@ -181,12 +181,12 @@ def vqt6_qlineedit_text(le: QtLineEditPtr) -> QtStringPtr | t.State: pass def vqt6_qlineedit_set_text(le: QtLineEditPtr, text: QtStringPtr) -> t.State: pass def vqt6_qlineedit_placeholder_text(le: QtLineEditPtr) -> QtStringPtr | t.State: pass def vqt6_qlineedit_set_placeholder_text(le: QtLineEditPtr, text: QtStringPtr) -> t.State: pass -def vqt6_qlineedit_set_max_length(le: QtLineEditPtr, max: t.CInt) -> t.State: pass -def vqt6_qlineedit_max_length(le: QtLineEditPtr) -> t.CInt | t.State: pass -def vqt6_qlineedit_set_read_only(le: QtLineEditPtr, ro: t.CInt) -> t.State: pass -def vqt6_qlineedit_is_read_only(le: QtLineEditPtr) -> t.CInt | t.State: pass -def vqt6_qlineedit_set_echo_mode(le: QtLineEditPtr, mode: t.CInt) -> t.State: pass -def vqt6_qlineedit_echo_mode(le: QtLineEditPtr) -> t.CInt | t.State: pass +def vqt6_qlineedit_set_max_length(le: QtLineEditPtr, max: int) -> t.State: pass +def vqt6_qlineedit_max_length(le: QtLineEditPtr) -> int | t.State: pass +def vqt6_qlineedit_set_read_only(le: QtLineEditPtr, ro: int) -> t.State: pass +def vqt6_qlineedit_is_read_only(le: QtLineEditPtr) -> int | t.State: pass +def vqt6_qlineedit_set_echo_mode(le: QtLineEditPtr, mode: int) -> t.State: pass +def vqt6_qlineedit_echo_mode(le: QtLineEditPtr) -> int | t.State: pass def vqt6_qlineedit_select_all(le: QtLineEditPtr) -> t.State: pass def vqt6_qlineedit_clear(le: QtLineEditPtr) -> t.State: pass @@ -202,8 +202,8 @@ def vqt6_qtextedit_set_html(te: QtTextEditPtr, html: QtStringPtr) -> t.State: pa def vqt6_qtextedit_to_html(te: QtTextEditPtr) -> QtStringPtr | t.State: pass def vqt6_qtextedit_append(te: QtTextEditPtr, text: QtStringPtr) -> t.State: pass def vqt6_qtextedit_clear(te: QtTextEditPtr) -> t.State: pass -def vqt6_qtextedit_set_read_only(te: QtTextEditPtr, ro: t.CInt) -> t.State: pass -def vqt6_qtextedit_is_read_only(te: QtTextEditPtr) -> t.CInt | t.State: pass +def vqt6_qtextedit_set_read_only(te: QtTextEditPtr, ro: int) -> t.State: pass +def vqt6_qtextedit_is_read_only(te: QtTextEditPtr) -> int | t.State: pass def vqt6_qplaintextedit_create() -> QtPlainTextEditPtr | t.State: pass def vqt6_qplaintextedit_create_with_parent(parent: QtWidgetPtr) -> QtPlainTextEditPtr | t.State: pass @@ -211,11 +211,11 @@ def vqt6_qplaintextedit_to_plain_text(pte: QtPlainTextEditPtr) -> QtStringPtr | def vqt6_qplaintextedit_set_plain_text(pte: QtPlainTextEditPtr, text: QtStringPtr) -> t.State: pass def vqt6_qplaintextedit_append(pte: QtPlainTextEditPtr, text: QtStringPtr) -> t.State: pass # UTF-8 便捷版：直接传 Viper str，避免手动创建/释放 QString -def vqt6_qplaintextedit_append_utf8(pte: QtPlainTextEditPtr, text: char | t.CPtr) -> t.State: pass -def vqt6_qplaintextedit_set_plain_text_utf8(pte: QtPlainTextEditPtr, text: char | t.CPtr) -> t.State: pass +def vqt6_qplaintextedit_append_utf8(pte: QtPlainTextEditPtr, text: char*) -> t.State: pass +def vqt6_qplaintextedit_set_plain_text_utf8(pte: QtPlainTextEditPtr, text: char*) -> t.State: pass def vqt6_qplaintextedit_clear(pte: QtPlainTextEditPtr) -> t.State: pass -def vqt6_qplaintextedit_set_read_only(pte: QtPlainTextEditPtr, ro: t.CInt) -> t.State: pass -def vqt6_qplaintextedit_line_count(pte: QtPlainTextEditPtr) -> t.CInt | t.State: pass +def vqt6_qplaintextedit_set_read_only(pte: QtPlainTextEditPtr, ro: int) -> t.State: pass +def vqt6_qplaintextedit_line_count(pte: QtPlainTextEditPtr) -> int | t.State: pass # ============================================================ @@ -224,18 +224,18 @@ def vqt6_qplaintextedit_line_count(pte: QtPlainTextEditPtr) -> t.CInt | t.State: def vqt6_qcheckbox_create() -> QtCheckBoxPtr | t.State: pass def vqt6_qcheckbox_create_with_text(text: QtStringPtr) -> QtCheckBoxPtr | t.State: pass def vqt6_qcheckbox_create_with_text_parent(text: QtStringPtr, parent: QtWidgetPtr) -> QtCheckBoxPtr | t.State: pass -def vqt6_qcheckbox_set_checked(cb: QtCheckBoxPtr, checked: t.CInt) -> t.State: pass -def vqt6_qcheckbox_is_checked(cb: QtCheckBoxPtr) -> t.CInt | t.State: pass +def vqt6_qcheckbox_set_checked(cb: QtCheckBoxPtr, checked: int) -> t.State: pass +def vqt6_qcheckbox_is_checked(cb: QtCheckBoxPtr) -> int | t.State: pass def vqt6_qcheckbox_set_text(cb: QtCheckBoxPtr, text: QtStringPtr) -> t.State: pass def vqt6_qcheckbox_text(cb: QtCheckBoxPtr) -> QtStringPtr | t.State: pass -def vqt6_qcheckbox_set_tristate(cb: QtCheckBoxPtr, tristate: t.CInt) -> t.State: pass -def vqt6_qcheckbox_is_tristate(cb: QtCheckBoxPtr) -> t.CInt | t.State: pass +def vqt6_qcheckbox_set_tristate(cb: QtCheckBoxPtr, tristate: int) -> t.State: pass +def vqt6_qcheckbox_is_tristate(cb: QtCheckBoxPtr) -> int | t.State: pass def vqt6_qradiobutton_create() -> QtRadioButtonPtr | t.State: pass def vqt6_qradiobutton_create_with_text(text: QtStringPtr) -> QtRadioButtonPtr | t.State: pass def vqt6_qradiobutton_create_with_text_parent(text: QtStringPtr, parent: QtWidgetPtr) -> QtRadioButtonPtr | t.State: pass -def vqt6_qradiobutton_set_checked(rb: QtRadioButtonPtr, checked: t.CInt) -> t.State: pass -def vqt6_qradiobutton_is_checked(rb: QtRadioButtonPtr) -> t.CInt | t.State: pass +def vqt6_qradiobutton_set_checked(rb: QtRadioButtonPtr, checked: int) -> t.State: pass +def vqt6_qradiobutton_is_checked(rb: QtRadioButtonPtr) -> int | t.State: pass def vqt6_qradiobutton_set_text(rb: QtRadioButtonPtr, text: QtStringPtr) -> t.State: pass def vqt6_qradiobutton_text(rb: QtRadioButtonPtr) -> QtStringPtr | t.State: pass @@ -247,16 +247,16 @@ def vqt6_qcombobox_create() -> QtComboBoxPtr | t.State: pass def vqt6_qcombobox_create_with_parent(parent: QtWidgetPtr) -> QtComboBoxPtr | t.State: pass def vqt6_qcombobox_add_item(cb: QtComboBoxPtr, text: QtStringPtr) -> t.State: pass def vqt6_qcombobox_add_items(cb: QtComboBoxPtr, items: QtStringListPtr) -> t.State: pass -def vqt6_qcombobox_insert_item(cb: QtComboBoxPtr, index: t.CInt, text: QtStringPtr) -> t.State: pass -def vqt6_qcombobox_remove_item(cb: QtComboBoxPtr, index: t.CInt) -> t.State: pass +def vqt6_qcombobox_insert_item(cb: QtComboBoxPtr, index: int, text: QtStringPtr) -> t.State: pass +def vqt6_qcombobox_remove_item(cb: QtComboBoxPtr, index: int) -> t.State: pass def vqt6_qcombobox_clear(cb: QtComboBoxPtr) -> t.State: pass -def vqt6_qcombobox_count(cb: QtComboBoxPtr) -> t.CInt | t.State: pass -def vqt6_qcombobox_current_index(cb: QtComboBoxPtr) -> t.CInt | t.State: pass -def vqt6_qcombobox_set_current_index(cb: QtComboBoxPtr, index: t.CInt) -> t.State: pass +def vqt6_qcombobox_count(cb: QtComboBoxPtr) -> int | t.State: pass +def vqt6_qcombobox_current_index(cb: QtComboBoxPtr) -> int | t.State: pass +def vqt6_qcombobox_set_current_index(cb: QtComboBoxPtr, index: int) -> t.State: pass def vqt6_qcombobox_current_text(cb: QtComboBoxPtr) -> QtStringPtr | t.State: pass -def vqt6_qcombobox_item_text(cb: QtComboBoxPtr, index: t.CInt) -> QtStringPtr | t.State: pass -def vqt6_qcombobox_set_editable(cb: QtComboBoxPtr, editable: t.CInt) -> t.State: pass -def vqt6_qcombobox_is_editable(cb: QtComboBoxPtr) -> t.CInt | t.State: pass +def vqt6_qcombobox_item_text(cb: QtComboBoxPtr, index: int) -> QtStringPtr | t.State: pass +def vqt6_qcombobox_set_editable(cb: QtComboBoxPtr, editable: int) -> t.State: pass +def vqt6_qcombobox_is_editable(cb: QtComboBoxPtr) -> int | t.State: pass # ============================================================ @@ -266,24 +266,24 @@ def vqt6_qlistwidget_create() -> QtListWidgetPtr | t.State: pass def vqt6_qlistwidget_create_with_parent(parent: QtWidgetPtr) -> QtListWidgetPtr | t.State: pass def vqt6_qlistwidget_add_item(lw: QtListWidgetPtr, text: QtStringPtr) -> t.State: pass def vqt6_qlistwidget_add_items(lw: QtListWidgetPtr, items: QtStringListPtr) -> t.State: pass -def vqt6_qlistwidget_insert_item(lw: QtListWidgetPtr, row: t.CInt, text: QtStringPtr) -> t.State: pass -def vqt6_qlistwidget_remove_item_widget(lw: QtListWidgetPtr, row: t.CInt) -> t.State: pass -def vqt6_qlistwidget_take_item(lw: QtListWidgetPtr, row: t.CInt) -> QtListWidgetItemPtr | t.State: pass +def vqt6_qlistwidget_insert_item(lw: QtListWidgetPtr, row: int, text: QtStringPtr) -> t.State: pass +def vqt6_qlistwidget_remove_item_widget(lw: QtListWidgetPtr, row: int) -> t.State: pass +def vqt6_qlistwidget_take_item(lw: QtListWidgetPtr, row: int) -> QtListWidgetItemPtr | t.State: pass def vqt6_qlistwidget_clear(lw: QtListWidgetPtr) -> t.State: pass -def vqt6_qlistwidget_count(lw: QtListWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qlistwidget_current_row(lw: QtListWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qlistwidget_set_current_row(lw: QtListWidgetPtr, row: t.CInt) -> t.State: pass +def vqt6_qlistwidget_count(lw: QtListWidgetPtr) -> int | t.State: pass +def vqt6_qlistwidget_current_row(lw: QtListWidgetPtr) -> int | t.State: pass +def vqt6_qlistwidget_set_current_row(lw: QtListWidgetPtr, row: int) -> t.State: pass def vqt6_qlistwidget_current_item_text(lw: QtListWidgetPtr) -> QtStringPtr | t.State: pass -def vqt6_qlistwidget_item_text(lw: QtListWidgetPtr, row: t.CInt) -> QtStringPtr | t.State: pass -def vqt6_qlistwidget_set_item_text(lw: QtListWidgetPtr, row: t.CInt, text: QtStringPtr) -> t.State: pass +def vqt6_qlistwidget_item_text(lw: QtListWidgetPtr, row: int) -> QtStringPtr | t.State: pass +def vqt6_qlistwidget_set_item_text(lw: QtListWidgetPtr, row: int, text: QtStringPtr) -> t.State: pass # 聊天气泡行：右/左对齐气泡（setItemWidget 实现）；hpad/vpad = QSS padding 左右/上下合计像素 def vqt6_qlistwidget_add_bubble(lw: QtListWidgetPtr, text: QtStringPtr, qss: QtStringPtr, - right_align: t.CInt, max_bubble_w: t.CInt, - hpad: t.CInt, vpad: t.CInt) -> t.State: pass + right_align: int, max_bubble_w: int, + hpad: int, vpad: int) -> t.State: pass # 流式刷新：删除最后一条气泡后按新文本重建 def vqt6_qlistwidget_replace_last_bubble(lw: QtListWidgetPtr, text: QtStringPtr, qss: QtStringPtr, - right_align: t.CInt, max_bubble_w: t.CInt, - hpad: t.CInt, vpad: t.CInt) -> t.State: pass + right_align: int, max_bubble_w: int, + hpad: int, vpad: int) -> t.State: pass def vqt6_qlistwidget_scroll_to_bottom(lw: QtListWidgetPtr) -> t.State: pass @@ -293,29 +293,29 @@ def vqt6_qlistwidget_scroll_to_bottom(lw: QtListWidgetPtr) -> t.State: pass def vqt6_qtreewidget_create() -> QtTreeWidgetPtr | t.State: pass def vqt6_qtreewidget_create_with_parent(parent: QtWidgetPtr) -> QtTreeWidgetPtr | t.State: pass def vqt6_qtreewidget_add_top_level_item(tw: QtTreeWidgetPtr, item: QtTreeWidgetItemPtr) -> t.State: pass -def vqt6_qtreewidget_insert_top_level_item(tw: QtTreeWidgetPtr, index: t.CInt, item: QtTreeWidgetItemPtr) -> t.State: pass -def vqt6_qtreewidget_top_level_item_count(tw: QtTreeWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qtreewidget_top_level_item(tw: QtTreeWidgetPtr, index: t.CInt) -> QtTreeWidgetItemPtr | t.State: pass +def vqt6_qtreewidget_insert_top_level_item(tw: QtTreeWidgetPtr, index: int, item: QtTreeWidgetItemPtr) -> t.State: pass +def vqt6_qtreewidget_top_level_item_count(tw: QtTreeWidgetPtr) -> int | t.State: pass +def vqt6_qtreewidget_top_level_item(tw: QtTreeWidgetPtr, index: int) -> QtTreeWidgetItemPtr | t.State: pass def vqt6_qtreewidget_current_item(tw: QtTreeWidgetPtr) -> QtTreeWidgetItemPtr | t.State: pass def vqt6_qtreewidget_expand_all(tw: QtTreeWidgetPtr) -> t.State: pass def vqt6_qtreewidget_collapse_all(tw: QtTreeWidgetPtr) -> t.State: pass -def vqt6_qtreewidget_set_header_hidden(tw: QtTreeWidgetPtr, hidden: t.CInt) -> t.State: pass -def vqt6_qtreewidget_set_column_count(tw: QtTreeWidgetPtr, count: t.CInt) -> t.State: pass -def vqt6_qtreewidget_set_item_expanded(tw: QtTreeWidgetPtr, item: QtTreeWidgetItemPtr, expanded: t.CInt) -> t.State: pass +def vqt6_qtreewidget_set_header_hidden(tw: QtTreeWidgetPtr, hidden: int) -> t.State: pass +def vqt6_qtreewidget_set_column_count(tw: QtTreeWidgetPtr, count: int) -> t.State: pass +def vqt6_qtreewidget_set_item_expanded(tw: QtTreeWidgetPtr, item: QtTreeWidgetItemPtr, expanded: int) -> t.State: pass def vqt6_qtreewidgetitem_create(text: QtStringPtr) -> QtTreeWidgetItemPtr | t.State: pass def vqt6_qtreewidgetitem_add_child(item: QtTreeWidgetItemPtr, child: QtTreeWidgetItemPtr) -> t.State: pass -def vqt6_qtreewidgetitem_child_count(item: QtTreeWidgetItemPtr) -> t.CInt | t.State: pass -def vqt6_qtreewidgetitem_child(item: QtTreeWidgetItemPtr, index: t.CInt) -> QtTreeWidgetItemPtr | t.State: pass +def vqt6_qtreewidgetitem_child_count(item: QtTreeWidgetItemPtr) -> int | t.State: pass +def vqt6_qtreewidgetitem_child(item: QtTreeWidgetItemPtr, index: int) -> QtTreeWidgetItemPtr | t.State: pass def vqt6_qtreewidgetitem_set_text(item: QtTreeWidgetItemPtr, text: QtStringPtr) -> t.State: pass def vqt6_qtreewidgetitem_text(item: QtTreeWidgetItemPtr) -> QtStringPtr | t.State: pass -def vqt6_qtreewidgetitem_set_checkable(item: QtTreeWidgetItemPtr, checkable: t.CInt) -> t.State: pass -def vqt6_qtreewidgetitem_set_check_state(item: QtTreeWidgetItemPtr, state: t.CInt) -> t.State: pass -def vqt6_qtreewidgetitem_check_state(item: QtTreeWidgetItemPtr) -> t.CInt | t.State: pass -def vqt6_qtreewidgetitem_set_expanded(item: QtTreeWidgetItemPtr, expanded: t.CInt) -> t.State: pass -def vqt6_qtreewidgetitem_is_expanded(item: QtTreeWidgetItemPtr) -> t.CInt | t.State: pass -def vqt6_qtreewidgetitem_set_data_int(item: QtTreeWidgetItemPtr, value: t.CInt) -> t.State: pass -def vqt6_qtreewidgetitem_data_int(item: QtTreeWidgetItemPtr) -> t.CInt | t.State: pass +def vqt6_qtreewidgetitem_set_checkable(item: QtTreeWidgetItemPtr, checkable: int) -> t.State: pass +def vqt6_qtreewidgetitem_set_check_state(item: QtTreeWidgetItemPtr, state: int) -> t.State: pass +def vqt6_qtreewidgetitem_check_state(item: QtTreeWidgetItemPtr) -> int | t.State: pass +def vqt6_qtreewidgetitem_set_expanded(item: QtTreeWidgetItemPtr, expanded: int) -> t.State: pass +def vqt6_qtreewidgetitem_is_expanded(item: QtTreeWidgetItemPtr) -> int | t.State: pass +def vqt6_qtreewidgetitem_set_data_int(item: QtTreeWidgetItemPtr, value: int) -> t.State: pass +def vqt6_qtreewidgetitem_data_int(item: QtTreeWidgetItemPtr) -> int | t.State: pass # ============================================================ @@ -323,14 +323,14 @@ def vqt6_qtreewidgetitem_data_int(item: QtTreeWidgetItemPtr) -> t.CInt | t.State # ============================================================ def vqt6_qprogressbar_create() -> QtProgressBarPtr | t.State: pass def vqt6_qprogressbar_create_with_parent(parent: QtWidgetPtr) -> QtProgressBarPtr | t.State: pass -def vqt6_qprogressbar_set_value(pb: QtProgressBarPtr, value: t.CInt) -> t.State: pass -def vqt6_qprogressbar_value(pb: QtProgressBarPtr) -> t.CInt | t.State: pass -def vqt6_qprogressbar_set_minimum(pb: QtProgressBarPtr, min: t.CInt) -> t.State: pass -def vqt6_qprogressbar_set_maximum(pb: QtProgressBarPtr, max: t.CInt) -> t.State: pass -def vqt6_qprogressbar_set_range(pb: QtProgressBarPtr, min: t.CInt, max: t.CInt) -> t.State: pass -def vqt6_qprogressbar_minimum(pb: QtProgressBarPtr) -> t.CInt | t.State: pass -def vqt6_qprogressbar_maximum(pb: QtProgressBarPtr) -> t.CInt | t.State: pass -def vqt6_qprogressbar_set_text_visible(pb: QtProgressBarPtr, visible: t.CInt) -> t.State: pass +def vqt6_qprogressbar_set_value(pb: QtProgressBarPtr, value: int) -> t.State: pass +def vqt6_qprogressbar_value(pb: QtProgressBarPtr) -> int | t.State: pass +def vqt6_qprogressbar_set_minimum(pb: QtProgressBarPtr, min: int) -> t.State: pass +def vqt6_qprogressbar_set_maximum(pb: QtProgressBarPtr, max: int) -> t.State: pass +def vqt6_qprogressbar_set_range(pb: QtProgressBarPtr, min: int, max: int) -> t.State: pass +def vqt6_qprogressbar_minimum(pb: QtProgressBarPtr) -> int | t.State: pass +def vqt6_qprogressbar_maximum(pb: QtProgressBarPtr) -> int | t.State: pass +def vqt6_qprogressbar_set_text_visible(pb: QtProgressBarPtr, visible: int) -> t.State: pass def vqt6_qprogressbar_set_format(pb: QtProgressBarPtr, format: QtStringPtr) -> t.State: pass def vqt6_qprogressbar_reset(pb: QtProgressBarPtr) -> t.State: pass @@ -339,17 +339,17 @@ def vqt6_qprogressbar_reset(pb: QtProgressBarPtr) -> t.State: pass # QSlider — 滑块 # ============================================================ def vqt6_qslider_create() -> QtSliderPtr | t.State: pass -def vqt6_qslider_create_with_orientation(orientation: t.CInt) -> QtSliderPtr | t.State: pass -def vqt6_qslider_create_with_orientation_parent(orientation: t.CInt, parent: QtWidgetPtr) -> QtSliderPtr | t.State: pass -def vqt6_qslider_set_value(s: QtSliderPtr, value: t.CInt) -> t.State: pass -def vqt6_qslider_value(s: QtSliderPtr) -> t.CInt | t.State: pass -def vqt6_qslider_set_minimum(s: QtSliderPtr, min: t.CInt) -> t.State: pass -def vqt6_qslider_set_maximum(s: QtSliderPtr, max: t.CInt) -> t.State: pass -def vqt6_qslider_set_range(s: QtSliderPtr, min: t.CInt, max: t.CInt) -> t.State: pass -def vqt6_qslider_set_orientation(s: QtSliderPtr, orientation: t.CInt) -> t.State: pass -def vqt6_qslider_orientation(s: QtSliderPtr) -> t.CInt | t.State: pass -def vqt6_qslider_set_single_step(s: QtSliderPtr, step: t.CInt) -> t.State: pass -def vqt6_qslider_set_page_step(s: QtSliderPtr, step: t.CInt) -> t.State: pass +def vqt6_qslider_create_with_orientation(orientation: int) -> QtSliderPtr | t.State: pass +def vqt6_qslider_create_with_orientation_parent(orientation: int, parent: QtWidgetPtr) -> QtSliderPtr | t.State: pass +def vqt6_qslider_set_value(s: QtSliderPtr, value: int) -> t.State: pass +def vqt6_qslider_value(s: QtSliderPtr) -> int | t.State: pass +def vqt6_qslider_set_minimum(s: QtSliderPtr, min: int) -> t.State: pass +def vqt6_qslider_set_maximum(s: QtSliderPtr, max: int) -> t.State: pass +def vqt6_qslider_set_range(s: QtSliderPtr, min: int, max: int) -> t.State: pass +def vqt6_qslider_set_orientation(s: QtSliderPtr, orientation: int) -> t.State: pass +def vqt6_qslider_orientation(s: QtSliderPtr) -> int | t.State: pass +def vqt6_qslider_set_single_step(s: QtSliderPtr, step: int) -> t.State: pass +def vqt6_qslider_set_page_step(s: QtSliderPtr, step: int) -> t.State: pass # ============================================================ @@ -357,14 +357,14 @@ def vqt6_qslider_set_page_step(s: QtSliderPtr, step: t.CInt) -> t.State: pass # ============================================================ def vqt6_qspinbox_create() -> QtSpinBoxPtr | t.State: pass def vqt6_qspinbox_create_with_parent(parent: QtWidgetPtr) -> QtSpinBoxPtr | t.State: pass -def vqt6_qspinbox_value(sb: QtSpinBoxPtr) -> t.CInt | t.State: pass -def vqt6_qspinbox_set_value(sb: QtSpinBoxPtr, value: t.CInt) -> t.State: pass -def vqt6_qspinbox_set_minimum(sb: QtSpinBoxPtr, min: t.CInt) -> t.State: pass -def vqt6_qspinbox_set_maximum(sb: QtSpinBoxPtr, max: t.CInt) -> t.State: pass -def vqt6_qspinbox_set_range(sb: QtSpinBoxPtr, min: t.CInt, max: t.CInt) -> t.State: pass -def vqt6_qspinbox_minimum(sb: QtSpinBoxPtr) -> t.CInt | t.State: pass -def vqt6_qspinbox_maximum(sb: QtSpinBoxPtr) -> t.CInt | t.State: pass -def vqt6_qspinbox_set_single_step(sb: QtSpinBoxPtr, step: t.CInt) -> t.State: pass +def vqt6_qspinbox_value(sb: QtSpinBoxPtr) -> int | t.State: pass +def vqt6_qspinbox_set_value(sb: QtSpinBoxPtr, value: int) -> t.State: pass +def vqt6_qspinbox_set_minimum(sb: QtSpinBoxPtr, min: int) -> t.State: pass +def vqt6_qspinbox_set_maximum(sb: QtSpinBoxPtr, max: int) -> t.State: pass +def vqt6_qspinbox_set_range(sb: QtSpinBoxPtr, min: int, max: int) -> t.State: pass +def vqt6_qspinbox_minimum(sb: QtSpinBoxPtr) -> int | t.State: pass +def vqt6_qspinbox_maximum(sb: QtSpinBoxPtr) -> int | t.State: pass +def vqt6_qspinbox_set_single_step(sb: QtSpinBoxPtr, step: int) -> t.State: pass def vqt6_qspinbox_set_prefix(sb: QtSpinBoxPtr, prefix: QtStringPtr) -> t.State: pass def vqt6_qspinbox_set_suffix(sb: QtSpinBoxPtr, suffix: QtStringPtr) -> t.State: pass def vqt6_qspinbox_prefix(sb: QtSpinBoxPtr) -> QtStringPtr | t.State: pass @@ -376,32 +376,32 @@ def vqt6_qspinbox_suffix(sb: QtSpinBoxPtr) -> QtStringPtr | t.State: pass # ============================================================ def vqt6_qlayout_add_widget(layout: QtLayoutPtr, widget: QtWidgetPtr) -> t.State: pass def vqt6_qlayout_remove_widget(layout: QtLayoutPtr, widget: QtWidgetPtr) -> t.State: pass -def vqt6_qlayout_count(layout: QtLayoutPtr) -> t.CInt | t.State: pass -def vqt6_qlayout_item_at(layout: QtLayoutPtr, index: t.CInt) -> QtWidgetPtr | t.State: pass -def vqt6_qlayout_set_contents_margins(layout: QtLayoutPtr, left: t.CInt, top: t.CInt, right: t.CInt, bottom: t.CInt) -> t.State: pass -def vqt6_qlayout_set_spacing(layout: QtLayoutPtr, spacing: t.CInt) -> t.State: pass -def vqt6_qlayout_spacing(layout: QtLayoutPtr) -> t.CInt | t.State: pass +def vqt6_qlayout_count(layout: QtLayoutPtr) -> int | t.State: pass +def vqt6_qlayout_item_at(layout: QtLayoutPtr, index: int) -> QtWidgetPtr | t.State: pass +def vqt6_qlayout_set_contents_margins(layout: QtLayoutPtr, left: int, top: int, right: int, bottom: int) -> t.State: pass +def vqt6_qlayout_set_spacing(layout: QtLayoutPtr, spacing: int) -> t.State: pass +def vqt6_qlayout_spacing(layout: QtLayoutPtr) -> int | t.State: pass def vqt6_qlayout_invalidate(layout: QtLayoutPtr) -> t.State: pass # QHBoxLayout def vqt6_qhboxlayout_create() -> QtBoxLayoutPtr | t.State: pass def vqt6_qhboxlayout_create_with_parent(parent: QtWidgetPtr) -> QtBoxLayoutPtr | t.State: pass def vqt6_qhboxlayout_add_layout(layout: QtBoxLayoutPtr, child: QtLayoutPtr) -> t.State: pass -def vqt6_qhboxlayout_add_stretch(layout: QtBoxLayoutPtr, stretch: t.CInt) -> t.State: pass -def vqt6_qhboxlayout_add_spacing(layout: QtBoxLayoutPtr, size: t.CInt) -> t.State: pass +def vqt6_qhboxlayout_add_stretch(layout: QtBoxLayoutPtr, stretch: int) -> t.State: pass +def vqt6_qhboxlayout_add_spacing(layout: QtBoxLayoutPtr, size: int) -> t.State: pass # QVBoxLayout def vqt6_qvboxlayout_create() -> QtBoxLayoutPtr | t.State: pass def vqt6_qvboxlayout_create_with_parent(parent: QtWidgetPtr) -> QtBoxLayoutPtr | t.State: pass def vqt6_qvboxlayout_add_layout(layout: QtBoxLayoutPtr, child: QtLayoutPtr) -> t.State: pass -def vqt6_qvboxlayout_add_stretch(layout: QtBoxLayoutPtr, stretch: t.CInt) -> t.State: pass -def vqt6_qvboxlayout_add_spacing(layout: QtBoxLayoutPtr, size: t.CInt) -> t.State: pass +def vqt6_qvboxlayout_add_stretch(layout: QtBoxLayoutPtr, stretch: int) -> t.State: pass +def vqt6_qvboxlayout_add_spacing(layout: QtBoxLayoutPtr, size: int) -> t.State: pass # QGridLayout def vqt6_qgridlayout_create() -> QtGridLayoutPtr | t.State: pass def vqt6_qgridlayout_create_with_parent(parent: QtWidgetPtr) -> QtGridLayoutPtr | t.State: pass -def vqt6_qgridlayout_add_widget(gl: QtGridLayoutPtr, w: QtWidgetPtr, row: t.CInt, col: t.CInt) -> t.State: pass -def vqt6_qgridlayout_add_widget_with_span(gl: QtGridLayoutPtr, w: QtWidgetPtr, row: t.CInt, col: t.CInt, row_span: t.CInt, col_span: t.CInt) -> t.State: pass +def vqt6_qgridlayout_add_widget(gl: QtGridLayoutPtr, w: QtWidgetPtr, row: int, col: int) -> t.State: pass +def vqt6_qgridlayout_add_widget_with_span(gl: QtGridLayoutPtr, w: QtWidgetPtr, row: int, col: int, row_span: int, col_span: int) -> t.State: pass # QFormLayout def vqt6_qformlayout_create() -> QtFormLayoutPtr | t.State: pass @@ -415,26 +415,26 @@ def vqt6_qformlayout_add_row_widget_pair(fl: QtFormLayoutPtr, label: QtWidgetPtr # ============================================================ def vqt6_qstackedwidget_create() -> QtStackedWidgetPtr | t.State: pass def vqt6_qstackedwidget_create_with_parent(parent: QtWidgetPtr) -> QtStackedWidgetPtr | t.State: pass -def vqt6_qstackedwidget_add_widget(sw: QtStackedWidgetPtr, w: QtWidgetPtr) -> t.CInt | t.State: pass +def vqt6_qstackedwidget_add_widget(sw: QtStackedWidgetPtr, w: QtWidgetPtr) -> int | t.State: pass def vqt6_qstackedwidget_remove_widget(sw: QtStackedWidgetPtr, w: QtWidgetPtr) -> t.State: pass -def vqt6_qstackedwidget_count(sw: QtStackedWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qstackedwidget_current_index(sw: QtStackedWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qstackedwidget_set_current_index(sw: QtStackedWidgetPtr, index: t.CInt) -> t.State: pass +def vqt6_qstackedwidget_count(sw: QtStackedWidgetPtr) -> int | t.State: pass +def vqt6_qstackedwidget_current_index(sw: QtStackedWidgetPtr) -> int | t.State: pass +def vqt6_qstackedwidget_set_current_index(sw: QtStackedWidgetPtr, index: int) -> t.State: pass def vqt6_qstackedwidget_current_widget(sw: QtStackedWidgetPtr) -> QtWidgetPtr | t.State: pass -def vqt6_qstackedwidget_widget(sw: QtStackedWidgetPtr, index: t.CInt) -> QtWidgetPtr | t.State: pass +def vqt6_qstackedwidget_widget(sw: QtStackedWidgetPtr, index: int) -> QtWidgetPtr | t.State: pass def vqt6_qtabwidget_create() -> QtTabWidgetPtr | t.State: pass def vqt6_qtabwidget_create_with_parent(parent: QtWidgetPtr) -> QtTabWidgetPtr | t.State: pass -def vqt6_qtabwidget_add_tab(tw: QtTabWidgetPtr, w: QtWidgetPtr, label: QtStringPtr) -> t.CInt | t.State: pass -def vqt6_qtabwidget_insert_tab(tw: QtTabWidgetPtr, index: t.CInt, w: QtWidgetPtr, label: QtStringPtr) -> t.CInt | t.State: pass -def vqt6_qtabwidget_remove_tab(tw: QtTabWidgetPtr, index: t.CInt) -> t.State: pass -def vqt6_qtabwidget_count(tw: QtTabWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qtabwidget_current_index(tw: QtTabWidgetPtr) -> t.CInt | t.State: pass -def vqt6_qtabwidget_set_current_index(tw: QtTabWidgetPtr, index: t.CInt) -> t.State: pass -def vqt6_qtabwidget_tab_text(tw: QtTabWidgetPtr, index: t.CInt) -> QtStringPtr | t.State: pass -def vqt6_qtabwidget_set_tab_text(tw: QtTabWidgetPtr, index: t.CInt, text: QtStringPtr) -> t.State: pass -def vqt6_qtabwidget_set_tabs_closable(tw: QtTabWidgetPtr, closable: t.CInt) -> t.State: pass -def vqt6_qtabwidget_tabs_closable(tw: QtTabWidgetPtr) -> t.CInt | t.State: pass +def vqt6_qtabwidget_add_tab(tw: QtTabWidgetPtr, w: QtWidgetPtr, label: QtStringPtr) -> int | t.State: pass +def vqt6_qtabwidget_insert_tab(tw: QtTabWidgetPtr, index: int, w: QtWidgetPtr, label: QtStringPtr) -> int | t.State: pass +def vqt6_qtabwidget_remove_tab(tw: QtTabWidgetPtr, index: int) -> t.State: pass +def vqt6_qtabwidget_count(tw: QtTabWidgetPtr) -> int | t.State: pass +def vqt6_qtabwidget_current_index(tw: QtTabWidgetPtr) -> int | t.State: pass +def vqt6_qtabwidget_set_current_index(tw: QtTabWidgetPtr, index: int) -> t.State: pass +def vqt6_qtabwidget_tab_text(tw: QtTabWidgetPtr, index: int) -> QtStringPtr | t.State: pass +def vqt6_qtabwidget_set_tab_text(tw: QtTabWidgetPtr, index: int, text: QtStringPtr) -> t.State: pass +def vqt6_qtabwidget_set_tabs_closable(tw: QtTabWidgetPtr, closable: int) -> t.State: pass +def vqt6_qtabwidget_tabs_closable(tw: QtTabWidgetPtr) -> int | t.State: pass # ============================================================ @@ -467,12 +467,12 @@ def vqt6_qaction_set_icon(action: QtActionPtr, icon: QtIconPtr) -> t.State: pass def vqt6_qaction_icon(action: QtActionPtr) -> QtIconPtr | t.State: pass def vqt6_qaction_set_shortcut(action: QtActionPtr, key_sequence: QtStringPtr) -> t.State: pass def vqt6_qaction_shortcut(action: QtActionPtr) -> QtStringPtr | t.State: pass -def vqt6_qaction_set_checkable(action: QtActionPtr, checkable: t.CInt) -> t.State: pass -def vqt6_qaction_is_checkable(action: QtActionPtr) -> t.CInt | t.State: pass -def vqt6_qaction_set_checked(action: QtActionPtr, checked: t.CInt) -> t.State: pass -def vqt6_qaction_is_checked(action: QtActionPtr) -> t.CInt | t.State: pass -def vqt6_qaction_set_enabled(action: QtActionPtr, enabled: t.CInt) -> t.State: pass -def vqt6_qaction_is_enabled(action: QtActionPtr) -> t.CInt | t.State: pass +def vqt6_qaction_set_checkable(action: QtActionPtr, checkable: int) -> t.State: pass +def vqt6_qaction_is_checkable(action: QtActionPtr) -> int | t.State: pass +def vqt6_qaction_set_checked(action: QtActionPtr, checked: int) -> t.State: pass +def vqt6_qaction_is_checked(action: QtActionPtr) -> int | t.State: pass +def vqt6_qaction_set_enabled(action: QtActionPtr, enabled: int) -> t.State: pass +def vqt6_qaction_is_enabled(action: QtActionPtr) -> int | t.State: pass def vqt6_qaction_trigger(action: QtActionPtr) -> t.State: pass @@ -481,29 +481,29 @@ def vqt6_qaction_trigger(action: QtActionPtr) -> t.State: pass # ============================================================ def vqt6_qstatusbar_create() -> QtStatusBarPtr | t.State: pass def vqt6_qstatusbar_create_with_parent(parent: QtWidgetPtr) -> QtStatusBarPtr | t.State: pass -def vqt6_qstatusbar_show_message(sb: QtStatusBarPtr, message: QtStringPtr, timeout_ms: t.CInt) -> t.State: pass +def vqt6_qstatusbar_show_message(sb: QtStatusBarPtr, message: QtStringPtr, timeout_ms: int) -> t.State: pass def vqt6_qstatusbar_clear_message(sb: QtStatusBarPtr) -> t.State: pass def vqt6_qstatusbar_current_message(sb: QtStatusBarPtr) -> QtStringPtr | t.State: pass -def vqt6_qstatusbar_add_widget(sb: QtStatusBarPtr, w: QtWidgetPtr, stretch: t.CInt) -> t.State: pass -def vqt6_qstatusbar_add_permanent_widget(sb: QtStatusBarPtr, w: QtWidgetPtr, stretch: t.CInt) -> t.State: pass +def vqt6_qstatusbar_add_widget(sb: QtStatusBarPtr, w: QtWidgetPtr, stretch: int) -> t.State: pass +def vqt6_qstatusbar_add_permanent_widget(sb: QtStatusBarPtr, w: QtWidgetPtr, stretch: int) -> t.State: pass def vqt6_qtoolbar_create() -> QtToolBarPtr | t.State: pass def vqt6_qtoolbar_create_with_parent(parent: QtWidgetPtr) -> QtToolBarPtr | t.State: pass def vqt6_qtoolbar_add_widget(tb: QtToolBarPtr, w: QtWidgetPtr) -> QtActionPtr | t.State: pass def vqt6_qtoolbar_add_action(tb: QtToolBarPtr, action: QtActionPtr) -> t.State: pass def vqt6_qtoolbar_add_separator(tb: QtToolBarPtr) -> t.State: pass -def vqt6_qtoolbar_set_icon_size(tb: QtToolBarPtr, w: t.CInt, h: t.CInt) -> t.State: pass -def vqt6_qtoolbar_set_orientation(tb: QtToolBarPtr, orientation: t.CInt) -> t.State: pass -def vqt6_qtoolbar_orientation(tb: QtToolBarPtr) -> t.CInt | t.State: pass +def vqt6_qtoolbar_set_icon_size(tb: QtToolBarPtr, w: int, h: int) -> t.State: pass +def vqt6_qtoolbar_set_orientation(tb: QtToolBarPtr, orientation: int) -> t.State: pass +def vqt6_qtoolbar_orientation(tb: QtToolBarPtr) -> int | t.State: pass # ============================================================ # QMessageBox — 消息对话框（静态方法） # ============================================================ -def vqt6_qmessagebox_information(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: t.CInt) -> t.CInt | t.State: pass -def vqt6_qmessagebox_warning(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: t.CInt) -> t.CInt | t.State: pass -def vqt6_qmessagebox_critical(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: t.CInt) -> t.CInt | t.State: pass -def vqt6_qmessagebox_question(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: t.CInt) -> t.CInt | t.State: pass +def vqt6_qmessagebox_information(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: int) -> int | t.State: pass +def vqt6_qmessagebox_warning(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: int) -> int | t.State: pass +def vqt6_qmessagebox_critical(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: int) -> int | t.State: pass +def vqt6_qmessagebox_question(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr, buttons: int) -> int | t.State: pass def vqt6_qmessagebox_about(parent: QtWidgetPtr, title: QtStringPtr, text: QtStringPtr) -> t.State: pass def vqt6_qmessagebox_about_qt(parent: QtWidgetPtr) -> t.State: pass @@ -522,10 +522,10 @@ def vqt6_qfiledialog_get_open_file_names(parent: QtWidgetPtr, caption: QtStringP # ============================================================ def vqt6_qcolordialog_get_color(initial: QtColorPtr, parent: QtWidgetPtr, title: QtStringPtr) -> QtColorPtr | t.State: pass def vqt6_qfontdialog_get_font(initial: QtFontPtr, parent: QtWidgetPtr, title: QtStringPtr) -> QtFontPtr | t.State: pass -def vqt6_qinputdialog_get_text(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, echo_mode: t.CInt, text: QtStringPtr, ok_pressed: t.CInt | t.CPtr) -> QtStringPtr | t.State: pass -def vqt6_qinputdialog_get_int(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, value: t.CInt, min_val: t.CInt, max_val: t.CInt, step: t.CInt, ok_pressed: t.CInt | t.CPtr) -> t.CInt | t.State: pass -def vqt6_qinputdialog_get_double(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, value: t.CDouble, min_val: t.CDouble, max_val: t.CDouble, decimals: t.CInt, ok_pressed: t.CInt | t.CPtr) -> t.CDouble | t.State: pass -def vqt6_qinputdialog_get_item(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, items: QtStringListPtr, current: t.CInt, editable: t.CInt, ok_pressed: t.CInt | t.CPtr) -> QtStringPtr | t.State: pass +def vqt6_qinputdialog_get_text(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, echo_mode: int, text: QtStringPtr, ok_pressed: int*) -> QtStringPtr | t.State: pass +def vqt6_qinputdialog_get_int(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, value: int, min_val: int, max_val: int, step: int, ok_pressed: int*) -> int | t.State: pass +def vqt6_qinputdialog_get_double(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, value: double, min_val: double, max_val: double, decimals: int, ok_pressed: int*) -> double | t.State: pass +def vqt6_qinputdialog_get_item(parent: QtWidgetPtr, title: QtStringPtr, label: QtStringPtr, items: QtStringListPtr, current: int, editable: int, ok_pressed: int*) -> QtStringPtr | t.State: pass # ============================================================ @@ -556,15 +556,15 @@ def vqt6_qtreewidget_connect_item_clicked(tw: QtTreeWidgetPtr, cb: bytes, user_d def vqt6_canvas_create() -> QtCanvasPtr | t.State: pass def vqt6_canvas_create_with_parent(parent: QtWidgetPtr) -> QtCanvasPtr | t.State: pass def vqt6_canvas_clear(canvas: QtCanvasPtr) -> t.State: pass -def vqt6_canvas_has_ink(canvas: QtCanvasPtr) -> t.CInt | t.State: pass -def vqt6_canvas_set_mode(canvas: QtCanvasPtr, mode: t.CInt) -> t.State: pass -def vqt6_canvas_mode(canvas: QtCanvasPtr) -> t.CInt | t.State: pass -def vqt6_canvas_set_pen(canvas: QtCanvasPtr, r: t.CInt, g: t.CInt, b: t.CInt, width_norm: t.CDouble) -> t.State: pass -def vqt6_canvas_set_grid(canvas: QtCanvasPtr, on: t.CInt) -> t.State: pass -def vqt6_canvas_set_scan_line(canvas: QtCanvasPtr, y_norm: t.CInt) -> t.State: pass -def vqt6_canvas_set_bg(canvas: QtCanvasPtr, r: t.CInt, g: t.CInt, b: t.CInt) -> t.State: pass -def vqt6_canvas_to_mnist28(canvas: QtCanvasPtr, out: t.CUnsignedChar | t.CPtr) -> t.CInt | t.State: pass -def vqt6_canvas_set_image28(canvas: QtCanvasPtr, inp: t.CUnsignedChar | t.CPtr) -> t.State: pass +def vqt6_canvas_has_ink(canvas: QtCanvasPtr) -> int | t.State: pass +def vqt6_canvas_set_mode(canvas: QtCanvasPtr, mode: int) -> t.State: pass +def vqt6_canvas_mode(canvas: QtCanvasPtr) -> int | t.State: pass +def vqt6_canvas_set_pen(canvas: QtCanvasPtr, r: int, g: int, b: int, width_norm: double) -> t.State: pass +def vqt6_canvas_set_grid(canvas: QtCanvasPtr, on: int) -> t.State: pass +def vqt6_canvas_set_scan_line(canvas: QtCanvasPtr, y_norm: int) -> t.State: pass +def vqt6_canvas_set_bg(canvas: QtCanvasPtr, r: int, g: int, b: int) -> t.State: pass +def vqt6_canvas_to_mnist28(canvas: QtCanvasPtr, out: uchar*) -> int | t.State: pass +def vqt6_canvas_set_image28(canvas: QtCanvasPtr, inp: uchar*) -> t.State: pass def vqt6_canvas_connect_changed(canvas: QtCanvasPtr, cb: bytes, user_data: bytes) -> t.State: pass @@ -574,20 +574,20 @@ def vqt6_canvas_connect_changed(canvas: QtCanvasPtr, cb: bytes, user_data: bytes # ============================================================ def vqt6_graph3d_create() -> QtGraph3DPtr | t.State: pass def vqt6_graph3d_create_with_parent(parent: QtWidgetPtr) -> QtGraph3DPtr | t.State: pass -def vqt6_graph3d_setup(g: QtGraph3DPtr, layer_sizes: t.CInt | t.CPtr, n_layers: t.CInt) -> t.State: pass +def vqt6_graph3d_setup(g: QtGraph3DPtr, layer_sizes: int*, n_layers: int) -> t.State: pass def vqt6_graph3d_clear(g: QtGraph3DPtr) -> t.State: pass -def vqt6_graph3d_node_count(g: QtGraph3DPtr) -> t.CInt | t.State: pass -def vqt6_graph3d_edge_count(g: QtGraph3DPtr) -> t.CInt | t.State: pass -def vqt6_graph3d_set_layer_alpha(g: QtGraph3DPtr, layer: t.CInt, alpha: t.CDouble) -> t.State: pass -def vqt6_graph3d_set_all_layer_alpha(g: QtGraph3DPtr, alpha: t.CDouble) -> t.State: pass -def vqt6_graph3d_set_values(g: QtGraph3DPtr, values: t.CDouble | t.CPtr, n: t.CInt) -> t.State: pass -def vqt6_graph3d_set_edge_weights(g: QtGraph3DPtr, w: t.CDouble | t.CPtr, n: t.CInt) -> t.State: pass -def vqt6_graph3d_set_edge_threshold(g: QtGraph3DPtr, tval: t.CDouble) -> t.State: pass -def vqt6_graph3d_set_edge_budget(g: QtGraph3DPtr, max_edges: t.CInt) -> t.State: pass -def vqt6_graph3d_set_view(g: QtGraph3DPtr, yaw_deg: t.CDouble, pitch_deg: t.CDouble, dist: t.CDouble) -> t.State: pass -def vqt6_graph3d_get_view(g: QtGraph3DPtr, yaw_deg: t.CDouble | t.CPtr, pitch_deg: t.CDouble | t.CPtr, dist: t.CDouble | t.CPtr) -> t.State: pass -def vqt6_graph3d_set_bg(g: QtGraph3DPtr, r: t.CInt, gcol: t.CInt, b: t.CInt) -> t.State: pass -def vqt6_graph3d_set_node_scale(g: QtGraph3DPtr, s: t.CDouble) -> t.State: pass +def vqt6_graph3d_node_count(g: QtGraph3DPtr) -> int | t.State: pass +def vqt6_graph3d_edge_count(g: QtGraph3DPtr) -> int | t.State: pass +def vqt6_graph3d_set_layer_alpha(g: QtGraph3DPtr, layer: int, alpha: double) -> t.State: pass +def vqt6_graph3d_set_all_layer_alpha(g: QtGraph3DPtr, alpha: double) -> t.State: pass +def vqt6_graph3d_set_values(g: QtGraph3DPtr, values: double*, n: int) -> t.State: pass +def vqt6_graph3d_set_edge_weights(g: QtGraph3DPtr, w: double*, n: int) -> t.State: pass +def vqt6_graph3d_set_edge_threshold(g: QtGraph3DPtr, tval: double) -> t.State: pass +def vqt6_graph3d_set_edge_budget(g: QtGraph3DPtr, max_edges: int) -> t.State: pass +def vqt6_graph3d_set_view(g: QtGraph3DPtr, yaw_deg: double, pitch_deg: double, dist: double) -> t.State: pass +def vqt6_graph3d_get_view(g: QtGraph3DPtr, yaw_deg: double*, pitch_deg: double*, dist: double*) -> t.State: pass +def vqt6_graph3d_set_bg(g: QtGraph3DPtr, r: int, gcol: int, b: int) -> t.State: pass +def vqt6_graph3d_set_node_scale(g: QtGraph3DPtr, s: double) -> t.State: pass def vqt6_graph3d_connect_view_changed(g: QtGraph3DPtr, cb: bytes, user_data: bytes) -> t.State: pass def vqt6_graph3d_reset_view(g: QtGraph3DPtr) -> t.State: pass @@ -597,14 +597,14 @@ def vqt6_graph3d_reset_view(g: QtGraph3DPtr) -> t.State: pass # ============================================================ def vqt6_chartview_create() -> QtChartViewPtr | t.State: pass def vqt6_chartview_create_with_parent(parent: QtWidgetPtr) -> QtChartViewPtr | t.State: pass -def vqt6_chartview_add_line(view: QtChartViewPtr, name: char | t.CPtr, r: t.CInt, g: t.CInt, b: t.CInt, right_axis: t.CInt) -> QtChartSeriesPtr | t.State: pass -def vqt6_chartview_append(view: QtChartViewPtr, series: QtChartSeriesPtr, x: t.CDouble, y: t.CDouble) -> t.State: pass +def vqt6_chartview_add_line(view: QtChartViewPtr, name: char*, r: int, g: int, b: int, right_axis: int) -> QtChartSeriesPtr | t.State: pass +def vqt6_chartview_append(view: QtChartViewPtr, series: QtChartSeriesPtr, x: double, y: double) -> t.State: pass def vqt6_chartview_clear_series(view: QtChartViewPtr, series: QtChartSeriesPtr) -> t.State: pass def vqt6_chartview_clear_all(view: QtChartViewPtr) -> t.State: pass def vqt6_chartview_autoscale(view: QtChartViewPtr) -> t.State: pass -def vqt6_chartview_set_title(view: QtChartViewPtr, title: char | t.CPtr) -> t.State: pass -def vqt6_chartview_set_legend_visible(view: QtChartViewPtr, visible: t.CInt) -> t.State: pass -def vqt6_chartview_set_background(view: QtChartViewPtr, r: t.CInt, g: t.CInt, b: t.CInt) -> t.State: pass -def vqt6_chartview_set_max_points(view: QtChartViewPtr, max_points: t.CInt) -> t.State: pass -def vqt6_chartview_open_zoom(view: QtChartViewPtr, title: char | t.CPtr) -> QtWidgetPtr | t.State: pass +def vqt6_chartview_set_title(view: QtChartViewPtr, title: char*) -> t.State: pass +def vqt6_chartview_set_legend_visible(view: QtChartViewPtr, visible: int) -> t.State: pass +def vqt6_chartview_set_background(view: QtChartViewPtr, r: int, g: int, b: int) -> t.State: pass +def vqt6_chartview_set_max_points(view: QtChartViewPtr, max_points: int) -> t.State: pass +def vqt6_chartview_open_zoom(view: QtChartViewPtr, title: char*) -> QtWidgetPtr | t.State: pass def vqt6_chartview_sync_zoom(view: QtChartViewPtr) -> t.State: pass diff --git a/vqt6/_types.vp b/vqt6/_types.vp index cfce66d..1c892fa 100644 --- a/vqt6/_types.vp +++ b/vqt6/_types.vp @@ -100,95 +100,95 @@ QtNetworkRequestPtr: t.CTypedef = t.CPtr # QNetworkRequest* # ============================================================ # Qt 键盘按键 (Qt::Key) -QT_KEY_ESCAPE: t.CDefine = 0x01000000 -QT_KEY_TAB: t.CDefine = 0x01000001 -QT_KEY_BACKTAB: t.CDefine = 0x01000002 -QT_KEY_BACKSPACE: t.CDefine = 0x01000003 -QT_KEY_RETURN: t.CDefine = 0x01000004 -QT_KEY_ENTER: t.CDefine = 0x01000005 -QT_KEY_INSERT: t.CDefine = 0x01000006 -QT_KEY_DELETE: t.CDefine = 0x01000007 -QT_KEY_PAUSE: t.CDefine = 0x01000008 -QT_KEY_PRINT: t.CDefine = 0x01000009 -QT_KEY_HOME: t.CDefine = 0x01000010 -QT_KEY_END: t.CDefine = 0x01000011 -QT_KEY_LEFT: t.CDefine = 0x01000012 -QT_KEY_UP: t.CDefine = 0x01000013 -QT_KEY_RIGHT: t.CDefine = 0x01000014 -QT_KEY_DOWN: t.CDefine = 0x01000015 -QT_KEY_PAGEUP: t.CDefine = 0x01000016 -QT_KEY_PAGEDOWN: t.CDefine = 0x01000017 -QT_KEY_SHIFT: t.CDefine = 0x01000020 -QT_KEY_CONTROL: t.CDefine = 0x01000021 -QT_KEY_META: t.CDefine = 0x01000022 -QT_KEY_ALT: t.CDefine = 0x01000023 -QT_KEY_F1: t.CDefine = 0x01000030 -QT_KEY_F2: t.CDefine = 0x01000031 -QT_KEY_F12: t.CDefine = 0x0100003b -QT_KEY_SPACE: t.CDefine = 0x20 -QT_KEY_A: t.CDefine = 0x41 -QT_KEY_Z: t.CDefine = 0x5a -QT_KEY_0: t.CDefine = 0x30 -QT_KEY_9: t.CDefine = 0x39 +define QT_KEY_ESCAPE = 0x01000000 +define QT_KEY_TAB = 0x01000001 +define QT_KEY_BACKTAB = 0x01000002 +define QT_KEY_BACKSPACE = 0x01000003 +define QT_KEY_RETURN = 0x01000004 +define QT_KEY_ENTER = 0x01000005 +define QT_KEY_INSERT = 0x01000006 +define QT_KEY_DELETE = 0x01000007 +define QT_KEY_PAUSE = 0x01000008 +define QT_KEY_PRINT = 0x01000009 +define QT_KEY_HOME = 0x01000010 +define QT_KEY_END = 0x01000011 +define QT_KEY_LEFT = 0x01000012 +define QT_KEY_UP = 0x01000013 +define QT_KEY_RIGHT = 0x01000014 +define QT_KEY_DOWN = 0x01000015 +define QT_KEY_PAGEUP = 0x01000016 +define QT_KEY_PAGEDOWN = 0x01000017 +define QT_KEY_SHIFT = 0x01000020 +define QT_KEY_CONTROL = 0x01000021 +define QT_KEY_META = 0x01000022 +define QT_KEY_ALT = 0x01000023 +define QT_KEY_F1 = 0x01000030 +define QT_KEY_F2 = 0x01000031 +define QT_KEY_F12 = 0x0100003b +define QT_KEY_SPACE = 0x20 +define QT_KEY_A = 0x41 +define QT_KEY_Z = 0x5a +define QT_KEY_0 = 0x30 +define QT_KEY_9 = 0x39 # Qt 鼠标按键 (Qt::MouseButton) -QT_NO_BUTTON: t.CDefine = 0x00000000 -QT_LEFT_BUTTON: t.CDefine = 0x00000001 -QT_RIGHT_BUTTON: t.CDefine = 0x00000002 -QT_MID_BUTTON: t.CDefine = 0x00000004 +define QT_NO_BUTTON = 0x00000000 +define QT_LEFT_BUTTON = 0x00000001 +define QT_RIGHT_BUTTON = 0x00000002 +define QT_MID_BUTTON = 0x00000004 # Qt::AlignmentFlag -QT_ALIGN_LEFT: t.CDefine = 0x0001 -QT_ALIGN_RIGHT: t.CDefine = 0x0002 -QT_ALIGN_HCENTER: t.CDefine = 0x0004 -QT_ALIGN_TOP: t.CDefine = 0x0020 -QT_ALIGN_BOTTOM: t.CDefine = 0x0040 -QT_ALIGN_VCENTER: t.CDefine = 0x0080 -QT_ALIGN_CENTER: t.CDefine = QT_ALIGN_HCENTER | QT_ALIGN_VCENTER +define QT_ALIGN_LEFT = 0x0001 +define QT_ALIGN_RIGHT = 0x0002 +define QT_ALIGN_HCENTER = 0x0004 +define QT_ALIGN_TOP = 0x0020 +define QT_ALIGN_BOTTOM = 0x0040 +define QT_ALIGN_VCENTER = 0x0080 +define QT_ALIGN_CENTER = QT_ALIGN_HCENTER | QT_ALIGN_VCENTER # Qt::Orientation -QT_HORIZONTAL: t.CDefine = 0x1 -QT_VERTICAL: t.CDefine = 0x2 +define QT_HORIZONTAL = 0x1 +define QT_VERTICAL = 0x2 # Qt 焦点 -QT_NO_FOCUS: t.CDefine = 0x00 -QT_TAB_FOCUS: t.CDefine = 0x01 -QT_CLICK_FOCUS: t.CDefine = 0x02 -QT_STRONG_FOCUS: t.CDefine = QT_TAB_FOCUS | QT_CLICK_FOCUS -QT_WHEEL_FOCUS: t.CDefine = 0x04 -QT_ALL_FOCUS: t.CDefine = QT_STRONG_FOCUS | QT_WHEEL_FOCUS +define QT_NO_FOCUS = 0x00 +define QT_TAB_FOCUS = 0x01 +define QT_CLICK_FOCUS = 0x02 +define QT_STRONG_FOCUS = QT_TAB_FOCUS | QT_CLICK_FOCUS +define QT_WHEEL_FOCUS = 0x04 +define QT_ALL_FOCUS = QT_STRONG_FOCUS | QT_WHEEL_FOCUS # Qt::WindowFlag -QT_WINDOW: t.CDefine = 0x00000001 -QT_DIALOG: t.CDefine = 0x00000002 | QT_WINDOW -QT_SHEET: t.CDefine = 0x00000004 | QT_WINDOW -QT_DRAWER: t.CDefine = QT_SHEET | 0x00000008 -QT_POPUP: t.CDefine = 0x00000008 | QT_WINDOW -QT_TOOL: t.CDefine = 0x0000000a | QT_WINDOW -QT_TOOLTIP: t.CDefine = 0x0000000c | QT_WINDOW -QT_SPLASH_SCREEN: t.CDefine = 0x0000000e | QT_WINDOW +define QT_WINDOW = 0x00000001 +define QT_DIALOG = 0x00000002 | QT_WINDOW +define QT_SHEET = 0x00000004 | QT_WINDOW +define QT_DRAWER = QT_SHEET | 0x00000008 +define QT_POPUP = 0x00000008 | QT_WINDOW +define QT_TOOL = 0x0000000a | QT_WINDOW +define QT_TOOLTIP = 0x0000000c | QT_WINDOW +define QT_SPLASH_SCREEN = 0x0000000e | QT_WINDOW -QT_WINDOW_TITLE: t.CDefine = 0x00000001 -QT_WINDOW_SYSTEM_MENU: t.CDefine = 0x00000002 -QT_WINDOW_MIN_MAX_BUTTONS: t.CDefine = 0x00000004 -QT_WINDOW_CLOSE_BUTTON: t.CDefine = 0x08000000 -QT_WINDOW_CONTEXT_HELP_BUTTON: t.CDefine = 0x00000008 +define QT_WINDOW_TITLE = 0x00000001 +define QT_WINDOW_SYSTEM_MENU = 0x00000002 +define QT_WINDOW_MIN_MAX_BUTTONS = 0x00000004 +define QT_WINDOW_CLOSE_BUTTON = 0x08000000 +define QT_WINDOW_CONTEXT_HELP_BUTTON = 0x00000008 # QMessageBox 标准按钮 -QT_OK: t.CDefine = 0x00000400 -QT_CANCEL: t.CDefine = 0x00400000 -QT_YES: t.CDefine = 0x00004000 -QT_NO: t.CDefine = 0x00010000 -QT_CLOSE: t.CDefine = 0x00200000 +define QT_OK = 0x00000400 +define QT_CANCEL = 0x00400000 +define QT_YES = 0x00004000 +define QT_NO = 0x00010000 +define QT_CLOSE = 0x00200000 # 事件类型 -QT_EVENT_NONE: t.CDefine = 0 -QT_EVENT_KEY: t.CDefine = 6 -QT_EVENT_MOUSE_BUTTON_PRESS: t.CDefine = 2 -QT_EVENT_MOUSE_BUTTON_RELEASE: t.CDefine = 3 -QT_EVENT_MOUSE_MOVE: t.CDefine = 5 -QT_EVENT_PAINT: t.CDefine = 12 -QT_EVENT_RESIZE: t.CDefine = 14 -QT_EVENT_CLOSE: t.CDefine = 19 -QT_EVENT_SHOW: t.CDefine = 17 -QT_EVENT_HIDE: t.CDefine = 18 +define QT_EVENT_NONE = 0 +define QT_EVENT_KEY = 6 +define QT_EVENT_MOUSE_BUTTON_PRESS = 2 +define QT_EVENT_MOUSE_BUTTON_RELEASE = 3 +define QT_EVENT_MOUSE_MOVE = 5 +define QT_EVENT_PAINT = 12 +define QT_EVENT_RESIZE = 14 +define QT_EVENT_CLOSE = 19 +define QT_EVENT_SHOW = 17 +define QT_EVENT_HIDE = 18 diff --git a/w32/fileio.vp b/w32/fileio.vp index 3b3239e..fcabfe7 100644 --- a/w32/fileio.vp +++ b/w32/fileio.vp @@ -7,7 +7,7 @@ import w32.win32base import w32.win32file -class MODE(t.CEnum): +enum MODE: R = 0 W = 1 A = 2 @@ -18,7 +18,7 @@ class MODE(t.CEnum): XP = 7 -class FRESULT(t.CEnum): +enum FRESULT: OK = 0 ERR = -1 ERR_CLOSED = -2 @@ -27,15 +27,15 @@ class FRESULT(t.CEnum): ERR_NOTFOUND = -5 -SEEK_SET: t.CDefine = 0 -SEEK_CUR: t.CDefine = 1 -SEEK_END: t.CDefine = 2 +define SEEK_SET = 0 +define SEEK_CUR = 1 +define SEEK_END = 2 -INVALID_SET_FILE_POINTER: t.CDefine = -1 +define INVALID_SET_FILE_POINTER = -1 -SHARE_READ: t.CDefine = 0x00000001 -SHARE_WRITE: t.CDefine = 0x00000002 -SHARE_DELETE: t.CDefine = 0x00000004 +define SHARE_READ = 0x00000001 +define SHARE_WRITE = 0x00000002 +define SHARE_DELETE = 0x00000004 # ============================================================================= # 环境变量展开（路径层唯一实现） @@ -57,7 +57,7 @@ SHARE_DELETE: t.CDefine = 0x00000004 extern def ExpandEnvironmentStringsA(lpSrc: LPCSTR, lpDst: CHARPTR, nSize: ULONG) -> ULONG # 展开结果缓冲上限（含 NUL；超过即视为失败并退回原路径） -EXPAND_ENV_CAP: t.CDefine = 4096 +define EXPAND_ENV_CAP = 4096 def ExpandEnvironmentPath(path: str) -> str: @@ -194,7 +194,7 @@ class File: if self.closed: return FRESULT.ERR_CLOSED if not self.can_read: return FRESULT.ERR_PERM bytes_read: ULONG = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf, count, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf, count, t.CPtr(&bytes_read), None) if result == 0: return FRESULT.ERR_IO return LONG(bytes_read) @@ -202,7 +202,7 @@ class File: if self.closed: return FRESULT.ERR_CLOSED if not self.can_write: return FRESULT.ERR_PERM bytes_written: ULONG = 0 - result: BOOL = w32.win32file.WriteFile(self.handle, buf, count, c.Addr(bytes_written), None) + result: BOOL = w32.win32file.WriteFile(self.handle, buf, count, &bytes_written, None) if result == 0: return FRESULT.ERR_IO return LONG(bytes_written) @@ -211,7 +211,7 @@ class File: if not self.can_write: return FRESULT.ERR_PERM length: ULONG = 0 p: bytes = s - while c.Deref(p) != 0: + while *p != 0: length += 1 p += 1 return self.write(s, length) @@ -240,7 +240,7 @@ class File: def size(self) -> LONGLONG: if self.closed: return -1 li: w32.win32base.LARGE_INTEGER = w32.win32base.LARGE_INTEGER() - result: BOOL = w32.win32file.GetFileSizeEx(self.handle, t.CPtr(c.Addr(li))) + result: BOOL = w32.win32file.GetFileSizeEx(self.handle, t.CPtr(&li)) if result == 0: return -1 return li.QuadPart @@ -250,14 +250,14 @@ class File: if max_count < 2: return FRESULT.ERR total: ULONG = 0 bytes_read: ULONG = 0 - ch: t.CInt = 0 + ch: int = 0 while total < max_count - 1: bytes_read = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf + total, 1, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf + total, 1, t.CPtr(&bytes_read), None) if result == 0 or bytes_read == 0: break - # 明确字节读：下标访问按指针元素类型（i8）load 1 字节（Repl.vp - # _read_line 同款）。不用 c.Deref(buf + total)——后者的宽度取决于 - # 指针类型是否为 i8*，此处语义明确要求 1 字节。 + # 明确字节读：下标访问按指针元素类型（i8）load 1 字节（Repl.vp + # _read_line 同款）。不用 c.Deref(buf + total)——后者的宽度取决于 + # 指针类型是否为 i8*，此处语义明确要求 1 字节。 ch = buf[total] total += 1 if ch == 10: break @@ -286,7 +286,7 @@ class File: to_read = buf_size - 1 self.seek(0, SEEK_SET) bytes_read: ULONG = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf, to_read, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf, to_read, t.CPtr(&bytes_read), None) if result == 0: return FRESULT.ERR_IO if bytes_read < buf_size: buf[bytes_read] = 0 @@ -378,7 +378,7 @@ class FileW: if self.closed: return FRESULT.ERR_CLOSED if not self.can_read: return FRESULT.ERR_PERM bytes_read: ULONG = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf, count, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf, count, t.CPtr(&bytes_read), None) if result == 0: return FRESULT.ERR_IO return LONG(bytes_read) @@ -386,7 +386,7 @@ class FileW: if self.closed: return FRESULT.ERR_CLOSED if not self.can_write: return FRESULT.ERR_PERM bytes_written: ULONG = 0 - result: BOOL = w32.win32file.WriteFile(self.handle, buf, count, t.CPtr(c.Addr(bytes_written)), None) + result: BOOL = w32.win32file.WriteFile(self.handle, buf, count, t.CPtr(&bytes_written), None) if result == 0: return FRESULT.ERR_IO return LONG(bytes_written) @@ -395,7 +395,7 @@ class FileW: if not self.can_write: return FRESULT.ERR_PERM length: ULONG = 0 p: bytes = s - while c.Deref(p) != 0: + while *p != 0: length += 1 p += 1 return self.write(s, length) @@ -424,7 +424,7 @@ class FileW: def size(self) -> LONGLONG: if self.closed: return -1 li: w32.win32base.LARGE_INTEGER = w32.win32base.LARGE_INTEGER() - result: BOOL = w32.win32file.GetFileSizeEx(self.handle, t.CPtr(c.Addr(li))) + result: BOOL = w32.win32file.GetFileSizeEx(self.handle, t.CPtr(&li)) if result == 0: return -1 return li.QuadPart @@ -434,14 +434,14 @@ class FileW: if max_count < 2: return FRESULT.ERR total: ULONG = 0 bytes_read: ULONG = 0 - ch: t.CInt = 0 + ch: int = 0 while total < max_count - 1: bytes_read = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf + total, 1, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf + total, 1, t.CPtr(&bytes_read), None) if result == 0 or bytes_read == 0: break - # 明确字节读：下标访问按指针元素类型（i8）load 1 字节（Repl.vp - # _read_line 同款）。不用 c.Deref(buf + total)——后者的宽度取决于 - # 指针类型是否为 i8*，此处语义明确要求 1 字节。 + # 明确字节读：下标访问按指针元素类型（i8）load 1 字节（Repl.vp + # _read_line 同款）。不用 c.Deref(buf + total)——后者的宽度取决于 + # 指针类型是否为 i8*，此处语义明确要求 1 字节。 ch = buf[total] total += 1 if ch == 10: break @@ -470,15 +470,15 @@ class FileW: to_read = buf_size - 1 self.seek(0, SEEK_SET) bytes_read: ULONG = 0 - result: BOOL = w32.win32file.ReadFile(self.handle, buf, to_read, t.CPtr(c.Addr(bytes_read)), None) + result: BOOL = w32.win32file.ReadFile(self.handle, buf, to_read, t.CPtr(&bytes_read), None) if result == 0: return FRESULT.ERR_IO if bytes_read < buf_size: buf[bytes_read] = 0 return LONG(bytes_read) -def open(filename: str, mode: ULONG, share: ULONG = SHARE_READ) -> File | t.CPtr: +def open(filename: str, mode: ULONG, share: ULONG = SHARE_READ) -> File*: return File(filename, mode, share) -def openw(filename: w32.win32base.LPCWSTR, mode: ULONG, share: ULONG = SHARE_READ) -> FileW | t.CPtr: +def openw(filename: w32.win32base.LPCWSTR, mode: ULONG, share: ULONG = SHARE_READ) -> FileW*: return FileW(filename, mode, share) diff --git a/w32/win32base.vp b/w32/win32base.vp index ef32b07..c2251a8 100644 --- a/w32/win32base.vp +++ b/w32/win32base.vp @@ -3,23 +3,23 @@ from stdint import * import stdlib HANDLE: t.CTypedef = VOIDPTR -LPCSTR: t.CTypedef = t.CConst | t.CChar | t.CPtr -LPCWSTR: t.CTypedef = t.CConst | t.CUnsignedShort | t.CPtr +LPCSTR: t.CTypedef = t.CConst | char | t.CPtr +LPCWSTR: t.CTypedef = t.CConst | uint16 | t.CPtr -INVALID_HANDLE_VALUE: t.CDefine = -1 -NULL: t.CDefine = 0 -TRUE: t.CDefine = 1 -FALSE: t.CDefine = 0 -INFINITE: t.CDefine = 0xFFFFFFFF -WAIT_FAILED: t.CDefine = 0xFFFFFFFF -WAIT_OBJECT_0: t.CDefine = 0 -WAIT_TIMEOUT: t.CDefine = 258 -WAIT_ABANDONED: t.CDefine = 0x80 -MAX_PATH: t.CDefine = 260 -ERROR_SUCCESS: t.CDefine = 0 -ERROR_FILE_NOT_FOUND: t.CDefine = 2 -ERROR_ACCESS_DENIED: t.CDefine = 5 -ERROR_INSUFFICIENT_BUFFER: t.CDefine = 122 +define INVALID_HANDLE_VALUE = -1 +define NULL = 0 +define TRUE = 1 +define FALSE = 0 +define INFINITE = 0xFFFFFFFF +define WAIT_FAILED = 0xFFFFFFFF +define WAIT_OBJECT_0 = 0 +define WAIT_TIMEOUT = 258 +define WAIT_ABANDONED = 0x80 +define MAX_PATH = 260 +define ERROR_SUCCESS = 0 +define ERROR_FILE_NOT_FOUND = 2 +define ERROR_ACCESS_DENIED = 5 +define ERROR_INSUFFICIENT_BUFFER = 122 class SECURITY_ATTRIBUTES(): nLength: DWORD @@ -68,12 +68,12 @@ extern def GetModuleHandleW(lpModuleName: LPCWSTR) -> HANDLE extern def LoadLibraryA(lpLibFileName: LPCSTR) -> HANDLE extern def LoadLibraryW(lpLibFileName: LPCWSTR) -> HANDLE extern def FreeLibrary(hLibModule: HANDLE) -> BOOL -extern def GetSystemTime(lpSystemTime: SYSTEMTIME | t.CPtr) -extern def GetLocalTime(lpSystemTime: SYSTEMTIME | t.CPtr) -extern def FileTimeToSystemTime(lpFileTime: FILETIME | t.CPtr, lpSystemTime: SYSTEMTIME | t.CPtr) -> BOOL -extern def SystemTimeToFileTime(lpSystemTime: SYSTEMTIME | t.CPtr, lpFileTime: FILETIME | t.CPtr) -> BOOL -extern def QueryPerformanceCounter(lpPerformanceCount: LARGE_INTEGER | t.CPtr) -> BOOL -extern def QueryPerformanceFrequency(lpFrequency: LARGE_INTEGER | t.CPtr) -> BOOL +extern def GetSystemTime(lpSystemTime: SYSTEMTIME*) +extern def GetLocalTime(lpSystemTime: SYSTEMTIME*) +extern def FileTimeToSystemTime(lpFileTime: FILETIME*, lpSystemTime: SYSTEMTIME*) -> BOOL +extern def SystemTimeToFileTime(lpSystemTime: SYSTEMTIME*, lpFileTime: FILETIME*) -> BOOL +extern def QueryPerformanceCounter(lpPerformanceCount: LARGE_INTEGER*) -> BOOL +extern def QueryPerformanceFrequency(lpFrequency: LARGE_INTEGER*) -> BOOL extern def Sleep(dwMilliseconds: ULONG) extern def SleepEx(dwMilliseconds: ULONG, bAlertable: BOOL) -> ULONG extern def GetTickCount() -> ULONG @@ -88,8 +88,8 @@ extern def GetCommandLineA() -> CHARPTR # 走 W 系列 API; 仅当字节串不是合法 UTF-8(如命令行 argv 传来的 ANSI 串)时才 # 退回 A 系列, 保持既有行为。 # ============================================================================= -UTF8_CODEPAGE: t.CDefine = 65001 -MB_ERR_INVALID_CHARS: t.CDefine = 0x00000008 +define UTF8_CODEPAGE = 65001 +define MB_ERR_INVALID_CHARS = 0x00000008 extern def MultiByteToWideChar(CodePage: UINT, dwFlags: DWORD, lpMultiByteStr: LPCSTR, cbMultiByte: int, lpWideCharStr: WCHARPTR, diff --git a/w32/win32console.vp b/w32/win32console.vp index 1a66553..d428fb3 100644 --- a/w32/win32console.vp +++ b/w32/win32console.vp @@ -2,42 +2,42 @@ import t from stdint import * from w32.win32base import * -ENABLE_PROCESSED_INPUT: t.CDefine = 0x0001 -ENABLE_LINE_INPUT: t.CDefine = 0x0002 -ENABLE_ECHO_INPUT: t.CDefine = 0x0004 -ENABLE_WINDOW_INPUT: t.CDefine = 0x0008 -ENABLE_MOUSE_INPUT: t.CDefine = 0x0010 -ENABLE_INSERT_MODE: t.CDefine = 0x0020 -ENABLE_QUICK_EDIT_MODE: t.CDefine = 0x0040 -ENABLE_EXTENDED_FLAGS: t.CDefine = 0x0080 +define ENABLE_PROCESSED_INPUT = 0x0001 +define ENABLE_LINE_INPUT = 0x0002 +define ENABLE_ECHO_INPUT = 0x0004 +define ENABLE_WINDOW_INPUT = 0x0008 +define ENABLE_MOUSE_INPUT = 0x0010 +define ENABLE_INSERT_MODE = 0x0020 +define ENABLE_QUICK_EDIT_MODE = 0x0040 +define ENABLE_EXTENDED_FLAGS = 0x0080 -ENABLE_PROCESSED_OUTPUT: t.CDefine = 0x0001 -ENABLE_WRAP_AT_EOL_OUTPUT: t.CDefine = 0x0002 -ENABLE_VIRTUAL_TERMINAL_PROCESSING: t.CDefine = 0x0004 -DISABLE_NEWLINE_AUTO_RETURN: t.CDefine = 0x0008 -ENABLE_LVB_GRID_WORLDWIDE: t.CDefine = 0x0010 +define ENABLE_PROCESSED_OUTPUT = 0x0001 +define ENABLE_WRAP_AT_EOL_OUTPUT = 0x0002 +define ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004 +define DISABLE_NEWLINE_AUTO_RETURN = 0x0008 +define ENABLE_LVB_GRID_WORLDWIDE = 0x0010 -FOREGROUND_BLUE: t.CDefine = 0x0001 -FOREGROUND_GREEN: t.CDefine = 0x0002 -FOREGROUND_RED: t.CDefine = 0x0004 -FOREGROUND_INTENSITY: t.CDefine = 0x0008 -BACKGROUND_BLUE: t.CDefine = 0x0010 -BACKGROUND_GREEN: t.CDefine = 0x0020 -BACKGROUND_RED: t.CDefine = 0x0040 -BACKGROUND_INTENSITY: t.CDefine = 0x0080 +define FOREGROUND_BLUE = 0x0001 +define FOREGROUND_GREEN = 0x0002 +define FOREGROUND_RED = 0x0004 +define FOREGROUND_INTENSITY = 0x0008 +define BACKGROUND_BLUE = 0x0010 +define BACKGROUND_GREEN = 0x0020 +define BACKGROUND_RED = 0x0040 +define BACKGROUND_INTENSITY = 0x0080 -KEY_EVENT: t.CDefine = 0x0001 -MOUSE_EVENT: t.CDefine = 0x0002 -WINDOW_BUFFER_SIZE_EVENT: t.CDefine = 0x0004 -MENU_EVENT: t.CDefine = 0x0008 -FOCUS_EVENT: t.CDefine = 0x0010 +define KEY_EVENT = 0x0001 +define MOUSE_EVENT = 0x0002 +define WINDOW_BUFFER_SIZE_EVENT = 0x0004 +define MENU_EVENT = 0x0008 +define FOCUS_EVENT = 0x0010 # 控制事件类型（SetConsoleCtrlHandler 处理例程的入参 dwCtrlType；consoleapi.h） -CTRL_C_EVENT: t.CDefine = 0 # Ctrl+C -CTRL_BREAK_EVENT: t.CDefine = 1 # Ctrl+Break -CTRL_CLOSE_EVENT: t.CDefine = 2 # 关闭控制台窗口 -CTRL_LOGOFF_EVENT: t.CDefine = 5 # 用户注销 -CTRL_SHUTDOWN_EVENT: t.CDefine = 6 # 系统关机 +define CTRL_C_EVENT = 0# Ctrl+C +define CTRL_BREAK_EVENT = 1# Ctrl+Break +define CTRL_CLOSE_EVENT = 2# 关闭控制台窗口 +define CTRL_LOGOFF_EVENT = 5# 用户注销 +define CTRL_SHUTDOWN_EVENT = 6# 系统关机 class COORD(): X: SHORT @@ -89,24 +89,24 @@ extern def SetConsoleOutputCP(codepage: UINT) -> BOOL extern def SetConsoleCP(codepage: UINT) -> BOOL extern def GetConsoleCP() -> UINT extern def GetConsoleOutputCP() -> UINT -extern def GetConsoleScreenBufferInfo(hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: CONSOLE_SCREEN_BUFFER_INFO | t.CPtr) -> BOOL +extern def GetConsoleScreenBufferInfo(hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: CONSOLE_SCREEN_BUFFER_INFO*) -> BOOL extern def SetConsoleScreenBufferSize(hConsoleOutput: HANDLE, dwSize: COORD) -> BOOL extern def SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) -> BOOL -extern def GetConsoleCursorInfo(hConsoleOutput: HANDLE, lpConsoleCursorInfo: CONSOLE_CURSOR_INFO | t.CPtr) -> BOOL -extern def SetConsoleCursorInfo(hConsoleOutput: HANDLE, lpConsoleCursorInfo: CONSOLE_CURSOR_INFO | t.CPtr) -> BOOL +extern def GetConsoleCursorInfo(hConsoleOutput: HANDLE, lpConsoleCursorInfo: CONSOLE_CURSOR_INFO*) -> BOOL +extern def SetConsoleCursorInfo(hConsoleOutput: HANDLE, lpConsoleCursorInfo: CONSOLE_CURSOR_INFO*) -> BOOL extern def SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) -> BOOL -extern def FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: t.CChar, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfCharsWritten: ULONG | t.CPtr) -> BOOL -extern def FillConsoleOutputCharacterW(hConsoleOutput: HANDLE, cCharacter: WCHAR, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfCharsWritten: ULONG | t.CPtr) -> BOOL -extern def FillConsoleOutputAttribute(hConsoleOutput: HANDLE, wAttribute: WORD, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfAttrsWritten: ULONG | t.CPtr) -> BOOL -extern def WriteConsoleA(hConsoleOutput: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfCharsToWrite: ULONG, lpNumberOfCharsWritten: ULONG | t.CPtr, lpReserved: VOIDPTR) -> BOOL -extern def WriteConsoleW(hConsoleOutput: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfCharsToWrite: ULONG, lpNumberOfCharsWritten: ULONG | t.CPtr, lpReserved: VOIDPTR) -> BOOL -extern def ReadConsoleA(hConsoleInput: HANDLE, lpBuffer: VOIDPTR, nNumberOfCharsToRead: ULONG, lpNumberOfCharsRead: ULONG | t.CPtr, pInputControl: VOIDPTR) -> BOOL -extern def ReadConsoleW(hConsoleInput: HANDLE, lpBuffer: VOIDPTR, nNumberOfCharsToRead: ULONG, lpNumberOfCharsRead: ULONG | t.CPtr, pInputControl: VOIDPTR) -> BOOL -extern def GetConsoleMode(hConsoleHandle: HANDLE, lpMode: ULONG | t.CPtr) -> BOOL +extern def FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: char, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfCharsWritten: ULONG*) -> BOOL +extern def FillConsoleOutputCharacterW(hConsoleOutput: HANDLE, cCharacter: WCHAR, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfCharsWritten: ULONG*) -> BOOL +extern def FillConsoleOutputAttribute(hConsoleOutput: HANDLE, wAttribute: WORD, nLength: ULONG, dwWriteCoord: COORD, lpNumberOfAttrsWritten: ULONG*) -> BOOL +extern def WriteConsoleA(hConsoleOutput: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfCharsToWrite: ULONG, lpNumberOfCharsWritten: ULONG*, lpReserved: VOIDPTR) -> BOOL +extern def WriteConsoleW(hConsoleOutput: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfCharsToWrite: ULONG, lpNumberOfCharsWritten: ULONG*, lpReserved: VOIDPTR) -> BOOL +extern def ReadConsoleA(hConsoleInput: HANDLE, lpBuffer: VOIDPTR, nNumberOfCharsToRead: ULONG, lpNumberOfCharsRead: ULONG*, pInputControl: VOIDPTR) -> BOOL +extern def ReadConsoleW(hConsoleInput: HANDLE, lpBuffer: VOIDPTR, nNumberOfCharsToRead: ULONG, lpNumberOfCharsRead: ULONG*, pInputControl: VOIDPTR) -> BOOL +extern def GetConsoleMode(hConsoleHandle: HANDLE, lpMode: ULONG*) -> BOOL extern def SetConsoleMode(hConsoleHandle: HANDLE, dwMode: ULONG) -> BOOL -extern def ReadConsoleInputA(hConsoleInput: HANDLE, lpBuffer: INPUT_RECORD | t.CPtr, nLength: ULONG, lpNumberOfEventsRead: ULONG | t.CPtr) -> BOOL -extern def ReadConsoleInputW(hConsoleInput: HANDLE, lpBuffer: INPUT_RECORD | t.CPtr, nLength: ULONG, lpNumberOfEventsRead: ULONG | t.CPtr) -> BOOL -extern def GetNumberOfConsoleInputEvents(hConsoleInput: HANDLE, lpNumberOfEvents: ULONG | t.CPtr) -> BOOL +extern def ReadConsoleInputA(hConsoleInput: HANDLE, lpBuffer: INPUT_RECORD*, nLength: ULONG, lpNumberOfEventsRead: ULONG*) -> BOOL +extern def ReadConsoleInputW(hConsoleInput: HANDLE, lpBuffer: INPUT_RECORD*, nLength: ULONG, lpNumberOfEventsRead: ULONG*) -> BOOL +extern def GetNumberOfConsoleInputEvents(hConsoleInput: HANDLE, lpNumberOfEvents: ULONG*) -> BOOL extern def FlushConsoleInputBuffer(hConsoleInput: HANDLE) -> BOOL extern def SetConsoleTitleA(lpConsoleTitle: LPCSTR) -> BOOL extern def SetConsoleTitleW(lpConsoleTitle: LPCWSTR) -> BOOL @@ -114,8 +114,8 @@ extern def GetConsoleTitleA(lpConsoleTitle: CHARPTR, nSize: ULONG) -> ULONG extern def GetConsoleTitleW(lpConsoleTitle: WCHARPTR, nSize: ULONG) -> ULONG extern def AllocConsole() -> BOOL extern def FreeConsole() -> BOOL -extern def SetConsoleWindowInfo(hConsoleOutput: HANDLE, bAbsolute: BOOL, lpConsoleWindow: SMALL_RECT | t.CPtr) -> BOOL -extern def ScrollConsoleScreenBufferA(hConsoleOutput: HANDLE, lpScrollRectangle: SMALL_RECT | t.CPtr, lpClipRectangle: SMALL_RECT | t.CPtr, dwDestinationOrigin: COORD, lpFill: CHAR_INFO | t.CPtr) -> BOOL +extern def SetConsoleWindowInfo(hConsoleOutput: HANDLE, bAbsolute: BOOL, lpConsoleWindow: SMALL_RECT*) -> BOOL +extern def ScrollConsoleScreenBufferA(hConsoleOutput: HANDLE, lpScrollRectangle: SMALL_RECT*, lpClipRectangle: SMALL_RECT*, dwDestinationOrigin: COORD, lpFill: CHAR_INFO*) -> BOOL # 控制事件处理例程注册/摘除（consoleapi.h:114-115 / kernel32.dll，本仓由 -lkernel32 链接） # BOOL WINAPI SetConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine, BOOL Add); diff --git a/w32/win32dbghelp.vp b/w32/win32dbghelp.vp index 7ca144f..f46f84c 100644 --- a/w32/win32dbghelp.vp +++ b/w32/win32dbghelp.vp @@ -33,18 +33,18 @@ from w32.win32base import * # ============================================================================= # IMAGE_FILE_MACHINE_* （winnt.h；x64 = 0x8664） -IMAGE_FILE_MACHINE_AMD64: t.CDefine = 0x8664 +define IMAGE_FILE_MACHINE_AMD64 = 0x8664 # ADDRESS_MODE（dbghelp.h）：AddrMode1616=0 / AddrMode1632=1 / AddrModeReal=2 / AddrModeFlat=3 -ADDR_MODE_FLAT: t.CDefine = 3 +define ADDR_MODE_FLAT = 3 # SYMOPT_*（dbghelp.h）——只列本仓用到的四项： # DEFERRED_LOADS：SymInitialize(fInvadeProcess=TRUE) 时**只枚举模块、不加载符号/PDB** # （模块枚举是 StackWalk64 的必要前提；符号本身本模块不需要）； # UNDNAME：修饰名解码为可读名（本模块只取地址，仅为了不改变 dbghelp 的默认语义）； # NO_PROMPTS：禁止 dbghelp 弹交互式对话框（否则缺符号时可能卡住进程启动）。 -SYMOPT_UNDNAME: t.CDefine = 0x00000002 -SYMOPT_DEFERRED_LOADS: t.CDefine = 0x00000004 -SYMOPT_NO_PROMPTS: t.CDefine = 0x00080000 +define SYMOPT_UNDNAME = 0x00000002 +define SYMOPT_DEFERRED_LOADS = 0x00000004 +define SYMOPT_NO_PROMPTS = 0x00080000 # typedef struct _ADDRESS64 { DWORD64 Offset; WORD Segment; ADDRESS_MODE Mode; } ADDRESS64; @@ -87,10 +87,10 @@ class STACKFRAME64(): AddrStack: ADDRESS64 # 0x030 栈指针（x64 = RSP） AddrBStore: ADDRESS64 # 0x040 （x86 用；x64 恒 0） FuncTableEntry: VOIDPTR # 0x050 - Params: t.CArray[t.CUInt64T, 4] # 0x058 + Params: t.CArray[uint64, 4] # 0x058 Far: BOOL # 0x078 Virtual: BOOL # 0x07C - Reserved: t.CArray[t.CUInt64T, 3] # 0x080 + Reserved: t.CArray[uint64, 3] # 0x080 KdHelp: KDHELP64 # 0x098 # 合计 0xF8 = 248 字节 @@ -134,6 +134,6 @@ extern def SymGetModuleBase64(hProcess: HANDLE, AddrBase: ULONGLONG) -> ULONGLON # SymFunctionTableAccess64 / SymGetModuleBase64），由 TPV bitcast 成函数指针； # TranslateAddress 传 None（0）——x64 不需要地址翻译例程。 extern def StackWalk64(MachineType: DWORD, hProcess: HANDLE, hThread: HANDLE, - StackFrame: STACKFRAME64 | t.CPtr, ContextRecord: VOIDPTR, + StackFrame: STACKFRAME64*, ContextRecord: VOIDPTR, ReadMemoryRoutine: t.CPtr, FunctionTableAccessRoutine: t.CPtr, GetModuleBaseRoutine: t.CPtr, TranslateAddress: t.CPtr) -> BOOL diff --git a/w32/win32file.vp b/w32/win32file.vp index 4fcbfb0..6ee65e8 100644 --- a/w32/win32file.vp +++ b/w32/win32file.vp @@ -2,52 +2,52 @@ import t from stdint import * from w32.win32base import * -GENERIC_READ: t.CDefine = 0x80000000 -GENERIC_WRITE: t.CDefine = 0x40000000 -GENERIC_EXECUTE: t.CDefine = 0x20000000 -GENERIC_ALL: t.CDefine = 0x10000000 +define GENERIC_READ = 0x80000000 +define GENERIC_WRITE = 0x40000000 +define GENERIC_EXECUTE = 0x20000000 +define GENERIC_ALL = 0x10000000 -FILE_SHARE_READ: t.CDefine = 0x00000001 -FILE_SHARE_WRITE: t.CDefine = 0x00000002 -FILE_SHARE_DELETE: t.CDefine = 0x00000004 +define FILE_SHARE_READ = 0x00000001 +define FILE_SHARE_WRITE = 0x00000002 +define FILE_SHARE_DELETE = 0x00000004 -CREATE_NEW: t.CDefine = 1 -CREATE_ALWAYS: t.CDefine = 2 -OPEN_EXISTING: t.CDefine = 3 -OPEN_ALWAYS: t.CDefine = 4 -TRUNCATE_EXISTING: t.CDefine = 5 +define CREATE_NEW = 1 +define CREATE_ALWAYS = 2 +define OPEN_EXISTING = 3 +define OPEN_ALWAYS = 4 +define TRUNCATE_EXISTING = 5 -FILE_ATTRIBUTE_READONLY: t.CDefine = 0x00000001 -FILE_ATTRIBUTE_HIDDEN: t.CDefine = 0x00000002 -FILE_ATTRIBUTE_SYSTEM: t.CDefine = 0x00000004 -FILE_ATTRIBUTE_DIRECTORY: t.CDefine = 0x00000010 -FILE_ATTRIBUTE_ARCHIVE: t.CDefine = 0x00000020 -FILE_ATTRIBUTE_NORMAL: t.CDefine = 0x00000080 -FILE_ATTRIBUTE_TEMPORARY: t.CDefine = 0x00000100 -FILE_ATTRIBUTE_COMPRESSED: t.CDefine = 0x00000800 -FILE_ATTRIBUTE_OFFLINE: t.CDefine = 0x00001000 -FILE_ATTRIBUTE_ENCRYPTED: t.CDefine = 0x00004000 +define FILE_ATTRIBUTE_READONLY = 0x00000001 +define FILE_ATTRIBUTE_HIDDEN = 0x00000002 +define FILE_ATTRIBUTE_SYSTEM = 0x00000004 +define FILE_ATTRIBUTE_DIRECTORY = 0x00000010 +define FILE_ATTRIBUTE_ARCHIVE = 0x00000020 +define FILE_ATTRIBUTE_NORMAL = 0x00000080 +define FILE_ATTRIBUTE_TEMPORARY = 0x00000100 +define FILE_ATTRIBUTE_COMPRESSED = 0x00000800 +define FILE_ATTRIBUTE_OFFLINE = 0x00001000 +define FILE_ATTRIBUTE_ENCRYPTED = 0x00004000 -FILE_FLAG_WRITE_THROUGH: t.CDefine = 0x80000000 -FILE_FLAG_OVERLAPPED: t.CDefine = 0x40000000 -FILE_FLAG_NO_BUFFERING: t.CDefine = 0x20000000 -FILE_FLAG_RANDOM_ACCESS: t.CDefine = 0x10000000 -FILE_FLAG_SEQUENTIAL_SCAN: t.CDefine = 0x08000000 -FILE_FLAG_DELETE_ON_CLOSE: t.CDefine = 0x04000000 -FILE_FLAG_BACKUP_SEMANTICS: t.CDefine = 0x02000000 -FILE_FLAG_POSIX_SEMANTICS: t.CDefine = 0x01000000 +define FILE_FLAG_WRITE_THROUGH = 0x80000000 +define FILE_FLAG_OVERLAPPED = 0x40000000 +define FILE_FLAG_NO_BUFFERING = 0x20000000 +define FILE_FLAG_RANDOM_ACCESS = 0x10000000 +define FILE_FLAG_SEQUENTIAL_SCAN = 0x08000000 +define FILE_FLAG_DELETE_ON_CLOSE = 0x04000000 +define FILE_FLAG_BACKUP_SEMANTICS = 0x02000000 +define FILE_FLAG_POSIX_SEMANTICS = 0x01000000 -FILE_BEGIN: t.CDefine = 0 -FILE_CURRENT: t.CDefine = 1 -FILE_END: t.CDefine = 2 +define FILE_BEGIN = 0 +define FILE_CURRENT = 1 +define FILE_END = 2 -STD_INPUT_HANDLE: t.CDefine = t.CUnsignedLong(-10) -STD_OUTPUT_HANDLE: t.CDefine = t.CUnsignedLong(-11) -STD_ERROR_HANDLE: t.CDefine = t.CUnsignedLong(-12) +define STD_INPUT_HANDLE = uint32(-10) +define STD_OUTPUT_HANDLE = uint32(-11) +define STD_ERROR_HANDLE = uint32(-12) -MOVEFILE_REPLACE_EXISTING: t.CDefine = 0x00000001 -MOVEFILE_COPY_ALLOWED: t.CDefine = 0x00000002 -MOVEFILE_WRITE_THROUGH: t.CDefine = 0x00000008 +define MOVEFILE_REPLACE_EXISTING = 0x00000001 +define MOVEFILE_COPY_ALLOWED = 0x00000002 +define MOVEFILE_WRITE_THROUGH = 0x00000008 class BY_HANDLE_FILE_INFORMATION(): dwFileAttributes: DWORD @@ -70,8 +70,8 @@ class WIN32_FIND_DATAA(): nFileSizeLow: DWORD dwReserved0: DWORD dwReserved1: DWORD - cFileName: t.CArray[t.CChar, 260] - cAlternateFileName: t.CArray[t.CChar, 14] + cFileName: t.CArray[char, 260] + cAlternateFileName: t.CArray[char, 14] class WIN32_FIND_DATAW(): dwFileAttributes: DWORD @@ -82,17 +82,17 @@ class WIN32_FIND_DATAW(): nFileSizeLow: DWORD dwReserved0: DWORD dwReserved1: DWORD - cFileName: t.CArray[t.CUInt16T, 260] - cAlternateFileName: t.CArray[t.CUInt16T, 14] + cFileName: t.CArray[uint16, 260] + cAlternateFileName: t.CArray[uint16, 14] -extern def CreateFileA(lpFileName: LPCSTR, dwDesiredAccess: ULONG, dwShareMode: ULONG, lpSecurityAttributes: SECURITY_ATTRIBUTES | t.CPtr, dwCreationDisposition: ULONG, dwFlagsAndAttributes: ULONG, hTemplateFile: HANDLE) -> HANDLE -extern def CreateFileW(lpFileName: LPCWSTR, dwDesiredAccess: ULONG, dwShareMode: ULONG, lpSecurityAttributes: SECURITY_ATTRIBUTES | t.CPtr, dwCreationDisposition: ULONG, dwFlagsAndAttributes: ULONG, hTemplateFile: HANDLE) -> HANDLE -extern def ReadFile(hFile: HANDLE, lpBuffer: VOIDPTR, nNumberOfBytesToRead: ULONG, lpNumberOfBytesRead: ULONG | t.CPtr, lpOverlapped: OVERLAPPED | t.CPtr) -> BOOL -extern def WriteFile(hFile: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfBytesToWrite: ULONG, lpNumberOfBytesWritten: ULONG | t.CPtr, lpOverlapped: OVERLAPPED | t.CPtr) -> BOOL -extern def SetFilePointer(hFile: HANDLE, lDistanceToMove: LONG, lpDistanceToMoveHigh: LONG | t.CPtr, dwMoveMethod: ULONG) -> LONG -extern def SetFilePointerEx(hFile: HANDLE, liDistanceToMove: LARGE_INTEGER | t.CPtr, lpNewFilePointer: LARGE_INTEGER | t.CPtr, dwMoveMethod: ULONG) -> BOOL -extern def GetFileSize(hFile: HANDLE, lpFileSizeHigh: ULONG | t.CPtr) -> ULONG -extern def GetFileSizeEx(hFile: HANDLE, lpFileSize: LARGE_INTEGER | t.CPtr) -> BOOL +extern def CreateFileA(lpFileName: LPCSTR, dwDesiredAccess: ULONG, dwShareMode: ULONG, lpSecurityAttributes: SECURITY_ATTRIBUTES*, dwCreationDisposition: ULONG, dwFlagsAndAttributes: ULONG, hTemplateFile: HANDLE) -> HANDLE +extern def CreateFileW(lpFileName: LPCWSTR, dwDesiredAccess: ULONG, dwShareMode: ULONG, lpSecurityAttributes: SECURITY_ATTRIBUTES*, dwCreationDisposition: ULONG, dwFlagsAndAttributes: ULONG, hTemplateFile: HANDLE) -> HANDLE +extern def ReadFile(hFile: HANDLE, lpBuffer: VOIDPTR, nNumberOfBytesToRead: ULONG, lpNumberOfBytesRead: ULONG*, lpOverlapped: OVERLAPPED*) -> BOOL +extern def WriteFile(hFile: HANDLE, lpBuffer: t.CConst | VOIDPTR, nNumberOfBytesToWrite: ULONG, lpNumberOfBytesWritten: ULONG*, lpOverlapped: OVERLAPPED*) -> BOOL +extern def SetFilePointer(hFile: HANDLE, lDistanceToMove: LONG, lpDistanceToMoveHigh: LONG*, dwMoveMethod: ULONG) -> LONG +extern def SetFilePointerEx(hFile: HANDLE, liDistanceToMove: LARGE_INTEGER*, lpNewFilePointer: LARGE_INTEGER*, dwMoveMethod: ULONG) -> BOOL +extern def GetFileSize(hFile: HANDLE, lpFileSizeHigh: ULONG*) -> ULONG +extern def GetFileSizeEx(hFile: HANDLE, lpFileSize: LARGE_INTEGER*) -> BOOL extern def SetEndOfFile(hFile: HANDLE) -> BOOL extern def FlushFileBuffers(hFile: HANDLE) -> BOOL extern def GetFileType(hFile: HANDLE) -> ULONG @@ -108,18 +108,18 @@ extern def MoveFileExA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, dwFlag extern def MoveFileExW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, dwFlags: ULONG) -> BOOL extern def CopyFileA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, bFailIfExists: BOOL) -> BOOL extern def CopyFileW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, bFailIfExists: BOOL) -> BOOL -extern def CreateDirectoryA(lpPathName: LPCSTR, lpSecurityAttributes: SECURITY_ATTRIBUTES | t.CPtr) -> BOOL -extern def CreateDirectoryW(lpPathName: LPCWSTR, lpSecurityAttributes: SECURITY_ATTRIBUTES | t.CPtr) -> BOOL +extern def CreateDirectoryA(lpPathName: LPCSTR, lpSecurityAttributes: SECURITY_ATTRIBUTES*) -> BOOL +extern def CreateDirectoryW(lpPathName: LPCWSTR, lpSecurityAttributes: SECURITY_ATTRIBUTES*) -> BOOL extern def RemoveDirectoryA(lpPathName: LPCSTR) -> BOOL extern def RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL -extern def FindFirstFileA(lpFileName: LPCSTR, lpFindFileData: WIN32_FIND_DATAA | t.CPtr) -> HANDLE -extern def FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: WIN32_FIND_DATAW | t.CPtr) -> HANDLE -extern def FindNextFileA(hFindFile: HANDLE, lpFindFileData: WIN32_FIND_DATAA | t.CPtr) -> BOOL -extern def FindNextFileW(hFindFile: HANDLE, lpFindFileData: WIN32_FIND_DATAW | t.CPtr) -> BOOL +extern def FindFirstFileA(lpFileName: LPCSTR, lpFindFileData: WIN32_FIND_DATAA*) -> HANDLE +extern def FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: WIN32_FIND_DATAW*) -> HANDLE +extern def FindNextFileA(hFindFile: HANDLE, lpFindFileData: WIN32_FIND_DATAA*) -> BOOL +extern def FindNextFileW(hFindFile: HANDLE, lpFindFileData: WIN32_FIND_DATAW*) -> BOOL extern def FindClose(hFindFile: HANDLE) -> BOOL extern def GetStdHandle(nStdHandle: ULONG) -> HANDLE extern def SetStdHandle(nStdHandle: ULONG, hHandle: HANDLE) -> BOOL -extern def GetFileInformationByHandle(hFile: HANDLE, lpFileInformation: BY_HANDLE_FILE_INFORMATION | t.CPtr) -> BOOL +extern def GetFileInformationByHandle(hFile: HANDLE, lpFileInformation: BY_HANDLE_FILE_INFORMATION*) -> BOOL extern def LockFile(hFile: HANDLE, dwFileOffsetLow: ULONG, dwFileOffsetHigh: ULONG, nNumberOfBytesToLockLow: ULONG, nNumberOfBytesToLockHigh: ULONG) -> BOOL extern def UnlockFile(hFile: HANDLE, dwFileOffsetLow: ULONG, dwFileOffsetHigh: ULONG, nNumberOfBytesToUnlockLow: ULONG, nNumberOfBytesToUnlockHigh: ULONG) -> BOOL extern def GetTempPathA(nBufferLength: ULONG, lpBuffer: CHARPTR) -> ULONG @@ -133,11 +133,11 @@ extern def SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL extern def GetModuleFileNameA(hModule: HANDLE, lpFilename: CHARPTR, nSize: ULONG) -> ULONG extern def GetModuleFileNameW(hModule: HANDLE, lpFilename: WCHARPTR, nSize: ULONG) -> ULONG -HANDLE_FLAG_INHERIT: t.CDefine = 0x00000001 -HANDLE_FLAG_PROTECT_FROM_CLOSE: t.CDefine = 0x00000002 +define HANDLE_FLAG_INHERIT = 0x00000001 +define HANDLE_FLAG_PROTECT_FROM_CLOSE = 0x00000002 -extern def CreatePipe(hReadPipe: HANDLE | t.CPtr, hWritePipe: HANDLE | t.CPtr, lpPipeAttributes: SECURITY_ATTRIBUTES | t.CPtr, nSize: ULONG) -> BOOL +extern def CreatePipe(hReadPipe: HANDLE*, hWritePipe: HANDLE*, lpPipeAttributes: SECURITY_ATTRIBUTES*, nSize: ULONG) -> BOOL extern def SetHandleInformation(hObject: HANDLE, dwMask: ULONG, dwFlags: ULONG) -> BOOL -extern def DuplicateHandle(hSourceProcessHandle: HANDLE, hSourceHandle: HANDLE, hTargetProcessHandle: HANDLE, lpTargetHandle: HANDLE | t.CPtr, dwDesiredAccess: ULONG, bInheritHandle: BOOL, dwOptions: ULONG) -> BOOL +extern def DuplicateHandle(hSourceProcessHandle: HANDLE, hSourceHandle: HANDLE, hTargetProcessHandle: HANDLE, lpTargetHandle: HANDLE*, dwDesiredAccess: ULONG, bInheritHandle: BOOL, dwOptions: ULONG) -> BOOL -DUPLICATE_SAME_ACCESS: t.CDefine = 0x00000002 +define DUPLICATE_SAME_ACCESS = 0x00000002 diff --git a/w32/win32memory.vp b/w32/win32memory.vp index ad9f9a9..0e5df95 100644 --- a/w32/win32memory.vp +++ b/w32/win32memory.vp @@ -2,34 +2,34 @@ import t from stdint import * from w32.win32base import * -MEM_COMMIT: t.CDefine = 0x00001000 -MEM_RESERVE: t.CDefine = 0x00002000 -MEM_DECOMMIT: t.CDefine = 0x00004000 -MEM_RELEASE: t.CDefine = 0x00008000 -MEM_FREE: t.CDefine = 0x00010000 -MEM_RESET: t.CDefine = 0x00080000 -MEM_TOP_DOWN: t.CDefine = 0x00100000 -MEM_WRITE_WATCH: t.CDefine = 0x00200000 -MEM_PHYSICAL: t.CDefine = 0x00400000 -MEM_LARGE_PAGES: t.CDefine = 0x20000000 +define MEM_COMMIT = 0x00001000 +define MEM_RESERVE = 0x00002000 +define MEM_DECOMMIT = 0x00004000 +define MEM_RELEASE = 0x00008000 +define MEM_FREE = 0x00010000 +define MEM_RESET = 0x00080000 +define MEM_TOP_DOWN = 0x00100000 +define MEM_WRITE_WATCH = 0x00200000 +define MEM_PHYSICAL = 0x00400000 +define MEM_LARGE_PAGES = 0x20000000 -PAGE_NOACCESS: t.CDefine = 0x01 -PAGE_READONLY: t.CDefine = 0x02 -PAGE_READWRITE: t.CDefine = 0x04 -PAGE_WRITECOPY: t.CDefine = 0x08 -PAGE_EXECUTE: t.CDefine = 0x10 -PAGE_EXECUTE_READ: t.CDefine = 0x20 -PAGE_EXECUTE_READWRITE: t.CDefine = 0x40 -PAGE_EXECUTE_WRITECOPY: t.CDefine = 0x80 -PAGE_GUARD: t.CDefine = 0x100 -PAGE_NOCACHE: t.CDefine = 0x200 -PAGE_WRITECOMBINE: t.CDefine = 0x400 +define PAGE_NOACCESS = 0x01 +define PAGE_READONLY = 0x02 +define PAGE_READWRITE = 0x04 +define PAGE_WRITECOPY = 0x08 +define PAGE_EXECUTE = 0x10 +define PAGE_EXECUTE_READ = 0x20 +define PAGE_EXECUTE_READWRITE = 0x40 +define PAGE_EXECUTE_WRITECOPY = 0x80 +define PAGE_GUARD = 0x100 +define PAGE_NOCACHE = 0x200 +define PAGE_WRITECOMBINE = 0x400 -HEAP_NO_SERIALIZE: t.CDefine = 0x00000001 -HEAP_GROWABLE: t.CDefine = 0x00000002 -HEAP_GENERATE_EXCEPTIONS: t.CDefine = 0x00000004 -HEAP_ZERO_MEMORY: t.CDefine = 0x00000008 -HEAP_REALLOC_IN_PLACE_ONLY: t.CDefine = 0x00000010 +define HEAP_NO_SERIALIZE = 0x00000001 +define HEAP_GROWABLE = 0x00000002 +define HEAP_GENERATE_EXCEPTIONS = 0x00000004 +define HEAP_ZERO_MEMORY = 0x00000008 +define HEAP_REALLOC_IN_PLACE_ONLY = 0x00000010 class MEMORY_BASIC_INFORMATION(): BaseAddress: VOIDPTR @@ -42,8 +42,8 @@ class MEMORY_BASIC_INFORMATION(): extern def VirtualAlloc(lpAddress: VOIDPTR, dwSize: sizet, flAllocationType: ULONG, flProtect: ULONG) -> VOIDPTR extern def VirtualFree(lpAddress: VOIDPTR, dwSize: sizet, dwFreeType: ULONG) -> BOOL -extern def VirtualProtect(lpAddress: VOIDPTR, dwSize: sizet, flNewProtect: ULONG, lpflOldProtect: ULONG | t.CPtr) -> BOOL -extern def VirtualQuery(lpAddress: t.CConst | VOIDPTR, lpBuffer: MEMORY_BASIC_INFORMATION | t.CPtr, dwLength: sizet) -> sizet +extern def VirtualProtect(lpAddress: VOIDPTR, dwSize: sizet, flNewProtect: ULONG, lpflOldProtect: ULONG*) -> BOOL +extern def VirtualQuery(lpAddress: t.CConst | VOIDPTR, lpBuffer: MEMORY_BASIC_INFORMATION*, dwLength: sizet) -> sizet extern def VirtualLock(lpAddress: VOIDPTR, dwSize: sizet) -> BOOL extern def VirtualUnlock(lpAddress: VOIDPTR, dwSize: sizet) -> BOOL extern def GetProcessHeap() -> HANDLE @@ -70,4 +70,4 @@ extern def LocalFree(hMem: VOIDPTR) -> VOIDPTR # 要求填这个函数（includes/traceback.vp 在 Install 时用 GetProcAddress 取其地址传入， # 见 includes/w32/win32dbghelp.vp 的 StackWalk64）。 # 返回 0 = 失败（GetLastError 取原因）。 -extern def ReadProcessMemory(hProcess: HANDLE, lpBaseAddress: t.CConst | VOIDPTR, lpBuffer: VOIDPTR, nSize: sizet, lpNumberOfBytesRead: sizet | t.CPtr) -> BOOL +extern def ReadProcessMemory(hProcess: HANDLE, lpBaseAddress: t.CConst | VOIDPTR, lpBuffer: VOIDPTR, nSize: sizet, lpNumberOfBytesRead: sizet*) -> BOOL diff --git a/w32/win32process.vp b/w32/win32process.vp index 5ca6aba..3d86124 100644 --- a/w32/win32process.vp +++ b/w32/win32process.vp @@ -2,42 +2,42 @@ import t from stdint import * from w32.win32base import * -PROCESS_TERMINATE: t.CDefine = 0x0001 -PROCESS_CREATE_THREAD: t.CDefine = 0x0002 -PROCESS_VM_OPERATION: t.CDefine = 0x0008 -PROCESS_VM_READ: t.CDefine = 0x0010 -PROCESS_VM_WRITE: t.CDefine = 0x0020 -PROCESS_QUERY_INFORMATION: t.CDefine = 0x0400 -PROCESS_ALL_ACCESS: t.CDefine = 0x001FFFFF +define PROCESS_TERMINATE = 0x0001 +define PROCESS_CREATE_THREAD = 0x0002 +define PROCESS_VM_OPERATION = 0x0008 +define PROCESS_VM_READ = 0x0010 +define PROCESS_VM_WRITE = 0x0020 +define PROCESS_QUERY_INFORMATION = 0x0400 +define PROCESS_ALL_ACCESS = 0x001FFFFF -THREAD_TERMINATE: t.CDefine = 0x0001 -THREAD_SUSPEND_RESUME: t.CDefine = 0x0002 -THREAD_GET_CONTEXT: t.CDefine = 0x0008 -THREAD_SET_CONTEXT: t.CDefine = 0x0010 -THREAD_QUERY_INFORMATION: t.CDefine = 0x0040 -THREAD_ALL_ACCESS: t.CDefine = 0x001FFFFF +define THREAD_TERMINATE = 0x0001 +define THREAD_SUSPEND_RESUME = 0x0002 +define THREAD_GET_CONTEXT = 0x0008 +define THREAD_SET_CONTEXT = 0x0010 +define THREAD_QUERY_INFORMATION = 0x0040 +define THREAD_ALL_ACCESS = 0x001FFFFF -CREATE_SUSPENDED: t.CDefine = 0x00000004 -CREATE_NEW_CONSOLE: t.CDefine = 0x00000010 -CREATE_NEW_PROCESS_GROUP: t.CDefine = 0x00000200 -CREATE_NO_WINDOW: t.CDefine = 0x08000000 -DETACHED_PROCESS: t.CDefine = 0x00000008 +define CREATE_SUSPENDED = 0x00000004 +define CREATE_NEW_CONSOLE = 0x00000010 +define CREATE_NEW_PROCESS_GROUP = 0x00000200 +define CREATE_NO_WINDOW = 0x08000000 +define DETACHED_PROCESS = 0x00000008 -STARTF_USESHOWWINDOW: t.CDefine = 0x00000001 -STARTF_USESTDHANDLES: t.CDefine = 0x00000100 +define STARTF_USESHOWWINDOW = 0x00000001 +define STARTF_USESTDHANDLES = 0x00000100 -SW_HIDE: t.CDefine = 0 -SW_SHOW: t.CDefine = 5 -SW_MINIMIZE: t.CDefine = 6 +define SW_HIDE = 0 +define SW_SHOW = 5 +define SW_MINIMIZE = 6 -NORMAL_PRIORITY_CLASS: t.CDefine = 0x00000020 -IDLE_PRIORITY_CLASS: t.CDefine = 0x00000040 -HIGH_PRIORITY_CLASS: t.CDefine = 0x00000080 -REALTIME_PRIORITY_CLASS: t.CDefine = 0x00000100 -BELOW_NORMAL_PRIORITY_CLASS: t.CDefine = 0x00004000 -ABOVE_NORMAL_PRIORITY_CLASS: t.CDefine = 0x00008000 +define NORMAL_PRIORITY_CLASS = 0x00000020 +define IDLE_PRIORITY_CLASS = 0x00000040 +define HIGH_PRIORITY_CLASS = 0x00000080 +define REALTIME_PRIORITY_CLASS = 0x00000100 +define BELOW_NORMAL_PRIORITY_CLASS = 0x00004000 +define ABOVE_NORMAL_PRIORITY_CLASS = 0x00008000 -STILL_ACTIVE: t.CDefine = 259 +define STILL_ACTIVE = 259 class STARTUPINFOA: cb: DWORD @@ -85,15 +85,15 @@ class PROCESS_INFORMATION(): dwProcessId: DWORD dwThreadId: DWORD -extern def CreateProcessA(lpApplicationName: LPCSTR, lpCommandLine: CHARPTR, lpProcessAttributes: SECURITY_ATTRIBUTES | t.CPtr, lpThreadAttributes: SECURITY_ATTRIBUTES | t.CPtr, bInheritHandles: BOOL, dwCreationFlags: ULONG, lpEnvironment: VOIDPTR, lpCurrentDirectory: LPCSTR, lpStartupInfo: STARTUPINFOA | t.CPtr, lpProcessInformation: PROCESS_INFORMATION | t.CPtr) -> BOOL -extern def CreateProcessW(lpApplicationName: LPCWSTR, lpCommandLine: WCHARPTR, lpProcessAttributes: SECURITY_ATTRIBUTES | t.CPtr, lpThreadAttributes: SECURITY_ATTRIBUTES | t.CPtr, bInheritHandles: BOOL, dwCreationFlags: ULONG, lpEnvironment: VOIDPTR, lpCurrentDirectory: LPCWSTR, lpStartupInfo: STARTUPINFOW | t.CPtr, lpProcessInformation: PROCESS_INFORMATION | t.CPtr) -> BOOL +extern def CreateProcessA(lpApplicationName: LPCSTR, lpCommandLine: CHARPTR, lpProcessAttributes: SECURITY_ATTRIBUTES*, lpThreadAttributes: SECURITY_ATTRIBUTES*, bInheritHandles: BOOL, dwCreationFlags: ULONG, lpEnvironment: VOIDPTR, lpCurrentDirectory: LPCSTR, lpStartupInfo: STARTUPINFOA*, lpProcessInformation: PROCESS_INFORMATION*) -> BOOL +extern def CreateProcessW(lpApplicationName: LPCWSTR, lpCommandLine: WCHARPTR, lpProcessAttributes: SECURITY_ATTRIBUTES*, lpThreadAttributes: SECURITY_ATTRIBUTES*, bInheritHandles: BOOL, dwCreationFlags: ULONG, lpEnvironment: VOIDPTR, lpCurrentDirectory: LPCWSTR, lpStartupInfo: STARTUPINFOW*, lpProcessInformation: PROCESS_INFORMATION*) -> BOOL extern def TerminateProcess(hProcess: HANDLE, uExitCode: UINT) -> BOOL -extern def GetExitCodeProcess(hProcess: HANDLE, lpExitCode: ULONG | t.CPtr) -> BOOL -extern def GetExitCodeThread(hThread: HANDLE, lpExitCode: ULONG | t.CPtr) -> BOOL +extern def GetExitCodeProcess(hProcess: HANDLE, lpExitCode: ULONG*) -> BOOL +extern def GetExitCodeThread(hThread: HANDLE, lpExitCode: ULONG*) -> BOOL extern def OpenProcess(dwDesiredAccess: ULONG, bInheritHandle: BOOL, dwProcessId: ULONG) -> HANDLE extern def GetCurrentProcess() -> HANDLE extern def GetCurrentProcessId() -> ULONG -extern def CreateThread(lpThreadAttributes: SECURITY_ATTRIBUTES | t.CPtr, dwStackSize: sizet, lpStartAddress: VOIDPTR, lpParameter: VOIDPTR, dwCreationFlags: ULONG, lpThreadId: ULONG | t.CPtr) -> HANDLE +extern def CreateThread(lpThreadAttributes: SECURITY_ATTRIBUTES*, dwStackSize: sizet, lpStartAddress: VOIDPTR, lpParameter: VOIDPTR, dwCreationFlags: ULONG, lpThreadId: ULONG*) -> HANDLE extern def OpenThread(dwDesiredAccess: ULONG, bInheritHandle: BOOL, dwThreadId: ULONG) -> HANDLE extern def SuspendThread(hThread: HANDLE) -> ULONG extern def ResumeThread(hThread: HANDLE) -> ULONG @@ -146,13 +146,13 @@ extern def TlsSetValue(dwTlsIndex: ULONG, lpTlsValue: VOIDPTR) -> BOOL # 调用方约定：GetThreadContext 要求 lpContext 16 字节对齐 —— 本仓由 # stdlib.malloc/calloc 分配（x64 CRT 保证 16 字节对齐），不要用栈上局部变量。 # ============================================================================= -CONTEXT_AMD64: t.CDefine = 0x00100000 -CONTEXT_CONTROL: t.CDefine = 0x00100001 -CONTEXT_INTEGER: t.CDefine = 0x00100002 -CONTEXT_SEGMENTS: t.CDefine = 0x00100004 -CONTEXT_FLOATING_POINT: t.CDefine = 0x00100008 -CONTEXT_DEBUG_REGISTERS: t.CDefine = 0x00100010 -CONTEXT_FULL: t.CDefine = 0x0010000B +define CONTEXT_AMD64 = 0x00100000 +define CONTEXT_CONTROL = 0x00100001 +define CONTEXT_INTEGER = 0x00100002 +define CONTEXT_SEGMENTS = 0x00100004 +define CONTEXT_FLOATING_POINT = 0x00100008 +define CONTEXT_DEBUG_REGISTERS = 0x00100010 +define CONTEXT_FULL = 0x0010000B class CONTEXT(): P1Home: ULONGLONG # 0x000 @@ -193,8 +193,8 @@ class CONTEXT(): R14: ULONGLONG # 0x0E8 R15: ULONGLONG # 0x0F0 Rip: ULONGLONG # 0x0F8 - FltSave: t.CArray[t.CUInt8T, 512] # 0x100（XMM_SAVE_AREA32） - VectorRegister: t.CArray[t.CUInt8T, 416] # 0x300（M128A[26]） + FltSave: t.CArray[uint8, 512] # 0x100（XMM_SAVE_AREA32） + VectorRegister: t.CArray[uint8, 416] # 0x300（M128A[26]） VectorControl: ULONGLONG # 0x4A0 DebugControl: ULONGLONG # 0x4A8 LastBranchToRip: ULONGLONG # 0x4B0 @@ -205,7 +205,7 @@ class CONTEXT(): # 取线程上下文（processthreadsapi.h）。hThread 需带 THREAD_GET_CONTEXT 权限； # ContextFlags 必须先写入 CONTEXT_AMD64 | ...（x64；本仓用 CONTEXT_FULL）。 # 返回 0 = 失败（GetLastError 取原因）。 -extern def GetThreadContext(hThread: HANDLE, lpContext: CONTEXT | t.CPtr) -> BOOL +extern def GetThreadContext(hThread: HANDLE, lpContext: CONTEXT*) -> BOOL # LPTOP_LEVEL_EXCEPTION_FILTER SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER); # 注册进程级「未处理异常」过滤器（errhandlingapi.h，kernel32）。 diff --git a/w32/win32sync.vp b/w32/win32sync.vp index 3eb3b5d..fc50484 100644 --- a/w32/win32sync.vp +++ b/w32/win32sync.vp @@ -56,7 +56,7 @@ extern def ReleaseSRWLockExclusive(SRWLock: SRWLOCK*) -> VOID extern def ReleaseSRWLockShared(SRWLock: SRWLOCK*) -> VOID # 条件变量 (Condition Variables) - Vista+ -CONDITION_VARIABLE_LOCKMODE_SHARED: t.CDefine = 0x1 +define CONDITION_VARIABLE_LOCKMODE_SHARED = 0x1 extern def InitializeConditionVariable(ConditionVariable: CONDITION_VARIABLE*) -> VOID extern def SleepConditionVariableCS(ConditionVariable: CONDITION_VARIABLE*, CriticalSection: CRITICAL_SECTION*, dwMilliseconds: ULONG) -> BOOL diff --git a/w32/winsock2.vp b/w32/winsock2.vp index af2c5ea..940be40 100644 --- a/w32/winsock2.vp +++ b/w32/winsock2.vp @@ -8,39 +8,39 @@ from w32.win32base import * # ============================================================ # 版本常量 -WINSOCK_VERSION: t.CDefine = 0x0202 # 2.2 +define WINSOCK_VERSION = 0x0202# 2.2 # 地址族 -AF_INET: t.CDefine = 2 -AF_INET6: t.CDefine = 23 +define AF_INET = 2 +define AF_INET6 = 23 # 套接字类型 -SOCK_STREAM: t.CDefine = 1 # TCP -SOCK_DGRAM: t.CDefine = 2 # UDP -SOCK_RAW: t.CDefine = 3 # 原始套接字 +define SOCK_STREAM = 1# TCP +define SOCK_DGRAM = 2# UDP +define SOCK_RAW = 3# 原始套接字 # 协议 -IPPROTO_TCP: t.CDefine = 6 -IPPROTO_UDP: t.CDefine = 17 +define IPPROTO_TCP = 6 +define IPPROTO_UDP = 17 # 选项级别 -SOL_SOCKET: t.CDefine = 0xFFFF # WinSock2 值 -SO_RCVTIMEO: t.CDefine = 0x1006 # WinSock2 值 -SO_SNDTIMEO: t.CDefine = 0x1005 # WinSock2 值 -SO_REUSEADDR: t.CDefine = 0x0004 # WinSock2 值 +define SOL_SOCKET = 0xFFFF# WinSock2 值 +define SO_RCVTIMEO = 0x1006# WinSock2 值 +define SO_SNDTIMEO = 0x1005# WinSock2 值 +define SO_REUSEADDR = 0x0004# WinSock2 值 # 特殊值 -INADDR_ANY: t.CDefine = 0 -SOCKET_ERROR: t.CDefine = -1 -INVALID_SOCKET: t.CDefine = 0xFFFFFFFF # WinSock2: ~0 +define INADDR_ANY = 0 +define SOCKET_ERROR = -1 +define INVALID_SOCKET = 0xFFFFFFFF# WinSock2: ~0 # 发送/接收标志 -MSG_NOSIGNAL: t.CDefine = 0 # Windows 不支持，设为 0 +define MSG_NOSIGNAL = 0# Windows 不支持，设为 0 # 关闭方式 -SD_SEND: t.CDefine = 1 -SD_RECV: t.CDefine = 0 -SD_BOTH: t.CDefine = 2 +define SD_SEND = 1 +define SD_RECV = 0 +define SD_BOTH = 2 # ============================================================ @@ -84,21 +84,21 @@ class WinTimeVal: # WinSock2 API 函数 # ============================================================ -extern def WSAStartup(wVersionRequested: WORD, lpWSAData: WSAData | t.CPtr) -> INT +extern def WSAStartup(wVersionRequested: WORD, lpWSAData: WSAData*) -> INT extern def WSACleanup() -> INT extern def WSAGetLastError() -> INT extern def socket(family: INT, type: INT, protocol: INT) -> u64 extern def closesocket(s: u64) -> INT -extern def connect(s: u64, name: WSASocketAddr | t.CPtr, namelen: INT) -> INT +extern def connect(s: u64, name: WSASocketAddr*, namelen: INT) -> INT extern def send(s: u64, buf: t.CPtr, len: INT, flags: INT) -> INT extern def recv(s: u64, buf: t.CPtr, len: INT, flags: INT) -> INT -extern def bind(s: u64, name: WSASocketAddr | t.CPtr, namelen: INT) -> INT +extern def bind(s: u64, name: WSASocketAddr*, namelen: INT) -> INT extern def listen(s: u64, backlog: INT) -> INT -extern def accept(s: u64, addr: WSASocketAddr | t.CPtr, addrlen: INT | t.CPtr) -> u64 +extern def accept(s: u64, addr: WSASocketAddr*, addrlen: INT*) -> u64 extern def setsockopt(s: u64, level: INT, optname: INT, optval: t.CPtr, optlen: INT) -> INT extern def shutdown(s: u64, how: INT) -> INT -extern def gethostbyname(name: t.CChar | t.CConst | t.CPtr) -> WSAHostEnt | t.CPtr +extern def gethostbyname(name: char | t.CConst*) -> WSAHostEnt* extern def ntohs(netshort: u16) -> u16 extern def htons(hostshort: u16) -> u16 -extern def inet_addr(cp: t.CChar | t.CConst | t.CPtr) -> u32 \ No newline at end of file +extern def inet_addr(cp: char | t.CConst*) -> u32 \ No newline at end of file diff --git a/zlib/pyzlib.vp b/zlib/pyzlib.vp index 46274dc..dd43950 100644 --- a/zlib/pyzlib.vp +++ b/zlib/pyzlib.vp @@ -17,51 +17,51 @@ import t, c # ============================================================ # Compression levels -Z_NO_COMPRESSION: t.CDefine = 0 -Z_BEST_SPEED: t.CDefine = 1 -Z_BEST_COMPRESSION: t.CDefine = 9 -Z_DEFAULT_COMPRESSION: t.CDefine = (-1) +define Z_NO_COMPRESSION = 0 +define Z_BEST_SPEED = 1 +define Z_BEST_COMPRESSION = 9 +define Z_DEFAULT_COMPRESSION = (-1) # Compression methods -DEFLATED: t.CDefine = 8 +define DEFLATED = 8 # Flush modes -Z_NO_FLUSH: t.CDefine = 0 -Z_PARTIAL_FLUSH: t.CDefine = 1 -Z_SYNC_FLUSH: t.CDefine = 2 -Z_FULL_FLUSH: t.CDefine = 3 -Z_FINISH: t.CDefine = 4 -Z_BLOCK: t.CDefine = 5 -Z_TREES: t.CDefine = 6 +define Z_NO_FLUSH = 0 +define Z_PARTIAL_FLUSH = 1 +define Z_SYNC_FLUSH = 2 +define Z_FULL_FLUSH = 3 +define Z_FINISH = 4 +define Z_BLOCK = 5 +define Z_TREES = 6 # Strategies -Z_DEFAULT_STRATEGY: t.CDefine = 0 -Z_FILTERED: t.CDefine = 1 -Z_HUFFMAN_ONLY: t.CDefine = 2 -Z_RLE: t.CDefine = 3 -Z_FIXED: t.CDefine = 4 +define Z_DEFAULT_STRATEGY = 0 +define Z_FILTERED = 1 +define Z_HUFFMAN_ONLY = 2 +define Z_RLE = 3 +define Z_FIXED = 4 # Return codes -Z_OK: t.CDefine = 0 -Z_STREAM_END: t.CDefine = 1 -Z_NEED_DICT: t.CDefine = 2 -Z_ERRNO: t.CDefine = (-1) -Z_STREAM_ERROR: t.CDefine = (-2) -Z_DATA_ERROR: t.CDefine = (-3) -Z_MEM_ERROR: t.CDefine = (-4) -Z_BUF_ERROR: t.CDefine = (-5) -Z_VERSION_ERROR: t.CDefine = (-6) +define Z_OK = 0 +define Z_STREAM_END = 1 +define Z_NEED_DICT = 2 +define Z_ERRNO = (-1) +define Z_STREAM_ERROR = (-2) +define Z_DATA_ERROR = (-3) +define Z_MEM_ERROR = (-4) +define Z_BUF_ERROR = (-5) +define Z_VERSION_ERROR = (-6) # Window / Buffer constants -MAX_WBITS: t.CDefine = 15 -DEF_BUF_SIZE: t.CDefine = 16384 -DEF_MEM_LEVEL: t.CDefine = 8 +define MAX_WBITS = 15 +define DEF_BUF_SIZE = 16384 +define DEF_MEM_LEVEL = 8 # Version -ZLIB_VERSION: t.CDefine = "1.3.2" +define ZLIB_VERSION = "1.3.2" pyzlib_error_msg: t.CArray[char, 512] = "" -pyzlib_error_code_val: t.CInt = 0 +pyzlib_error_code_val: int = 0 # ============================================================ # Structures @@ -69,20 +69,20 @@ pyzlib_error_code_val: t.CInt = 0 class Compress: pool: rawptr[memhub.MemManager] stream: VOIDPTR - is_initialized: t.CInt - is_finished: t.CInt - level: t.CInt - method: t.CInt - wbits: t.CInt - memLevel: t.CInt - strategy: t.CInt + is_initialized: int + is_finished: int + level: int + method: int + wbits: int + memLevel: int + strategy: int zdict: BYTEPTR zdict_len: sizet last_pos: sizet input_buf: BYTEPTR input_buf_len: sizet input_buf_cap: sizet - header_written: t.CInt + header_written: int def compress(self, data: BYTEPTR, data_len: sizet, @@ -97,7 +97,7 @@ class Compress: set_error(Z_STREAM_ERROR, "out_len is None") return None if data_len == 0: - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -115,7 +115,7 @@ class Compress: self.pool.free(self.input_buf) if not new_buf: set_error(Z_MEM_ERROR, "out of memory") - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -125,7 +125,7 @@ class Compress: self.input_buf = new_buf string.memcpy(self.input_buf + self.input_buf_len, data, data_len) self.input_buf_len += data_len - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -133,7 +133,7 @@ class Compress: string.memset(p3, 0, 1) return p3 - def flush(self, mode: t.CInt, out_len: sizet*) -> BYTEPTR: + def flush(self, mode: int, out_len: sizet*) -> BYTEPTR: if not self.is_initialized: set_error(Z_STREAM_ERROR, "compress object not initialized") return None @@ -151,14 +151,14 @@ class Compress: s.writer.write_bits(1, 2) lit_tree = zhuff.zhuff_tree() lit_tree.build_fixed_lit_tree() - lit_tree.encode_symbol(256, c.Addr(s.writer)) + lit_tree.encode_symbol(256, &s.writer) else: s.adler = zchecksum.zchecksum_adler32(input_data, input_len, 1) s.compress_block(input_data, input_len, 1) s.is_finished = 1 if s.wbits >= 0: s.writer.align() - adler: t.CUInt32T = s.adler + adler: uint32 = s.adler s.writer.buf[s.writer.byte_pos + 0] = (adler >> 24) & 0xFF s.writer.buf[s.writer.byte_pos + 1] = (adler >> 16) & 0xFF s.writer.buf[s.writer.byte_pos + 2] = (adler >> 8) & 0xFF @@ -171,7 +171,7 @@ class Compress: else: result: BYTEPTR = BYTEPTR(self.pool.alloc(total)) if result: string.memcpy(result, s.writer.buf, total) - c.Set(c.Deref(out_len), total) + c.Set(*out_len, total) if self.pool == None: stdlib.free(self.input_buf) else: @@ -195,7 +195,7 @@ class Compress: delta: sizet = total - prev_pos self.last_pos = s.writer.byte_pos if delta == 0: - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -208,9 +208,9 @@ class Compress: else: result: BYTEPTR = BYTEPTR(self.pool.alloc(delta)) if result: string.memcpy(result, s.writer.buf + prev_pos, delta) - c.Set(c.Deref(out_len), delta) + c.Set(*out_len, delta) return result - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -218,14 +218,14 @@ class Compress: string.memset(p5, 0, 1) return p5 - def copy(self) -> Compress | t.CPtr: + def copy(self) -> Compress*: if not self.is_initialized: set_error(Z_STREAM_ERROR, "compress object not initialized") return None if self.pool == None: - copy_obj: Compress | t.CPtr = stdlib.calloc(1, Compress.__sizeof__()) + copy_obj: Compress* = stdlib.calloc(1, Compress.__sizeof__()) else: - copy_obj: Compress | t.CPtr = self.pool.alloc(Compress.__sizeof__()) + copy_obj: Compress* = self.pool.alloc(Compress.__sizeof__()) string.memset(copy_obj, 0, Compress.__sizeof__()) if not copy_obj: set_error(Z_MEM_ERROR, "out of memory") @@ -292,9 +292,9 @@ class Compress: class Decompress: pool: rawptr[memhub.MemManager] stream: VOIDPTR - is_initialized: t.CInt - eof: t.CInt - wbits: t.CInt + is_initialized: int + eof: int + wbits: int zdict: BYTEPTR zdict_len: sizet _unused_data: BYTEPTR @@ -317,9 +317,9 @@ class Decompress: return None if self.eof: if data and data_len > 0: - append_bytes(self.pool, c.Addr(self._unused_data), c.Addr(self._unused_data_len), - c.Addr(self._unused_data_cap), data, data_len) - c.Set(c.Deref(out_len), 0) + append_bytes(self.pool, &self._unused_data, &self._unused_data_len, + &self._unused_data_cap, data, data_len) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -328,10 +328,10 @@ class Decompress: return p6 self._unconsumed_tail_len = 0 if data and data_len > 0: - append_bytes(self.pool, c.Addr(self.input_buf), c.Addr(self.input_buf_len), - c.Addr(self.input_buf_cap), data, data_len) + append_bytes(self.pool, &self.input_buf, &self.input_buf_len, + &self.input_buf_cap, data, data_len) if self.input_buf_len == 0: - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -344,9 +344,9 @@ class Decompress: return None if self.zdict and self.zdict_len > 0: s.set_dictionary(self.zdict, self.zdict_len) - out: t.CUInt8T | t.CPtr = None - err: t.CInt = s.decompress(self.input_buf, self.input_buf_len, - max_length, c.Addr(out), out_len) + out: uint8* = None + err: int = s.decompress(self.input_buf, self.input_buf_len, + max_length, &out, out_len) if err != 0: s.destroy() set_error(Z_DATA_ERROR, "decompression failed") @@ -354,8 +354,8 @@ class Decompress: if s.is_finished: self.eof = 1 if s.input_pos < s.input_len: - append_bytes(self.pool, c.Addr(self._unused_data), c.Addr(self._unused_data_len), - c.Addr(self._unused_data_cap), + append_bytes(self.pool, &self._unused_data, &self._unused_data_len, + &self._unused_data_cap, s.input_data + s.input_pos, s.input_len - s.input_pos) self.input_buf_len = 0 @@ -377,7 +377,7 @@ class Decompress: if not out_len: set_error(Z_STREAM_ERROR, "out_len is None") return None - c.Set(c.Deref(out_len), 0) + c.Set(*out_len, 0) if self.pool == None: return BYTEPTR(stdlib.calloc(1, 1)) else: @@ -385,14 +385,14 @@ class Decompress: string.memset(p8, 0, 1) return p8 - def copy(self) -> Decompress | t.CPtr: + def copy(self) -> Decompress*: if not self.is_initialized: set_error(Z_STREAM_ERROR, "decompress object not initialized") return None if self.pool == None: - copy_obj: Decompress | t.CPtr = stdlib.calloc(1, Decompress.__sizeof__()) + copy_obj: Decompress* = stdlib.calloc(1, Decompress.__sizeof__()) else: - copy_obj: Decompress | t.CPtr = self.pool.alloc(Decompress.__sizeof__()) + copy_obj: Decompress* = self.pool.alloc(Decompress.__sizeof__()) string.memset(copy_obj, 0, Decompress.__sizeof__()) if not copy_obj: set_error(Z_MEM_ERROR, "out of memory") @@ -446,7 +446,7 @@ class Decompress: # c.Set(c.Deref(length), 0) # return None if length: - c.Set(c.Deref(length), self._unused_data_len) + c.Set(*length, self._unused_data_len) return self._unused_data def unconsumed_tail(self, length: sizet*) -> BYTEPTR: @@ -455,7 +455,7 @@ class Decompress: # c.Set(c.Deref(length), 0) # return None if length: - c.Set(c.Deref(length), self._unconsumed_tail_len) + c.Set(*length, self._unconsumed_tail_len) return self._unconsumed_tail # def eof(self) -> t.CInt: @@ -486,25 +486,25 @@ def clone_bytes(pool: rawptr[memhub.MemManager], src: BYTEPTR, length: sizet) -> # `t.CPtr[...]` 下标时声明侧（StubGen/VpiReader）不认作 CPtr 标记，会坍缩成 # 首段 BYTE = i8，与定义侧 i8** 不一致（跨模块调用即 ABI 错位，见 # includes/zlib/zinflate.vp decompress 处说明）。改用"指针别名 | t.CPtr"。 -def append_bytes(pool: rawptr[memhub.MemManager], buf: BYTEPTR | t.CPtr, length: sizet*, cap: sizet*, - data: BYTEPTR, data_len: sizet) -> t.CInt: +def append_bytes(pool: rawptr[memhub.MemManager], buf: BYTEPTR*, length: sizet*, cap: sizet*, + data: BYTEPTR, data_len: sizet) -> int: if not data or data_len == 0: return 0 - needed: sizet = c.Deref(length) + data_len - if needed > c.Deref(cap): - new_cap: sizet = c.Deref(cap) * 2 + needed: sizet = *length + data_len + if needed > *cap: + new_cap: sizet = *cap * 2 if new_cap < needed: new_cap = needed if pool == None: - new_buf: BYTEPTR = BYTEPTR(stdlib.realloc(c.Deref(buf), new_cap)) + new_buf: BYTEPTR = BYTEPTR(stdlib.realloc(*buf, new_cap)) else: new_buf: BYTEPTR = BYTEPTR(pool.alloc(new_cap)) if new_buf: - string.memcpy(new_buf, c.Deref(buf), c.Deref(length)) - pool.free(c.Deref(buf)) + string.memcpy(new_buf, *buf, *length) + pool.free(*buf) if not new_buf: return -1 - c.Set(c.Deref(buf), new_buf) - c.Set(c.Deref(cap), new_cap) - string.memcpy(c.Deref(buf) + c.Deref(length), data, data_len) - c.Set(c.Deref(length), c.Deref(length) + data_len) + c.Set(*buf, new_buf) + c.Set(*cap, new_cap) + string.memcpy(*buf + *length, data, data_len) + c.Set(*length, *length + data_len) return 0 @@ -536,7 +536,7 @@ def runtime_version() -> str: def get_error() -> str: return pyzlib_error_msg -def get_error_code() -> t.CInt: +def get_error_code() -> int: return pyzlib_error_code_val def clear_error(): @@ -545,14 +545,14 @@ def clear_error(): pyzlib_error_code_val = 0 def compress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, - level: t.CInt, wbits: t.CInt, out_len: sizet*) -> BYTEPTR: + level: int, wbits: int, out_len: sizet*) -> BYTEPTR: if not data and data_len > 0: set_error(Z_STREAM_ERROR, "data is None but data_len > 0") return None if not out_len: set_error(Z_STREAM_ERROR, "out_len is None") return None - actual_wbits: t.CInt = wbits + actual_wbits: int = wbits if wbits > MAX_WBITS: actual_wbits = -MAX_WBITS raw_result: UINT8PTR = zdeflate.zdeflate_one_shot(pool, data, data_len, level, actual_wbits, out_len) @@ -560,7 +560,7 @@ def compress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, set_error(Z_DATA_ERROR, "compression failed") return None if wbits > MAX_WBITS: - gzip_len: sizet = 10 + c.Deref(out_len) + 8 + gzip_len: sizet = 10 + *out_len + 8 if pool == None: gzip_buf: BYTEPTR = BYTEPTR(stdlib.malloc(gzip_len)) else: @@ -585,14 +585,14 @@ def compress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, gzip_buf[pos + 9] = 0xFF pos += 10 - string.memcpy(gzip_buf + pos, raw_result, c.Deref(out_len)) - pos += c.Deref(out_len) + string.memcpy(gzip_buf + pos, raw_result, *out_len) + pos += *out_len if pool == None: stdlib.free(raw_result) else: pool.free(raw_result) - crc: t.CUInt32T = zchecksum.zchecksum_crc32(data, data_len, 0) + crc: uint32 = zchecksum.zchecksum_crc32(data, data_len, 0) gzip_buf[pos + 0] = (crc) & 0xFF gzip_buf[pos + 1] = (crc >> 8) & 0xFF gzip_buf[pos + 2] = (crc >> 16) & 0xFF @@ -602,13 +602,13 @@ def compress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, gzip_buf[pos + 6] = (data_len >> 16) & 0xFF gzip_buf[pos + 7] = (data_len >> 24) & 0xFF pos += 8 - c.Set(c.Deref(out_len), pos) + c.Set(*out_len, pos) return shrink_to_fit(pool, gzip_buf, pos) - return shrink_to_fit(pool, raw_result, c.Deref(out_len)) + return shrink_to_fit(pool, raw_result, *out_len) def decompress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, - wbits: t.CInt, bufsize: sizet, out_len: sizet*) -> BYTEPTR: + wbits: int, bufsize: sizet, out_len: sizet*) -> BYTEPTR: if not data and data_len > 0: set_error(Z_STREAM_ERROR, "data is None but data_len > 0") return None @@ -619,21 +619,21 @@ def decompress(pool: rawptr[memhub.MemManager], data: BYTEPTR, data_len: sizet, if not result: set_error(Z_DATA_ERROR, "decompression failed") return None - return shrink_to_fit(pool, result, c.Deref(out_len)) + return shrink_to_fit(pool, result, *out_len) -def compressobj(pool: rawptr[memhub.MemManager], level: t.CInt, method: t.CInt, wbits: t.CInt, - memLevel: t.CInt, strategy: t.CInt, - zdict: BYTEPTR, zdict_len: sizet) -> Compress | t.CPtr: +def compressobj(pool: rawptr[memhub.MemManager], level: int, method: int, wbits: int, + memLevel: int, strategy: int, + zdict: BYTEPTR, zdict_len: sizet) -> Compress*: if pool == None: - obj: Compress | t.CPtr = stdlib.calloc(1, Compress.__sizeof__()) + obj: Compress* = stdlib.calloc(1, Compress.__sizeof__()) else: - obj: Compress | t.CPtr = pool.alloc(Compress.__sizeof__()) + obj: Compress* = pool.alloc(Compress.__sizeof__()) string.memset(obj, 0, Compress.__sizeof__()) if not obj: set_error(Z_MEM_ERROR, "out of memory") return None obj.pool = pool - actual_wbits: t.CInt = wbits + actual_wbits: int = wbits if wbits > MAX_WBITS: actual_wbits = wbits - 16 s: rawptr[zdeflate.zdeflate_stream] = zdeflate.zdeflate_create(pool, level, actual_wbits, memLevel, strategy) if not s: @@ -665,17 +665,17 @@ def compressobj(pool: rawptr[memhub.MemManager], level: t.CInt, method: t.CInt, return obj -def decompressobj(pool: rawptr[memhub.MemManager], wbits: t.CInt, zdict: BYTEPTR, zdict_len: sizet) -> Decompress | t.CPtr: +def decompressobj(pool: rawptr[memhub.MemManager], wbits: int, zdict: BYTEPTR, zdict_len: sizet) -> Decompress*: if pool == None: - obj: Decompress | t.CPtr = stdlib.calloc(1, Decompress.__sizeof__()) + obj: Decompress* = stdlib.calloc(1, Decompress.__sizeof__()) else: - obj: Decompress | t.CPtr = pool.alloc(Decompress.__sizeof__()) + obj: Decompress* = pool.alloc(Decompress.__sizeof__()) string.memset(obj, 0, Decompress.__sizeof__()) if not obj: set_error(Z_MEM_ERROR, "out of memory") return None obj.pool = pool - actual_wbits: t.CInt = wbits + actual_wbits: int = wbits if wbits > MAX_WBITS: actual_wbits = wbits - 16 obj.stream = None obj.is_initialized = 1 @@ -692,8 +692,8 @@ def decompressobj(pool: rawptr[memhub.MemManager], wbits: t.CInt, zdict: BYTEPTR obj.input_buf_len = 0 return obj -def zlib_adler32(data: BYTEPTR, length: sizet, value: t.CUnsignedLong) -> t.CUnsignedLong: +def zlib_adler32(data: BYTEPTR, length: sizet, value: uint32) -> uint32: return zchecksum.zchecksum_adler32(data, length, UINT32(value)) -def zlib_crc32(data: BYTEPTR, length: sizet, value: t.CUnsignedLong) -> t.CUnsignedLong: +def zlib_crc32(data: BYTEPTR, length: sizet, value: uint32) -> uint32: return zchecksum.zchecksum_crc32(data, length, UINT32(value)) diff --git a/zlib/zchecksum.vp b/zlib/zchecksum.vp index 39730fc..9e75813 100644 --- a/zlib/zchecksum.vp +++ b/zlib/zchecksum.vp @@ -2,9 +2,9 @@ from stdint import * import t, c -def zchecksum_adler32(data: UINT8PTR, length: sizet, init: UINT32) -> t.CUInt32T: - a: t.CUInt32T = (init >> 0) & 0xFFFF - b: t.CUInt32T = (init >> 16) & 0xFFFF +def zchecksum_adler32(data: UINT8PTR, length: sizet, init: UINT32) -> uint32: + a: uint32 = (init >> 0) & 0xFFFF + b: uint32 = (init >> 16) & 0xFFFF if not data or length == 0: return init i: sizet @@ -13,7 +13,7 @@ def zchecksum_adler32(data: UINT8PTR, length: sizet, init: UINT32) -> t.CUInt32T b = (b + a) % 65521 return (b << 16) | a -crc32_table: t.CArray[t.CUInt32T, 256] = [ +crc32_table: t.CArray[uint32, 256] = [ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, @@ -80,8 +80,8 @@ crc32_table: t.CArray[t.CUInt32T, 256] = [ 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D ] -def zchecksum_crc32(data: UINT8PTR, length: sizet, init: t.CUInt32T) -> t.CUInt32T: - crc: t.CUInt32T = init ^ 0xFFFFFFFF +def zchecksum_crc32(data: UINT8PTR, length: sizet, init: uint32) -> uint32: + crc: uint32 = init ^ 0xFFFFFFFF if not data or length == 0: return init i: sizet for i in range(length): diff --git a/zlib/zdef.vp b/zlib/zdef.vp index 9ce4869..bf66ee1 100644 --- a/zlib/zdef.vp +++ b/zlib/zdef.vp @@ -8,32 +8,32 @@ import t, c # ============================================================ # DEFLATE / zlib constants # ============================================================ -ZDEFLATE_WINDOW_BITS: t.CDefine = 15 -ZDEFLATE_WINDOW_SIZE: t.CDefine = (1 << ZDEFLATE_WINDOW_BITS) -ZDEFLATE_WINDOW_MASK: t.CDefine = (ZDEFLATE_WINDOW_SIZE - 1) +define ZDEFLATE_WINDOW_BITS = 15 +define ZDEFLATE_WINDOW_SIZE = (1 << ZDEFLATE_WINDOW_BITS) +define ZDEFLATE_WINDOW_MASK = (ZDEFLATE_WINDOW_SIZE - 1) -ZDEFLATE_MIN_MATCH: t.CDefine = 3 -ZDEFLATE_MAX_MATCH: t.CDefine = 258 +define ZDEFLATE_MIN_MATCH = 3 +define ZDEFLATE_MAX_MATCH = 258 -ZDEFLATE_HASH_BITS: t.CDefine = 15 -ZDEFLATE_HASH_SIZE: t.CDefine = (1 << ZDEFLATE_HASH_BITS) -ZDEFLATE_HASH_MASK: t.CDefine = (ZDEFLATE_HASH_SIZE - 1) +define ZDEFLATE_HASH_BITS = 15 +define ZDEFLATE_HASH_SIZE = (1 << ZDEFLATE_HASH_BITS) +define ZDEFLATE_HASH_MASK = (ZDEFLATE_HASH_SIZE - 1) -ZDEFLATE_MAX_CODES: t.CDefine = 288 -ZDEFLATE_MAX_DIST_CODES: t.CDefine = 32 -ZDEFLATE_MAX_BITS: t.CDefine = 15 -ZDEFLATE_MAX_CODELEN_CODES: t.CDefine = 19 +define ZDEFLATE_MAX_CODES = 288 +define ZDEFLATE_MAX_DIST_CODES = 32 +define ZDEFLATE_MAX_BITS = 15 +define ZDEFLATE_MAX_CODELEN_CODES = 19 -ZDEFLATE_LIT_COUNT: t.CDefine = 286 -ZDEFLATE_DIST_COUNT: t.CDefine = 30 +define ZDEFLATE_LIT_COUNT = 286 +define ZDEFLATE_DIST_COUNT = 30 -ZDEFLATE_LEN_SYMBOLS_BASE: t.CDefine = 257 -ZDEFLATE_END_OF_BLOCK: t.CDefine = 256 +define ZDEFLATE_LEN_SYMBOLS_BASE = 257 +define ZDEFLATE_END_OF_BLOCK = 256 # ============================================================ # Length / Distance extra bits tables (RFC 1951) # ============================================================ -zdeflate_len_extra_bits: t.CArray[t.CInt, 29] = [ +zdeflate_len_extra_bits: t.CArray[int, 29] = [ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, @@ -43,7 +43,7 @@ zdeflate_len_extra_bits: t.CArray[t.CInt, 29] = [ 0 ] -zdeflate_len_base: t.CArray[t.CInt, 29] = [ +zdeflate_len_base: t.CArray[int, 29] = [ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, @@ -53,7 +53,7 @@ zdeflate_len_base: t.CArray[t.CInt, 29] = [ 258 ] -zdeflate_dist_extra_bits: t.CArray[t.CInt, 30] = [ +zdeflate_dist_extra_bits: t.CArray[int, 30] = [ 0, 0, 0, 0, 1, 1, 2, 2, @@ -70,7 +70,7 @@ zdeflate_dist_extra_bits: t.CArray[t.CInt, 30] = [ 13, 13 ] -zdeflate_dist_base: t.CArray[t.CInt, 30] = [ +zdeflate_dist_base: t.CArray[int, 30] = [ 1, 2, 3, 4, 5, 7, 9, 13, @@ -96,10 +96,10 @@ zdeflate_codelen_order: t.CArray[int, 19] = [ # ============================================================ class zbit_writer: pool: rawptr[memhub.MemManager] - buf: BYTE | t.CPtr + buf: BYTE* cap: sizet byte_pos: sizet - bit_pos: t.CInt + bit_pos: int def __init__(self, pool: rawptr[memhub.MemManager]): self.pool = pool @@ -116,9 +116,9 @@ class zbit_writer: while self.byte_pos + need + 4 >= self.cap: new_cap: sizet = self.cap * 2 if self.pool == None: - new_buf: BYTE | t.CPtr = BYTEPTR(stdlib.realloc(self.buf, new_cap)) + new_buf: BYTE* = BYTEPTR(stdlib.realloc(self.buf, new_cap)) else: - new_buf: BYTE | t.CPtr = BYTEPTR(self.pool.alloc(new_cap)) + new_buf: BYTE* = BYTEPTR(self.pool.alloc(new_cap)) if new_buf: string.memcpy(new_buf, self.buf, self.byte_pos + (self.bit_pos + 7) / 8) self.pool.free(self.buf) @@ -127,7 +127,7 @@ class zbit_writer: self.buf = new_buf self.cap = new_cap - def write_bits(self, value: UINT, nbits: t.CInt): + def write_bits(self, value: UINT, nbits: int): self.ensure((nbits + 7) / 8 + 1) for i in range(nbits): if value & (UINT(1) << i): @@ -137,7 +137,7 @@ class zbit_writer: self.bit_pos = 0 self.byte_pos += 1 - def write_bits_rev(self, code: UINT, nbits: t.CInt): + def write_bits_rev(self, code: UINT, nbits: int): self.ensure((nbits + 7) / 8 + 1) for i in range(nbits - 1, -1, -1): if code & (UINT(1) << i): @@ -147,7 +147,7 @@ class zbit_writer: self.bit_pos = 0 self.byte_pos += 1 - def stored_block(self, data: UINT8PTR, length: sizet, final: t.CInt): + def stored_block(self, data: UINT8PTR, length: sizet, final: int): self.write_bits(1 if final else 0, 1) self.write_bits(0, 2) self.align() @@ -157,8 +157,8 @@ class zbit_writer: block_length: sizet = length - pos if block_length > 65535: block_length = 65535 - n: t.CUInt16T = t.CUInt16T(block_length) - ncomp: t.CUInt16T = ~n + n: uint16 = uint16(block_length) + ncomp: uint16 = ~n self.write_bits(n, 16) self.write_bits(ncomp, 16) @@ -173,18 +173,18 @@ class zbit_writer: self.write_bits(0, 2) self.align() - def write_zlib_header(self, wbits: t.CInt, level: t.CInt): - cinfo: t.CInt = wbits - 8 + def write_zlib_header(self, wbits: int, level: int): + cinfo: int = wbits - 8 if cinfo < 1: cinfo = 1 if cinfo > 7: cinfo = 7 - cmf: t.CUnsignedChar = t.CUnsignedChar((cinfo << 4) | 8) + cmf: uchar = uchar((cinfo << 4) | 8) - flevel: t.CInt = 0 + flevel: int = 0 if level >= 5: flevel = 3 elif level >= 3: flevel = 1 - flg: t.CUnsignedChar = t.CUnsignedChar(flevel << 6) - flg |= t.CUnsignedChar(31 - (cmf * 256 + flg) % 31) + flg: uchar = uchar(flevel << 6) + flg |= uchar(31 - (cmf * 256 + flg) % 31) self.buf[self.byte_pos + 0] = cmf self.buf[self.byte_pos + 1] = flg @@ -229,18 +229,18 @@ class zbit_writer: # Bit reader - reads bits LSB first from a byte buffer # ============================================================ class zbit_reader: - buf: BYTE | t.CPtr + buf: BYTE* length: sizet byte_pos: sizet - bit_pos: t.CInt + bit_pos: int - def init(self, buf: BYTE | t.CPtr, length: sizet): + def init(self, buf: BYTE*, length: sizet): self.buf = buf self.length = length self.byte_pos = 0 self.bit_pos = 0 - def read_bits(self, nbits: t.CInt, out: UINTPTR) -> t.CInt: + def read_bits(self, nbits: int, out: UINTPTR) -> int: val: UINT = 0 for i in range(nbits): if self.byte_pos >= self.length: return -1 @@ -250,10 +250,10 @@ class zbit_reader: if self.bit_pos == 8: self.bit_pos = 0 self.byte_pos += 1 - c.Set(c.Deref(out), val) + c.Set(*out, val) return 0 - def read_bits_rev(self, nbits: t.CInt, out: UINTPTR) -> t.CInt: + def read_bits_rev(self, nbits: int, out: UINTPTR) -> int: val: UINT = 0 for i in range(nbits - 1, 0, -1): if self.byte_pos >= self.length: return -1 @@ -263,7 +263,7 @@ class zbit_reader: if self.bit_pos == 8: self.bit_pos = 0 self.byte_pos += 1 - c.Set(c.Deref(out), val) + c.Set(*out, val) return 0 def align(self): diff --git a/zlib/zdeflate.vp b/zlib/zdeflate.vp index e3ef543..85bbce6 100644 --- a/zlib/zdeflate.vp +++ b/zlib/zdeflate.vp @@ -10,57 +10,57 @@ import t, c class zdeflate_stream: pool: rawptr[memhub.MemManager] writer: zdef.zbit_writer - window: BYTE | t.CPtr - window_pos: t.CInt - window_size: t.CInt - hash_head: t.CInt | t.CPtr - hash_prev: t.CInt | t.CPtr - level: t.CInt - strategy: t.CInt - wbits: t.CInt - is_finished: t.CInt - adler: t.CUInt32T + window: BYTE* + window_pos: int + window_size: int + hash_head: int* + hash_prev: int* + level: int + strategy: int + wbits: int + is_finished: int + adler: uint32 - def find_match(self, data: BYTE | t.CPtr, data_len: sizet, - pos: sizet, best_dist: t.CInt | t.CPtr) -> t.CInt: + def find_match(self, data: BYTE*, data_len: sizet, + pos: sizet, best_dist: int*) -> int: if pos + 2 >= data_len: return 0 - h: t.CUnsignedInt = zdeflate_hash(data + pos) - chain: t.CInt = self.hash_head[h] - best_len: t.CInt = zdef.ZDEFLATE_MIN_MATCH - 1 - c.Set(c.Deref(best_dist), 0) - max_chain: t.CInt = 128 if (self.level >= 5) else (32 if (self.level >= 2) else 4) - limit: t.CInt = (1 << self.wbits) if (self.wbits > 0) else zdef.ZDEFLATE_WINDOW_SIZE + h: uint = zdeflate_hash(data + pos) + chain: int = self.hash_head[h] + best_len: int = zdef.ZDEFLATE_MIN_MATCH - 1 + c.Set(*best_dist, 0) + max_chain: int = 128 if (self.level >= 5) else (32 if (self.level >= 2) else 4) + limit: int = (1 << self.wbits) if (self.wbits > 0) else zdef.ZDEFLATE_WINDOW_SIZE if limit > zdef.ZDEFLATE_WINDOW_SIZE: limit = zdef.ZDEFLATE_WINDOW_SIZE - attempts: t.CInt = 0 + attempts: int = 0 while chain >= 0 and attempts < max_chain: - dist: t.CInt = t.CInt(pos) - chain + dist: int = int(pos) - chain if dist <= 0 or dist > limit: break - match_len: t.CInt = 0 - max_len: t.CInt = t.CInt(data_len - pos) + match_len: int = 0 + max_len: int = int(data_len - pos) if max_len > zdef.ZDEFLATE_MAX_MATCH: max_len = zdef.ZDEFLATE_MAX_MATCH while match_len < max_len and data[pos + match_len] == data[chain + match_len]: match_len += 1 if match_len > best_len: best_len = match_len - c.Set(c.Deref(best_dist), dist) + c.Set(*best_dist, dist) if best_len >= zdef.ZDEFLATE_MAX_MATCH: break chain = self.hash_prev[chain & zdef.ZDEFLATE_WINDOW_MASK] - if chain <= t.CInt(pos) - limit: break + if chain <= int(pos) - limit: break attempts += 1 return best_len if (best_len >= zdef.ZDEFLATE_MIN_MATCH) else 0 - def update_hash(self, data: BYTE | t.CPtr, pos: sizet, data_len: sizet): + def update_hash(self, data: BYTE*, pos: sizet, data_len: sizet): # 只在还能作为匹配起点的位置维护 hash（pos+2 >= data_len 的尾部 # 字节不会再被 find_match 引用，且 zdeflate_hash 会读 pos..pos+2， # 越过末尾则越界——见 ASan heap-buffer-overflow） if pos + 2 >= data_len: return - h: t.CUnsignedInt = zdeflate_hash(data + pos) + h: uint = zdeflate_hash(data + pos) self.hash_prev[pos & zdef.ZDEFLATE_WINDOW_MASK] = self.hash_head[h] - self.hash_head[h] = t.CInt(pos) + self.hash_head[h] = int(pos) - def write_fixed_block(self, data: UINT8PTR, length: sizet, final: t.CInt): + def write_fixed_block(self, data: UINT8PTR, length: sizet, final: int): lit_tree = zhuff.zhuff_tree() dist_tree = zhuff.zhuff_tree() lit_tree.build_fixed_lit_tree() @@ -69,18 +69,18 @@ class zdeflate_stream: self.writer.write_bits(1, 2) pos: sizet = 0 while pos < length: - best_dist: t.CInt = 0 - match_len: t.CInt = 0 + best_dist: int = 0 + match_len: int = 0 if self.level > 0 and pos + 2 < length: - match_len = self.find_match(data, length, pos, c.Addr(best_dist)) + match_len = self.find_match(data, length, pos, &best_dist) if match_len >= zdef.ZDEFLATE_MIN_MATCH: - len_sym: t.CInt = zdeflate_len_to_symbol(match_len) - lit_tree.encode_symbol(len_sym, c.Addr(self.writer)) - extra: t.CInt = zdef.zdeflate_len_extra_bits[len_sym - 257] + len_sym: int = zdeflate_len_to_symbol(match_len) + lit_tree.encode_symbol(len_sym, &self.writer) + extra: int = zdef.zdeflate_len_extra_bits[len_sym - 257] if extra > 0: self.writer.write_bits(match_len - zdef.zdeflate_len_base[len_sym - 257], extra) - dist_sym: t.CInt = zdeflate_dist_to_symbol(best_dist) - dist_tree.encode_symbol(dist_sym, c.Addr(self.writer)) + dist_sym: int = zdeflate_dist_to_symbol(best_dist) + dist_tree.encode_symbol(dist_sym, &self.writer) extra = zdef.zdeflate_dist_extra_bits[dist_sym] if extra > 0: self.writer.write_bits(best_dist - zdef.zdeflate_dist_base[dist_sym], extra) @@ -88,27 +88,27 @@ class zdeflate_stream: self.update_hash(data, pos + i, length) pos += match_len else: - lit_tree.encode_symbol(data[pos], c.Addr(self.writer)) + lit_tree.encode_symbol(data[pos], &self.writer) self.update_hash(data, pos, length) pos += 1 - lit_tree.encode_symbol(256, c.Addr(self.writer)) + lit_tree.encode_symbol(256, &self.writer) def encode_block_data(self, data: UINT8PTR, length: sizet, lit_tree: rawptr[zhuff.zhuff_tree], dist_tree: rawptr[zhuff.zhuff_tree]): pos: sizet = 0 while pos < length: - best_dist: t.CInt = 0 - match_len: t.CInt = 0 + best_dist: int = 0 + match_len: int = 0 if self.level > 0 and pos + 2 < length: - match_len = self.find_match(data, length, pos, c.Addr(best_dist)) + match_len = self.find_match(data, length, pos, &best_dist) if match_len >= zdef.ZDEFLATE_MIN_MATCH: - len_sym: t.CInt = zdeflate_len_to_symbol(match_len) - lit_tree.encode_symbol(len_sym, c.Addr(self.writer)) - extra: t.CInt = zdef.zdeflate_len_extra_bits[len_sym - 257] + len_sym: int = zdeflate_len_to_symbol(match_len) + lit_tree.encode_symbol(len_sym, &self.writer) + extra: int = zdef.zdeflate_len_extra_bits[len_sym - 257] if extra > 0: self.writer.write_bits(match_len - zdef.zdeflate_len_base[len_sym - 257], extra) - dist_sym: t.CInt = zdeflate_dist_to_symbol(best_dist) - dist_tree.encode_symbol(dist_sym, c.Addr(self.writer)) + dist_sym: int = zdeflate_dist_to_symbol(best_dist) + dist_tree.encode_symbol(dist_sym, &self.writer) extra = zdef.zdeflate_dist_extra_bits[dist_sym] if extra > 0: self.writer.write_bits(best_dist - zdef.zdeflate_dist_base[dist_sym], extra) @@ -116,29 +116,29 @@ class zdeflate_stream: self.update_hash(data, pos + j, length) pos += match_len else: - lit_tree.encode_symbol(data[pos], c.Addr(self.writer)) + lit_tree.encode_symbol(data[pos], &self.writer) self.update_hash(data, pos, length) pos += 1 - lit_tree.encode_symbol(256, c.Addr(self.writer)) + lit_tree.encode_symbol(256, &self.writer) - def write_dynamic_block(self, data: UINT8PTR, length: sizet, final: t.CInt): - lit_freqs: t.CArray[t.CInt, 288] - dist_freqs: t.CArray[t.CInt, 32] + def write_dynamic_block(self, data: UINT8PTR, length: sizet, final: int): + lit_freqs: t.CArray[int, 288] + dist_freqs: t.CArray[int, 32] zdeflate_count_freqs(lit_freqs, dist_freqs, self, data, length) - hlit: t.CInt = 286 + hlit: int = 286 while hlit > 257 and lit_freqs[hlit - 1] == 0: hlit -= 1 - hdist: t.CInt = 30 + hdist: int = 30 while hdist > 1 and dist_freqs[hdist - 1] == 0: hdist -= 1 lit_tree = zhuff.zhuff_tree() dist_tree = zhuff.zhuff_tree() lit_tree.build_codes(lit_freqs, hlit, zdef.ZDEFLATE_MAX_BITS) dist_tree.build_codes(dist_freqs, hdist, zdef.ZDEFLATE_MAX_BITS) - all_lengths: t.CArray[t.CInt, 288 + 32] + all_lengths: t.CArray[int, 288 + 32] for i in range(hlit): all_lengths[i] = lit_tree.codes[i].bits for i in range(hdist): all_lengths[hlit + i] = dist_tree.codes[i].bits - total_lengths: t.CInt = hlit + hdist - cl_freqs: t.CArray[t.CInt, 19] + total_lengths: int = hlit + hdist + cl_freqs: t.CArray[int, 19] zdeflate_count_cl_freqs(all_lengths, total_lengths, cl_freqs) cl_tree = zhuff.zhuff_tree() cl_tree.build_codes(cl_freqs, 19, 7) @@ -151,10 +151,10 @@ class zdeflate_stream: self.writer.write_bits(hclen - 4, 4) for j in range(hclen): self.writer.write_bits(cl_tree.codes[zdef.zdeflate_codelen_order[j]].bits, 3) - zdeflate_write_cl_encoded(all_lengths, total_lengths, c.Addr(self.writer), c.Addr(cl_tree)) - self.encode_block_data(data, length, c.Addr(lit_tree), c.Addr(dist_tree)) + zdeflate_write_cl_encoded(all_lengths, total_lengths, &self.writer, &cl_tree) + self.encode_block_data(data, length, &lit_tree, &dist_tree) - def compress_block(self, data: UINT8PTR, length: sizet, final: t.CInt): + def compress_block(self, data: UINT8PTR, length: sizet, final: int): if self.level == 0: self.write_stored_block(data, length, final) elif self.strategy == 4 or length < 128: @@ -162,30 +162,30 @@ class zdeflate_stream: else: self.write_dynamic_block(data, length, final) - def write_stored_block(self, data: UINT8PTR, length: sizet, final: t.CInt): + def write_stored_block(self, data: UINT8PTR, length: sizet, final: int): self.writer.stored_block(data, length, final) # out 是"指针的指针"（i8**）：见 zinflate.vp decompress 处的说明—— # 联合里嵌 `t.CPtr[...]` 会让声明侧（VpiReader）坍缩成 i8，与定义侧 i8** 不一致。 def compress(self, data: UINT8PTR, length: sizet, - out: BYTEPTR | t.CPtr, out_len: sizet*) -> t.CInt: + out: BYTEPTR*, out_len: sizet*) -> int: if self.is_finished: return -2 if not data or length == 0: - c.Set(c.Deref(out), None) - c.Set(c.Deref(out_len), 0) + c.Set(*out, None) + c.Set(*out_len, 0) return 0 self.adler = zchecksum.zchecksum_adler32(data, length, self.adler) string.memset(self.hash_head, -1, zdef.ZDEFLATE_HASH_SIZE * int.__sizeof__()) string.memset(self.hash_prev, -1, zdef.ZDEFLATE_WINDOW_SIZE * int.__sizeof__()) self.compress_block(data, length, 0) - c.Set(c.Deref(out_len), self.writer.total()) - c.Set(c.Deref(out), UINT8PTR(zdef.zdef_alloc(self.pool, c.Deref(out_len)))) - if not c.Deref(out): return -4 - string.memcpy(c.Deref(out), self.writer.buf, c.Deref(out_len)) + c.Set(*out_len, self.writer.total()) + c.Set(*out, UINT8PTR(zdef.zdef_alloc(self.pool, *out_len))) + if not *out: return -4 + string.memcpy(*out, self.writer.buf, *out_len) return 0 # out 同 compress：i8**（声明侧/定义侧必须一致）。 - def flush(self, mode: t.CInt, out: BYTEPTR | t.CPtr, out_len: sizet*) -> t.CInt: + def flush(self, mode: int, out: BYTEPTR*, out_len: sizet*) -> int: if mode == 4: if not self.is_finished: if self.level == 0: @@ -197,11 +197,11 @@ class zdeflate_stream: lit_tree.build_fixed_lit_tree() self.writer.write_bits(1, 1) self.writer.write_bits(1, 2) - lit_tree.encode_symbol(256, c.Addr(self.writer)) + lit_tree.encode_symbol(256, &self.writer) self.is_finished = 1 if self.wbits >= 0: self.writer.align() - adler: t.CUInt32T = self.adler + adler: uint32 = self.adler self.writer.buf[self.writer.byte_pos + 0] = (adler >> 24) & 0xFF self.writer.buf[self.writer.byte_pos + 1] = (adler >> 16) & 0xFF self.writer.buf[self.writer.byte_pos + 2] = (adler >> 8) & 0xFF @@ -211,26 +211,26 @@ class zdeflate_stream: self.writer.write_bits(0, 1) self.writer.write_bits(0, 2) self.writer.align() - c.Set(c.Deref(out_len), self.writer.total()) - c.Set(c.Deref(out), UINT8PTR(zdef.zdef_alloc(self.pool, c.Deref(out_len)))) - if not c.Deref(out): return -4 - string.memcpy(c.Deref(out), self.writer.buf, c.Deref(out_len)) + c.Set(*out_len, self.writer.total()) + c.Set(*out, UINT8PTR(zdef.zdef_alloc(self.pool, *out_len))) + if not *out: return -4 + string.memcpy(*out, self.writer.buf, *out_len) return 0 - def set_dictionary(self, dict: UINT8PTR, length: sizet) -> t.CInt: + def set_dictionary(self, dict: UINT8PTR, length: sizet) -> int: if not dict: return -2 use: sizet = length if use > zdef.ZDEFLATE_WINDOW_SIZE: dict += length - zdef.ZDEFLATE_WINDOW_SIZE use = zdef.ZDEFLATE_WINDOW_SIZE string.memcpy(self.window, dict, use) - self.window_size = t.CInt(use) - self.window_pos = t.CInt(use) + self.window_size = int(use) + self.window_pos = int(use) self.adler = zchecksum.zchecksum_adler32(dict, length, self.adler) return 0 - def copy(self) -> zdeflate_stream | t.CPtr: - z: zdeflate_stream | t.CPtr = zdef.zdef_alloc(self.pool, zdeflate_stream.__sizeof__()) + def copy(self) -> zdeflate_stream*: + z: zdeflate_stream* = zdef.zdef_alloc(self.pool, zdeflate_stream.__sizeof__()) if not z: return None string.memcpy(z, self, zdeflate_stream.__sizeof__()) z.writer.buf = BYTEPTR(zdef.zdef_alloc(self.pool, self.writer.cap)) @@ -261,17 +261,17 @@ class zdeflate_stream: def zdeflate_count_freqs(lit_freqs: INTPTR, dist_freqs: INTPTR, - s: zdeflate_stream | t.CPtr, data: UINT8PTR, length: sizet): + s: zdeflate_stream*, data: UINT8PTR, length: sizet): string.memset(lit_freqs, 0, 288 * int.__sizeof__()) string.memset(dist_freqs, 0, 32 * int.__sizeof__()) pos: sizet = 0 while pos < length: - best_dist: t.CInt = 0 - match_len: t.CInt = 0 + best_dist: int = 0 + match_len: int = 0 if s.level > 0 and pos + 2 < length: - match_len = zdeflate_stream.find_match(s, data, length, pos, c.Addr(best_dist)) + match_len = zdeflate_stream.find_match(s, data, length, pos, &best_dist) if match_len >= zdef.ZDEFLATE_MIN_MATCH: - len_sym: t.CInt = zdeflate_len_to_symbol(match_len) + len_sym: int = zdeflate_len_to_symbol(match_len) lit_freqs[len_sym] += 1 dist_freqs[zdeflate_dist_to_symbol(best_dist)] += 1 for i in range(match_len): @@ -285,37 +285,37 @@ def zdeflate_count_freqs(lit_freqs: INTPTR, dist_freqs: INTPTR, -def zdeflate_hash(p: BYTE | t.CPtr) -> t.CUnsignedInt: - return (t.CUnsignedInt(p[0]) ^ (t.CUnsignedInt(p[1]) << 5) ^ (t.CUnsignedInt(p[2]) << 10)) & zdef.ZDEFLATE_HASH_MASK +def zdeflate_hash(p: BYTE*) -> uint: + return (uint(p[0]) ^ (uint(p[1]) << 5) ^ (uint(p[2]) << 10)) & zdef.ZDEFLATE_HASH_MASK -def zdeflate_len_to_symbol(length: t.CInt) -> t.CInt: +def zdeflate_len_to_symbol(length: int) -> int: for i in range(29): if length <= zdef.zdeflate_len_base[i] + (1 << zdef.zdeflate_len_extra_bits[i]) - 1: return 257 + i return 285 -def zdeflate_dist_to_symbol(dist: t.CInt) -> t.CInt: +def zdeflate_dist_to_symbol(dist: int) -> int: for i in range(30): if dist <= zdef.zdeflate_dist_base[i] + (1 << zdef.zdeflate_dist_extra_bits[i]) - 1: return i return 29 -def zdeflate_count_cl_freqs(all_lengths: INTPTR, total: t.CInt, cl_freqs: INTPTR): +def zdeflate_count_cl_freqs(all_lengths: INTPTR, total: int, cl_freqs: INTPTR): string.memset(cl_freqs, 0, 19 * int.__sizeof__()) - i: t.CInt = 0 + i: int = 0 while i < total: if all_lengths[i] == 0: - run: t.CInt = 0 + run: int = 0 while i + run < total and all_lengths[i + run] == 0: run += 1 while run > 0: if run >= 11: - count: t.CInt = run + count: int = run if count > 138: count = 138 cl_freqs[18] += 1 run -= count elif run >= 3: - count: t.CInt = run + count: int = run if count > 10: count = 10 cl_freqs[17] += 1 run -= count @@ -325,12 +325,12 @@ def zdeflate_count_cl_freqs(all_lengths: INTPTR, total: t.CInt, cl_freqs: INTPTR while i < total and all_lengths[i] == 0: i += 1 else: cl_freqs[all_lengths[i]] += 1 - val: t.CInt = all_lengths[i] + val: int = all_lengths[i] i += 1 - run: t.CInt = 0 + run: int = 0 while i + run < total and all_lengths[i + run] == val: run += 1 while run >= 3: - count: t.CInt = run + count: int = run if count > 6: count = 6 cl_freqs[16] += 1 run -= count @@ -338,22 +338,22 @@ def zdeflate_count_cl_freqs(all_lengths: INTPTR, total: t.CInt, cl_freqs: INTPTR # 剩余的 1~2 个相同长度值不静默跳过，交由外层循环 # 按字面量（符号 val）逐个统计，保证总覆盖数恰为 total -def zdeflate_write_cl_encoded(all_lengths: INTPTR, total: t.CInt, +def zdeflate_write_cl_encoded(all_lengths: INTPTR, total: int, w: rawptr[zdef.zbit_writer], cl_tree: rawptr[zhuff.zhuff_tree]): - i: t.CInt = 0 + i: int = 0 while i < total: if all_lengths[i] == 0: - run: t.CInt = 0 + run: int = 0 while i + run < total and all_lengths[i + run] == 0: run += 1 while run > 0: if run >= 11: - count: t.CInt = run + count: int = run if count > 138: count = 138 cl_tree.encode_symbol(18, w) w.write_bits(count - 11, 7) run -= count elif run >= 3: - count: t.CInt = run + count: int = run if count > 10: count = 10 cl_tree.encode_symbol(17, w) w.write_bits(count - 3, 3) @@ -364,12 +364,12 @@ def zdeflate_write_cl_encoded(all_lengths: INTPTR, total: t.CInt, while i < total and all_lengths[i] == 0: i += 1 else: cl_tree.encode_symbol(all_lengths[i], w) - val: t.CInt = all_lengths[i] + val: int = all_lengths[i] i += 1 - run: t.CInt = 0 + run: int = 0 while i + run < total and all_lengths[i + run] == val: run += 1 while run >= 3: - count: t.CInt = run + count: int = run if count > 6: count = 6 cl_tree.encode_symbol(16, w) w.write_bits(count - 3, 2) @@ -380,9 +380,9 @@ def zdeflate_write_cl_encoded(all_lengths: INTPTR, total: t.CInt, -def zdeflate_create(pool: rawptr[memhub.MemManager], level: t.CInt, wbits: t.CInt, mem_level: t.CInt, strategy: t.CInt) -> zdeflate_stream | t.CPtr: +def zdeflate_create(pool: rawptr[memhub.MemManager], level: int, wbits: int, mem_level: int, strategy: int) -> zdeflate_stream*: n: sizet = zdeflate_stream.__sizeof__() - s: zdeflate_stream | t.CPtr = zdef.zdef_alloc(pool, n) + s: zdeflate_stream* = zdef.zdef_alloc(pool, n) if not s: return None string.memset(s, 0, zdeflate_stream.__sizeof__()) s.pool = pool @@ -408,8 +408,8 @@ def zdeflate_create(pool: rawptr[memhub.MemManager], level: t.CInt, wbits: t.CIn def zdeflate_one_shot(pool: rawptr[memhub.MemManager], data: UINT8PTR, length: sizet, - level: t.CInt, wbits: t.CInt, out_len: sizet*) -> t.CUInt8T | t.CPtr: - s: zdeflate_stream | t.CPtr = zdeflate_create(pool, level, wbits, 8, 0) + level: int, wbits: int, out_len: sizet*) -> uint8*: + s: zdeflate_stream* = zdeflate_create(pool, level, wbits, 8, 0) if not s: return None string.memset(s.hash_head, -1, zdef.ZDEFLATE_HASH_SIZE * int.__sizeof__()) @@ -422,7 +422,7 @@ def zdeflate_one_shot(pool: rawptr[memhub.MemManager], data: UINT8PTR, length: s s.writer.write_bits(1, 2) lit_tree = zhuff.zhuff_tree() lit_tree.build_fixed_lit_tree() - lit_tree.encode_symbol(256, c.Addr(s.writer)) + lit_tree.encode_symbol(256, &s.writer) else: s.compress_block(data, length, 1) @@ -430,14 +430,14 @@ def zdeflate_one_shot(pool: rawptr[memhub.MemManager], data: UINT8PTR, length: s if wbits >= 0: s.writer.align() - adler: t.CUInt32T = s.adler + adler: uint32 = s.adler s.writer.buf[s.writer.byte_pos + 0] = (adler >> 24) & 0xFF s.writer.buf[s.writer.byte_pos + 1] = (adler >> 16) & 0xFF s.writer.buf[s.writer.byte_pos + 2] = (adler >> 8) & 0xFF s.writer.buf[s.writer.byte_pos + 3] = (adler >> 0) & 0xFF s.writer.byte_pos += 4 - c.Set(c.Deref(out_len), s.writer.total()) - result: UINT8PTR = UINT8PTR(zdef.zdef_alloc(pool, c.Deref(out_len))) - if result: string.memcpy(result, s.writer.buf, c.Deref(out_len)) + c.Set(*out_len, s.writer.total()) + result: UINT8PTR = UINT8PTR(zdef.zdef_alloc(pool, *out_len)) + if result: string.memcpy(result, s.writer.buf, *out_len) s.destroy() return result diff --git a/zlib/zhuff.vp b/zlib/zhuff.vp index 65ebd11..d21f32c 100644 --- a/zlib/zhuff.vp +++ b/zlib/zhuff.vp @@ -6,26 +6,26 @@ import memhub import t, c -ZHUFF_MAX_CODES: t.CDefine = 288 -ZHUFF_MAX_BITS: t.CDefine = 15 +define ZHUFF_MAX_CODES = 288 +define ZHUFF_MAX_BITS = 15 class zhuff_code: code: UINT - bits: t.CInt + bits: int @t.Object class zhuff_tree: pool: rawptr[memhub.MemManager] codes: t.CArray[zhuff_code, ZHUFF_MAX_CODES] - count: t.CInt - max_bits: t.CInt + count: int + max_bits: int def __init__(self): self.pool = None - def build_codes(self, freqs: INTPTR, count: t.CInt, max_bits: t.CInt): - lengths: t.CArray[t.CInt, ZHUFF_MAX_CODES] - bl_count: t.CArray[t.CInt, ZHUFF_MAX_BITS + 1] + def build_codes(self, freqs: INTPTR, count: int, max_bits: int): + lengths: t.CArray[int, ZHUFF_MAX_CODES] + bl_count: t.CArray[int, ZHUFF_MAX_BITS + 1] next_code: t.CArray[UINT, ZHUFF_MAX_BITS + 1] self.count = count self.max_bits = max_bits @@ -34,7 +34,7 @@ class zhuff_tree: for i in range(count): if lengths[i] > 0: bl_count[lengths[i]] += 1 - code: t.CUnsignedInt = 0 + code: uint = 0 next_code[0] = 0 for bits in range(1, max_bits + 1): code = (code + bl_count[bits - 1]) << 1 @@ -48,15 +48,15 @@ class zhuff_tree: self.codes[i].code = 0 def build_fixed_lit_tree(self): - lengths: t.CArray[t.CInt, 288] - bl_count: t.CArray[t.CInt, 16] - next_code: t.CArray[t.CUnsignedInt, 16] + lengths: t.CArray[int, 288] + bl_count: t.CArray[int, 16] + next_code: t.CArray[uint, 16] self.get_fixed_lit_lengths(lengths) string.memset(bl_count, 0, bl_count.__sizeof__()) for i in range(288): if lengths[i] > 0: bl_count[lengths[i]] += 1 - code: t.CUnsignedInt = 0 + code: uint = 0 next_code[0] = 0 for bits in range(1, 9 + 1): code = (code + bl_count[bits - 1]) << 1 @@ -72,15 +72,15 @@ class zhuff_tree: self.codes[i].code = 0 def build_fixed_dist_tree(self): - lengths: t.CArray[t.CInt, 32] - bl_count: t.CArray[t.CInt, 16] - next_code: t.CArray[t.CUnsignedInt, 16] + lengths: t.CArray[int, 32] + bl_count: t.CArray[int, 16] + next_code: t.CArray[uint, 16] self.get_fixed_dist_lengths(lengths) string.memset(bl_count, 0, bl_count.__sizeof__()) for i in range(32): if lengths[i] > 0: bl_count[lengths[i]] += 1 - code: t.CUnsignedInt = 0 + code: uint = 0 next_code[0] = 0 for bits in range(1, 5 + 1): code = (code + bl_count[bits - 1]) << 1 @@ -103,9 +103,9 @@ class zhuff_tree: writer.write_bits_rev(self.codes[symbol].code, self.codes[symbol].bits) - def build_code_lengths(self, lengths: t.CInt | t.CPtr, freqs: t.CInt | t.CPtr, count: t.CInt, max_bits: t.CInt): - bl_count: t.CArray[t.CInt, ZHUFF_MAX_BITS + 2] - sort_count: t.CInt = 0 + def build_code_lengths(self, lengths: int*, freqs: int*, count: int, max_bits: int): + bl_count: t.CArray[int, ZHUFF_MAX_BITS + 2] + sort_count: int = 0 string.memset(bl_count, 0, bl_count.__sizeof__()) string.memset(lengths, 0, int.__sizeof__() * count) for i in range(count): @@ -117,18 +117,18 @@ class zhuff_tree: if freqs[i] > 0: lengths[i] = 1 return - items: t.CInt | t.CPtr = INTPTR(zdef.zdef_alloc(self.pool, sort_count * int.__sizeof__())) - item_freqs: t.CInt | t.CPtr = INTPTR(zdef.zdef_alloc(self.pool, sort_count * int.__sizeof__())) - idx: t.CInt = 0 + items: int* = INTPTR(zdef.zdef_alloc(self.pool, sort_count * int.__sizeof__())) + item_freqs: int* = INTPTR(zdef.zdef_alloc(self.pool, sort_count * int.__sizeof__())) + idx: int = 0 for i in range(count): if freqs[i] > 0: items[idx] = i item_freqs[idx] = freqs[i] idx += 1 for i in range(sort_count): - key_item: t.CInt = items[i] - key_freq: t.CInt = item_freqs[i] - j: t.CInt = i - 1 + key_item: int = items[i] + key_freq: int = item_freqs[i] + j: int = i - 1 while j >= 0 and item_freqs[j] > key_freq: items[j + 1] = items[j] item_freqs[j + 1] = item_freqs[j] @@ -139,15 +139,15 @@ class zhuff_tree: for i in range(sort_count * 2): parent[i] = -1 heap: INTPTR = INTPTR(zdef.zdef_alloc(self.pool, (sort_count + 1) * int.__sizeof__())) - heap_size: t.CInt = 0 + heap_size: int = 0 for i in range(sort_count): heap[heap_size] = i heap_size += 1 - pos: t.CInt = heap_size - 1 + pos: int = heap_size - 1 while pos > 0: - par: t.CInt = (pos - 1) / 2 + par: int = (pos - 1) / 2 if item_freqs[heap[par]] > item_freqs[heap[pos]]: - tmp: t.CInt = heap[par] + tmp: int = heap[par] heap[par] = heap[pos] heap[pos] = tmp pos = par @@ -155,40 +155,40 @@ class zhuff_tree: combined_freq: INTPTR = INTPTR(zdef.zdef_alloc(self.pool, (sort_count * 2) * int.__sizeof__())) for i in range(sort_count): combined_freq[i] = item_freqs[i] - internal: t.CInt = sort_count + internal: int = sort_count while heap_size > 1: - a: t.CInt = heap[0] + a: int = heap[0] heap[0] = heap[heap_size - 1] heap_size -= 1 - pos: t.CInt = 0 + pos: int = 0 while True: - left: t.CInt = 2 * pos + 1 - right: t.CInt = 2 * pos + 2 - smallest: t.CInt = pos + left: int = 2 * pos + 1 + right: int = 2 * pos + 2 + smallest: int = pos if left < heap_size and combined_freq[heap[left]] < combined_freq[heap[smallest]]: smallest = left if right < heap_size and combined_freq[heap[right]] < combined_freq[heap[smallest]]: smallest = right if smallest != pos: - tmp: t.CInt = heap[pos] + tmp: int = heap[pos] heap[pos] = heap[smallest] heap[smallest] = tmp pos = smallest else: break - b: t.CInt = heap[0] + b: int = heap[0] heap[0] = heap[heap_size - 1] heap_size -= 1 pos = 0 while True: - left: t.CInt = 2 * pos + 1 - right: t.CInt = 2 * pos + 2 - smallest: t.CInt = pos + left: int = 2 * pos + 1 + right: int = 2 * pos + 2 + smallest: int = pos if left < heap_size and combined_freq[heap[left]] < combined_freq[heap[smallest]]: smallest = left if right < heap_size and combined_freq[heap[right]] < combined_freq[heap[smallest]]: smallest = right if smallest != pos: - tmp: t.CInt = heap[pos] + tmp: int = heap[pos] heap[pos] = heap[smallest] heap[smallest] = tmp pos = smallest @@ -201,17 +201,17 @@ class zhuff_tree: heap_size += 1 pos = heap_size - 1 while pos > 0: - par: t.CInt = (pos - 1) / 2 + par: int = (pos - 1) / 2 if combined_freq[heap[par]] > combined_freq[heap[pos]]: - tmp: t.CInt = heap[par] + tmp: int = heap[par] heap[par] = heap[pos] heap[pos] = tmp pos = par else: break internal += 1 for i in range(sort_count): - node: t.CInt = i - length: t.CInt = 0 + node: int = i + length: int = 0 while parent[node] >= 0: length += 1 node = parent[node] @@ -220,7 +220,7 @@ class zhuff_tree: for i in range(count): if lengths[i] > 0: bl_count[lengths[i]] += 1 - overflow: t.CInt = 0 + overflow: int = 0 for i in range(count): if lengths[i] > max_bits: overflow += 1 @@ -228,7 +228,7 @@ class zhuff_tree: lengths[i] = max_bits bl_count[max_bits] += 1 while overflow > 0: - bits: t.CInt = max_bits - 1 + bits: int = max_bits - 1 while bits > 0 and bl_count[bits] == 0: bits -= 1 if bits == 0: break @@ -237,7 +237,7 @@ class zhuff_tree: bl_count[max_bits] -= 1 overflow -= 2 sorted_items: INTPTR = INTPTR(zdef.zdef_alloc(self.pool, sort_count * int.__sizeof__())) - si: t.CInt = 0 + si: int = 0 for i in range(count): if freqs[i] > 0: sorted_items[si] = i @@ -245,12 +245,12 @@ class zhuff_tree: for i in range(si - 1): for j in range(i + 1, si): if lengths[sorted_items[i]] < lengths[sorted_items[j]]: - tmp: t.CInt = sorted_items[i] + tmp: int = sorted_items[i] sorted_items[i] = sorted_items[j] sorted_items[j] = tmp - sidx: t.CInt = 0 + sidx: int = 0 for bits in range(max_bits, 1, -1): - n: t.CInt = bl_count[bits] + n: int = bl_count[bits] while n > 0 and sidx < si: lengths[sorted_items[sidx]] = bits sidx += 1 @@ -272,9 +272,9 @@ class zhuff_tree: for i in range(32): lengths[i] = 5 - def build_tree_from_lengths(self, lengths: INTPTR, count: t.CInt, max_bits: t.CInt): - bl_count: t.CArray[t.CInt, 16] - next_code: t.CArray[t.CUnsignedInt, 16] + def build_tree_from_lengths(self, lengths: INTPTR, count: int, max_bits: int): + bl_count: t.CArray[int, 16] + next_code: t.CArray[uint, 16] string.memset(bl_count, 0, bl_count.__sizeof__()) for i in range(count): @@ -299,20 +299,20 @@ class zhuff_tree: class zhuff_decode_node: - children: t.CArray[t.CInt, 2] - symbol: t.CInt + children: t.CArray[int, 2] + symbol: int class zhuff_decode_tree: pool: rawptr[memhub.MemManager] nodes: t.CArray[zhuff_decode_node, 2 * ZHUFF_MAX_CODES] - node_count: t.CInt - root: t.CInt + node_count: int + root: int def __init__(self): self.pool = None - def build_decode_tree(self, ht: zhuff_tree | t.CPtr): + def build_decode_tree(self, ht: zhuff_tree*): self.node_count = 1 self.root = 0 self.nodes[0].children[0] = -1 @@ -322,7 +322,7 @@ class zhuff_decode_tree: if ht.codes[i].bits == 0: continue node: int = 0 for bit in range(ht.codes[i].bits - 1, -1, -1): - dir: t.CInt = (ht.codes[i].code >> bit) & 1 + dir: int = (ht.codes[i].code >> bit) & 1 if bit > 0: # Internal node: traverse or create if self.nodes[node].children[dir] == -1: @@ -345,12 +345,12 @@ class zhuff_decode_tree: else: self.nodes[self.nodes[node].children[dir]].symbol = i - def decode_symbol(self, reader: rawptr[zdef.zbit_reader]) -> t.CInt: + def decode_symbol(self, reader: rawptr[zdef.zbit_reader]) -> int: node: int = self.root while self.nodes[node].symbol == -1: - bit: t.CUnsignedInt - if reader.read_bits(1, c.Addr(bit)) != 0: return -1 - dir: t.CInt = t.CInt(bit) + bit: uint + if reader.read_bits(1, &bit) != 0: return -1 + dir: int = int(bit) if self.nodes[node].children[dir] == -1: return -1 node = self.nodes[node].children[dir] return self.nodes[node].symbol diff --git a/zlib/zinflate.vp b/zlib/zinflate.vp index a5c6577..c651846 100644 --- a/zlib/zinflate.vp +++ b/zlib/zinflate.vp @@ -12,18 +12,18 @@ class zinflate_stream: reader: zdef.zbit_reader window: BYTEPTR - window_pos: t.CInt - window_size: t.CInt + window_pos: int + window_size: int - wbits: t.CInt - is_finished: t.CInt - is_initialized: t.CInt + wbits: int + is_finished: int + is_initialized: int - header_parsed: t.CInt - is_gzip: t.CInt + header_parsed: int + is_gzip: int - adler: t.CUInt32T - crc: t.CUInt32T + adler: uint32 + crc: uint32 output: BYTEPTR output_len: sizet @@ -56,7 +56,7 @@ class zinflate_stream: self.window_pos += 1 - def parse_header(self) -> t.CInt: + def parse_header(self) -> int: if self.header_parsed: return 0 if self.wbits < 0: self.header_parsed = 1 @@ -87,14 +87,14 @@ class zinflate_stream: else: self.is_gzip = 0 if (b0 * 256 + b1) % 31 != 0: return -3 - cm: t.CInt = b0 & 0x0F + cm: int = b0 & 0x0F if cm != 8: return -3 self.input_pos += 2 self.header_parsed = 1 return 0 - def read_bits_from_input(self, nbits: t.CInt, out: UINTPTR) -> t.CInt: + def read_bits_from_input(self, nbits: int, out: UINTPTR) -> int: val: UINT = 0 for i in range(nbits): if self.input_pos >= self.input_len: return -3 @@ -104,21 +104,21 @@ class zinflate_stream: if self.reader.bit_pos == 8: self.reader.bit_pos = 0 self.input_pos += 1 - c.Set(c.Deref(out), val) + c.Set(*out, val) return 0 - def read_huffman(self, dt: rawptr[zhuff.zhuff_decode_tree]) -> t.CInt: + def read_huffman(self, dt: rawptr[zhuff.zhuff_decode_tree]) -> int: node: int = dt.root while dt.nodes[node].symbol == -1: bit: UINT - if self.read_bits_from_input(1, c.Addr(bit)) != 0: return -1 - dir: int = t.CInt(bit) + if self.read_bits_from_input(1, &bit) != 0: return -1 + dir: int = int(bit) if dt.nodes[node].children[dir] == -1: return -3 node = dt.nodes[node].children[dir] return dt.nodes[node].symbol - def inflate_block_stored(self) -> t.CInt: + def inflate_block_stored(self) -> int: if self.reader.bit_pos != 0: self.reader.bit_pos = 0 self.input_pos += 1 @@ -128,14 +128,14 @@ class zinflate_stream: self.input_pos += 4 if (length ^ nlen) != 0xFFFF: return -3 if self.input_pos + length > self.input_len: return -3 - i: t.CUnsignedInt + i: uint for i in range(length): self.output_byte(self.input_data[self.input_pos]) self.input_pos += 1 return 0 - def inflate_block_fixed(self) -> t.CInt: + def inflate_block_fixed(self) -> int: lit_tree = zhuff.zhuff_tree() dist_tree = zhuff.zhuff_tree() lit_tree.build_fixed_lit_tree() @@ -149,14 +149,14 @@ class zinflate_stream: return -4 string.memset(lit_dt, 0, zhuff.zhuff_decode_tree.__sizeof__()) string.memset(dist_dt, 0, zhuff.zhuff_decode_tree.__sizeof__()) - lit_dt.build_decode_tree(c.Addr(lit_tree)) - dist_dt.build_decode_tree(c.Addr(dist_tree)) + lit_dt.build_decode_tree(&lit_tree) + dist_dt.build_decode_tree(&dist_tree) - result: t.CInt = 0 + result: int = 0 while True: if self.max_length > 0 and self.output_len >= self.max_length: break - sym: t.CInt = self.read_huffman(lit_dt) + sym: int = self.read_huffman(lit_dt) if sym < 0: result = -3 break @@ -164,35 +164,35 @@ class zinflate_stream: if sym < 256: self.output_byte(BYTE(sym)) else: - len_idx: t.CInt = sym - 257 + len_idx: int = sym - 257 if len_idx < 0 or len_idx >= 29: result = -3 break - length: t.CInt = zdef.zdeflate_len_base[len_idx] - extra: t.CInt = zdef.zdeflate_len_extra_bits[len_idx] + length: int = zdef.zdeflate_len_base[len_idx] + extra: int = zdef.zdeflate_len_extra_bits[len_idx] if extra > 0: extra_val: UINT - if self.read_bits_from_input(extra, c.Addr(extra_val)) != 0: + if self.read_bits_from_input(extra, &extra_val) != 0: result = -3 break length += extra_val - dist_sym: t.CInt = self.read_huffman(dist_dt) + dist_sym: int = self.read_huffman(dist_dt) if dist_sym < 0 or dist_sym >= 30: result = -3 break - dist: t.CInt = zdef.zdeflate_dist_base[dist_sym] + dist: int = zdef.zdeflate_dist_base[dist_sym] extra = zdef.zdeflate_dist_extra_bits[dist_sym] if extra > 0: extra_val: UINT - if self.read_bits_from_input(extra, c.Addr(extra_val)) != 0: + if self.read_bits_from_input(extra, &extra_val) != 0: result = -3 break dist += extra_val for i in range(length): if self.max_length > 0 and self.output_len >= self.max_length: break - src_pos: t.CInt = (self.window_pos - dist) & (zdef.ZDEFLATE_WINDOW_SIZE - 1) + src_pos: int = (self.window_pos - dist) & (zdef.ZDEFLATE_WINDOW_SIZE - 1) byte: BYTE = self.window[src_pos] self.output_byte(byte) @@ -201,38 +201,38 @@ class zinflate_stream: return result - def inflate_block_dynamic(self) -> t.CInt: + def inflate_block_dynamic(self) -> int: hlit_val: UINT hdist_val: UINT hclen_val: UINT - if self.read_bits_from_input(5, c.Addr(hlit_val)) != 0: return -3 - if self.read_bits_from_input(5, c.Addr(hdist_val)) != 0: return -3 - if self.read_bits_from_input(4, c.Addr(hclen_val)) != 0: return -3 + if self.read_bits_from_input(5, &hlit_val) != 0: return -3 + if self.read_bits_from_input(5, &hdist_val) != 0: return -3 + if self.read_bits_from_input(4, &hclen_val) != 0: return -3 - hlit: t.CInt = t.CInt(hlit_val) + 257 - hdist: t.CInt = t.CInt(hdist_val) + 1 - hclen: t.CInt = t.CInt(hclen_val) + 4 + hlit: int = int(hlit_val) + 257 + hdist: int = int(hdist_val) + 1 + hclen: int = int(hclen_val) + 4 - cl_lengths: t.CArray[t.CInt, 19] + cl_lengths: t.CArray[int, 19] string.memset(cl_lengths, 0, cl_lengths.__sizeof__()) for i in range(hclen): len_val: UINT - if self.read_bits_from_input(3, c.Addr(len_val)) != 0: return -3 - cl_lengths[zdef.zdeflate_codelen_order[i]] = t.CInt(len_val) + if self.read_bits_from_input(3, &len_val) != 0: return -3 + cl_lengths[zdef.zdeflate_codelen_order[i]] = int(len_val) cl_tree = zhuff.zhuff_tree() cl_tree.build_tree_from_lengths(cl_lengths, 19, 7) cl_dt = zhuff.zhuff_decode_tree() - cl_dt.build_decode_tree(c.Addr(cl_tree)) + cl_dt.build_decode_tree(&cl_tree) - total: t.CInt = hlit + hdist - all_lengths: t.CInt | t.CPtr = zdef.zdef_alloc(self.pool, total * int.__sizeof__()) + total: int = hlit + hdist + all_lengths: int* = zdef.zdef_alloc(self.pool, total * int.__sizeof__()) if not all_lengths: return -4 - idx: t.CInt = 0 + idx: int = 0 while idx < total: - sym: t.CInt = self.read_huffman(c.Addr(cl_dt)) + sym: int = self.read_huffman(&cl_dt) if sym < 0 or sym > 18: zdef.zdef_free(self.pool, all_lengths) return -3 @@ -241,41 +241,41 @@ class zinflate_stream: idx += 1 elif sym == 16: rep: UINT - if self.read_bits_from_input(2, c.Addr(rep)) != 0: + if self.read_bits_from_input(2, &rep) != 0: zdef.zdef_free(self.pool, all_lengths) return -3 rep += 3 if idx == 0 or idx + rep > total: zdef.zdef_free(self.pool, all_lengths) return -3 - prev: t.CInt = all_lengths[idx - 1] - i: t.CUnsignedInt + prev: int = all_lengths[idx - 1] + i: uint for i in range(rep): all_lengths[idx] = prev idx += 1 elif sym == 17: - rep: t.CUnsignedInt - if self.read_bits_from_input(3, c.Addr(rep)) != 0: + rep: uint + if self.read_bits_from_input(3, &rep) != 0: zdef.zdef_free(self.pool, all_lengths) return -3 rep += 3 if idx + rep > total: zdef.zdef_free(self.pool, all_lengths) return -3 - i: t.CUnsignedInt + i: uint for i in range(rep): all_lengths[idx] = 0 idx += 1 else: - rep: t.CUnsignedInt - if self.read_bits_from_input(7, c.Addr(rep)) != 0: + rep: uint + if self.read_bits_from_input(7, &rep) != 0: zdef.zdef_free(self.pool, all_lengths) return -3 rep += 11 if idx + rep > total: zdef.zdef_free(self.pool, all_lengths) return -3 - i: t.CUnsignedInt + i: uint for i in range(rep): all_lengths[idx] = 0 idx += 1 @@ -283,13 +283,13 @@ class zinflate_stream: lit_tree = zhuff.zhuff_tree() dist_tree = zhuff.zhuff_tree() - lit_lengths: t.CArray[t.CInt, 288] + lit_lengths: t.CArray[int, 288] string.memset(lit_lengths, 0, lit_lengths.__sizeof__()) for i in range(hlit): lit_lengths[i] = all_lengths[i] lit_tree.build_tree_from_lengths(lit_lengths, hlit, zdef.ZDEFLATE_MAX_BITS) - dist_lengths: t.CArray[t.CInt, 32] + dist_lengths: t.CArray[int, 32] string.memset(dist_lengths, 0, dist_lengths.__sizeof__()) for i in range(hdist): dist_lengths[i] = all_lengths[hlit + i] @@ -299,49 +299,49 @@ class zinflate_stream: lit_dt = zhuff.zhuff_decode_tree() dist_dt = zhuff.zhuff_decode_tree() - lit_dt.build_decode_tree(c.Addr(lit_tree)) - dist_dt.build_decode_tree(c.Addr(dist_tree)) + lit_dt.build_decode_tree(&lit_tree) + dist_dt.build_decode_tree(&dist_tree) while True: if self.max_length > 0 and self.output_len >= self.max_length: return 0 - sym: t.CInt = self.read_huffman(c.Addr(lit_dt)) + sym: int = self.read_huffman(&lit_dt) if sym < 0: return -3 if sym == 256: return 0 if sym < 256: self.output_byte(BYTE(sym)) else: - len_idx: t.CInt = sym - 257 + len_idx: int = sym - 257 if len_idx < 0 or len_idx >= 29: return -3 - length: t.CInt = zdef.zdeflate_len_base[len_idx] - extra: t.CInt = zdef.zdeflate_len_extra_bits[len_idx] + length: int = zdef.zdeflate_len_base[len_idx] + extra: int = zdef.zdeflate_len_extra_bits[len_idx] if extra > 0: extra_val: UINT - if self.read_bits_from_input(extra, c.Addr(extra_val)) != 0: return -3 + if self.read_bits_from_input(extra, &extra_val) != 0: return -3 length += extra_val - dist_sym: t.CInt = self.read_huffman(c.Addr(dist_dt)) + dist_sym: int = self.read_huffman(&dist_dt) if dist_sym < 0 or dist_sym >= 30: return -3 - dist: t.CInt = zdef.zdeflate_dist_base[dist_sym] + dist: int = zdef.zdeflate_dist_base[dist_sym] extra = zdef.zdeflate_dist_extra_bits[dist_sym] if extra > 0: extra_val: UINT - if self.read_bits_from_input(extra, c.Addr(extra_val)) != 0: return -3 + if self.read_bits_from_input(extra, &extra_val) != 0: return -3 dist += extra_val for i in range(length): if self.max_length > 0 and self.output_len >= self.max_length: return 0 - src_pos: t.CInt = (self.window_pos - dist) & (zdef.ZDEFLATE_WINDOW_SIZE - 1) + src_pos: int = (self.window_pos - dist) & (zdef.ZDEFLATE_WINDOW_SIZE - 1) byte: BYTE = self.window[src_pos] self.output_byte(byte) - def inflate_stream(self) -> t.CInt: - err: t.CInt = self.parse_header() + def inflate_stream(self) -> int: + err: int = self.parse_header() if err != 0: return err while not self.is_finished: bfinal_val: UINT btype_val: UINT - if self.read_bits_from_input(1, c.Addr(bfinal_val)) != 0: return -3 - if self.read_bits_from_input(2, c.Addr(btype_val)) != 0: return -3 - bfinal: t.CInt = t.CInt(bfinal_val) - btype: t.CInt = t.CInt(btype_val) + if self.read_bits_from_input(1, &bfinal_val) != 0: return -3 + if self.read_bits_from_input(2, &btype_val) != 0: return -3 + bfinal: int = int(bfinal_val) + btype: int = int(btype_val) if btype == 0: err = self.inflate_block_stored() elif btype == 1: @@ -358,20 +358,20 @@ class zinflate_stream: self.reader.bit_pos = 0 self.input_pos += 1 if self.input_pos + 8 <= self.input_len: - self.crc = ((t.CUInt32T(self.input_data[self.input_pos + 0]) << 0) | - (t.CUInt32T(self.input_data[self.input_pos + 1]) << 8) | - (t.CUInt32T(self.input_data[self.input_pos + 2]) << 16) | - (t.CUInt32T(self.input_data[self.input_pos + 3]) << 24)) + self.crc = ((uint32(self.input_data[self.input_pos + 0]) << 0) | + (uint32(self.input_data[self.input_pos + 1]) << 8) | + (uint32(self.input_data[self.input_pos + 2]) << 16) | + (uint32(self.input_data[self.input_pos + 3]) << 24)) self.input_pos += 8 elif self.wbits >= 0: if self.reader.bit_pos != 0: self.reader.bit_pos = 0 self.input_pos += 1 if self.input_pos + 4 <= self.input_len: - self.adler = ((t.CUInt32T(self.input_data[self.input_pos + 0]) << 24) | - (t.CUInt32T(self.input_data[self.input_pos + 1]) << 16) | - (t.CUInt32T(self.input_data[self.input_pos + 2]) << 8) | - (t.CUInt32T(self.input_data[self.input_pos + 3]) << 0)) + self.adler = ((uint32(self.input_data[self.input_pos + 0]) << 24) | + (uint32(self.input_data[self.input_pos + 1]) << 16) | + (uint32(self.input_data[self.input_pos + 2]) << 8) | + (uint32(self.input_data[self.input_pos + 3]) << 0)) self.input_pos += 4 return 0 @@ -384,7 +384,7 @@ class zinflate_stream: # 同形先例：includes/w32/win32sync.vp:65 `Context: VOIDPTR | t.CPtr`、 # includes/posix.vp:199 `argv: CHARPTR | t.CPtr`。 def decompress(self, data: UINT8PTR, length: sizet, - max_length: sizet, out: BYTEPTR | t.CPtr, out_len: sizet*) -> t.CInt: + max_length: sizet, out: BYTEPTR*, out_len: sizet*) -> int: if not self.is_initialized: return -2 self.input_data = data self.input_len = length @@ -392,30 +392,30 @@ class zinflate_stream: self.reader.bit_pos = 0 self.output_len = 0 self.max_length = max_length - err: t.CInt = self.inflate_stream() + err: int = self.inflate_stream() if err != 0: return err - c.Set(c.Deref(out_len), self.output_len) + c.Set(*out_len, self.output_len) if self.output_len == 0: - c.Set(c.Deref(out), UINT8PTR(zdef.zdef_alloc(self.pool, 1))) + c.Set(*out, UINT8PTR(zdef.zdef_alloc(self.pool, 1))) else: dst: UINT8PTR = UINT8PTR(zdef.zdef_alloc(self.pool, self.output_len)) - c.Set(c.Deref(out), dst) + c.Set(*out, dst) if dst: string.memcpy(dst, self.output, self.output_len) return 0 - def set_dictionary(self, dict: UINT8PTR, length: sizet) -> t.CInt: + def set_dictionary(self, dict: UINT8PTR, length: sizet) -> int: if not dict: return -2 use: sizet = length if use > zdef.ZDEFLATE_WINDOW_SIZE: dict += length - zdef.ZDEFLATE_WINDOW_SIZE use = zdef.ZDEFLATE_WINDOW_SIZE string.memcpy(self.window, dict, use) - self.window_pos = t.CInt(use) + self.window_pos = int(use) return 0 - def copy(self) -> zinflate_stream | t.CPtr: - z: zinflate_stream | t.CPtr = zdef.zdef_alloc(self.pool, zinflate_stream.__sizeof__()) + def copy(self) -> zinflate_stream*: + z: zinflate_stream* = zdef.zdef_alloc(self.pool, zinflate_stream.__sizeof__()) if not z: return None string.memcpy(z, self, zinflate_stream.__sizeof__()) z.window = BYTEPTR(zdef.zdef_alloc(self.pool, zdef.ZDEFLATE_WINDOW_SIZE)) @@ -435,18 +435,18 @@ class zinflate_stream: def zinflate_one_shot(pool: rawptr[memhub.MemManager], data: UINT8PTR, length: sizet, - wbits: t.CInt, bufsize: sizet, out_len: sizet*) -> t.CUInt8T | t.CPtr: - s: zinflate_stream | t.CPtr = zinflate_create(pool, wbits) + wbits: int, bufsize: sizet, out_len: sizet*) -> uint8*: + s: zinflate_stream* = zinflate_create(pool, wbits) if not s: return None - out: t.CUInt8T | t.CPtr = None - err: t.CInt = s.decompress(data, length, 0, c.Addr(out), out_len) + out: uint8* = None + err: int = s.decompress(data, length, 0, &out, out_len) s.destroy() if err != 0: return None return out -def zinflate_create(pool: rawptr[memhub.MemManager], wbits: t.CInt) -> zinflate_stream | t.CPtr: - s: zinflate_stream | t.CPtr = zdef.zdef_alloc(pool, zinflate_stream.__sizeof__()) +def zinflate_create(pool: rawptr[memhub.MemManager], wbits: int) -> zinflate_stream*: + s: zinflate_stream* = zdef.zdef_alloc(pool, zinflate_stream.__sizeof__()) if not s: return None string.memset(s, 0, zinflate_stream.__sizeof__()) s.pool = pool