update to zig0.11

MoAlyousef · Aug 4, 2023 · 0187eb8 · 0187eb8
1 parent b4d22df
commit 0187eb8
Show file tree

Hide file tree

Showing 31 changed files with 225 additions and 204 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ If you're using the official package manager:
     .version = "0.0.1",
     .dependencies = .{
         .zfltk = .{
-            .url = "https://github.com/MoAlyousef/zfltk/archive/refs/tags/pkg0.0.8.tar.gz",
+            .url = "https://github.com/MoAlyousef/zfltk/archive/refs/tags/pkg0.1.0.tar.gz",
         },
     }
 }
@@ -154,12 +154,12 @@ Using the Zig wrapper (under development):
 ```zig
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Window = zfltk.Window;
-const Button = zfltk.Button;
-const Box = zfltk.Box;
+const Window = zfltk.window.Window;
+const Button = zfltk.button.Button;
+const Box = zfltk.box.Box;
 const Color = zfltk.enums.Color;
 
-fn butCb(but: *Button(.normal), data: ?*anyopaque) void {
+fn butCb(but: *Button, data: ?*anyopaque) void {
     var box = Box.fromRaw(data.?);
 
     box.setLabel("Hello World!");
@@ -177,8 +177,9 @@ pub fn main() !void {
 
         .label = "Hello",
     });
+    win.freePosition();
 
-    var but = try Button(.normal).init(.{
+    var but = try Button.init(.{
         .x = 160,
         .y = 220,
         .w = 80,
@@ -187,6 +188,8 @@ pub fn main() !void {
         .label = "Click me!",
     });
 
+    but.setDownBox(.flat);
+
     var box = try Box.init(.{
         .x = 10,
         .y = 10,
@@ -210,10 +213,9 @@ The messaging api can also be used:
 ```zig
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Widget = zfltk.Widget;
-const Window = zfltk.Window;
-const Button = zfltk.Button;
-const Box = zfltk.Box;
+const Window = zfltk.window.Window;
+const Button = zfltk.button.Button;
+const Box = zfltk.box.Box;
 const enums = zfltk.enums;
 
 pub const Message = enum(usize) {
@@ -233,7 +235,7 @@ pub fn main() !void {
         .label = "Hello",
     });
 
-    var but1 = try Button(.normal).init(.{
+    var but1 = try Button.init(.{
         .x = 100,
         .y = 220,
         .w = 80,
@@ -242,7 +244,7 @@ pub fn main() !void {
         .label = "Button 1",
     });
 
-    var but2 = try Button(.normal).init(.{
+    var but2 = try Button.init(.{
         .x = 200,
         .y = 220,
         .w = 80,
@@ -307,7 +309,7 @@ You can also mix and match for any missing functionalities in the Zig wrapper (s
 
 Widgets also provide a `call` method which allows to call any method that wasn't wrapped yet in the bindings:
 ```zig
-    var flex = try Group(.flex).init(.{
+    var flex = try Flex.init(.{
         .w = 400,
         .h = 300,
         .orientation = .vertical,

diff --git a/examples/browser.zig b/examples/browser.zig
@@ -1,7 +1,7 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Window = zfltk.Window;
-const Browser = zfltk.Browser;
+const Window = zfltk.window.Window;
+const MultiBrowser = zfltk.browser.MultiBrowser;
 
 pub fn main() !void {
     try app.init();
@@ -12,7 +12,7 @@ pub fn main() !void {
     });
 
     // Available browsers are: normal, select, hold, multi and file
-    var browser = try Browser(.multi).init(.{
+    var browser = try MultiBrowser.init(.{
         .x = 10,
         .y = 10,
         .w = 900 - 20,

diff --git a/examples/channels.zig b/examples/channels.zig
@@ -1,9 +1,8 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Widget = zfltk.Widget;
-const Window = zfltk.Window;
-const Button = zfltk.Button;
-const Box = zfltk.Box;
+const Window = zfltk.window.Window;
+const Button = zfltk.button.Button;
+const Box = zfltk.box.Box;
 const enums = zfltk.enums;
 
 pub const Message = enum(usize) {
@@ -23,7 +22,7 @@ pub fn main() !void {
         .label = "Hello",
     });
 
-    var but1 = try Button(.normal).init(.{
+    var but1 = try Button.init(.{
         .x = 100,
         .y = 220,
         .w = 80,
@@ -32,7 +31,7 @@ pub fn main() !void {
         .label = "Button 1",
     });
 
-    var but2 = try Button(.normal).init(.{
+    var but2 = try Button.init(.{
         .x = 200,
         .y = 220,
         .w = 80,

diff --git a/examples/customwidget.zig b/examples/customwidget.zig
@@ -1,10 +1,10 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
 const draw = zfltk.draw;
-const Window = zfltk.Window;
-const Widget = zfltk.Widget;
-const Button = zfltk.Button;
-const Box = zfltk.Box;
+const Window = zfltk.window.Window;
+const Widget = zfltk.widget.Widget;
+const Button = zfltk.button.Button;
+const Box = zfltk.box.Box;
 const enums = zfltk.enums;
 const Color = enums.Color;
 const Event = enums.Event;

diff --git a/examples/editor.zig b/examples/editor.zig
@@ -4,14 +4,13 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
 const widget = zfltk.widget;
-const Widget = widget.Widget;
-const Window = zfltk.Window;
-const Menu = zfltk.Menu;
+const Window = zfltk.window.Window;
+const MenuBar = zfltk.menu.MenuBar;
 const enums = zfltk.enums;
 const Color = enums.Color;
-const TextDisplay = zfltk.TextDisplay;
+const TextEditor = zfltk.text.TextEditor;
 const dialog = zfltk.dialog;
-const FileDialog = zfltk.FileDialog;
+const FileDialog = zfltk.dialog.FileDialog;
 const std = @import("std");
 
 // To avoid exiting when hitting escape.
@@ -22,13 +21,13 @@ pub fn winCb(w: *Window) void {
     }
 }
 
-fn newCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    var editor = TextDisplay(.editor).fromRaw(data.?);
+fn newCb(_: *MenuBar, data: ?*anyopaque) void {
+    var editor = TextEditor.fromRaw(data.?);
     editor.buffer().?.setText("");
 }
 
-pub fn openCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    var editor = TextDisplay(.editor).fromRaw(data.?);
+pub fn openCb(_: *MenuBar, data: ?*anyopaque) void {
+    var editor = TextEditor.fromRaw(data.?);
     var dlg = try FileDialog(.file).init(.{});
     dlg.setFilter("*.{txt,zig}");
     dlg.show();
@@ -38,8 +37,8 @@ pub fn openCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
     }
 }
 
-pub fn saveCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    var editor = TextDisplay(.editor).fromRaw(data.?);
+pub fn saveCb(_: *MenuBar, data: ?*anyopaque) void {
+    var editor = TextEditor.fromRaw(data.?);
     var dlg = try FileDialog(.save_file).init(.{ .save_as_confirm = true });
     dlg.setFilter("*.{txt,zig}");
     dlg.show();
@@ -49,27 +48,27 @@ pub fn saveCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
     }
 }
 
-pub fn quitCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
+pub fn quitCb(_: *MenuBar, data: ?*anyopaque) void {
     var win = widget.Widget.fromRaw(data.?);
     win.hide();
 }
 
-pub fn cutCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    const editor = TextDisplay(.editor).fromRaw(data.?);
+pub fn cutCb(_: *MenuBar, data: ?*anyopaque) void {
+    const editor = TextEditor.fromRaw(data.?);
     editor.cut();
 }
 
-pub fn copyCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    const editor = TextDisplay(.editor).fromRaw(data.?);
+pub fn copyCb(_: *MenuBar, data: ?*anyopaque) void {
+    const editor = TextEditor.fromRaw(data.?);
     _ = editor.copy();
 }
 
-pub fn pasteCb(_: *Menu(.menu_bar), data: ?*anyopaque) void {
-    const editor = TextDisplay(.editor).fromRaw(data.?);
+pub fn pasteCb(_: *MenuBar, data: ?*anyopaque) void {
+    const editor = TextEditor.fromRaw(data.?);
     editor.paste();
 }
 
-pub fn helpCb(_: *Menu(.menu_bar)) void {
+pub fn helpCb(_: *MenuBar) void {
     dialog.message(300, 200, "This editor was built using fltk and zig!");
 }
 
@@ -86,9 +85,9 @@ pub fn main() !void {
     });
 
     win.freePosition();
-    var mymenu = try Menu(.menu_bar).init(.{ .w = 800, .h = 35 });
+    var mymenu = try MenuBar.init(.{ .w = 800, .h = 35 });
 
-    var editor = try TextDisplay(.editor).init(.{
+    var editor = try TextEditor.init(.{
         .x = 2,
         .y = 37,
         .w = 800 - 2,

diff --git a/examples/editormsgs.zig b/examples/editormsgs.zig
@@ -1,14 +1,13 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
 const widget = zfltk.widget;
-const Widget = widget.Widget;
 const window = zfltk.window;
 const menu = zfltk.menu;
 const enums = zfltk.enums;
 const Color = enums.Color;
 const text = zfltk.text;
 const dialog = zfltk.dialog;
-const FileDialog = zfltk.FileDialog;
+const FileDialog = zfltk.dialog.FileDialog;
 const std = @import("std");
 
 pub const Message = enum(usize) {
@@ -38,10 +37,10 @@ pub fn main() !void {
     app.setBackground(Color.fromRgb(211, 211, 211));
     var win = try window.Window.init(.{ .w = 800, .h = 600, .label = "Editor" });
     win.freePosition();
-    var mymenu = try menu.Menu(.menu_bar).init(.{ .w = 800, .h = 35 });
+    var mymenu = try menu.MenuBar.init(.{ .w = 800, .h = 35 });
     var buf = try text.TextBuffer.init();
     defer buf.deinit();
-    var editor = try text.TextDisplay(.editor).init(.{
+    var editor = try text.TextEditor.init(.{
         .x = 2,
         .y = 37,
         .w = 800 - 2,

diff --git a/examples/flex.zig b/examples/flex.zig
@@ -1,11 +1,10 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Window = zfltk.Window;
-const Box = zfltk.Box;
-const Button = zfltk.Button;
-const Group = zfltk.Group;
-const Color = enums.Color;
-const enums = zfltk.enums;
+const Window = zfltk.window.Window;
+const Box = zfltk.box.Box;
+const Button = zfltk.button.Button;
+const Flex = zfltk.group.Flex;
+const Color = zfltk.enums.Color;
 
 pub fn main() !void {
     try app.init();
@@ -17,7 +16,7 @@ pub fn main() !void {
         .label = "Hello",
     });
 
-    var flex = try Group(.flex).init(.{
+    var flex = try Flex.init(.{
         .w = 400,
         .h = 300,
 
@@ -29,7 +28,7 @@ pub fn main() !void {
 
     win.resizable(flex);
 
-    var btn = try Button(.normal).init(.{
+    var btn = try Button.init(.{
         .h = 48,
         .label = "Button",
     });

diff --git a/examples/flutterlike.zig b/examples/flutterlike.zig
@@ -17,7 +17,7 @@ const HEIGHT: i32 = 400;
 
 var COUNT: i32 = 0;
 
-fn btnCb(_: *button.Button(.normal), data: ?*anyopaque) void {
+fn btnCb(_: *button.Button, data: ?*anyopaque) void {
     var count = box.Box.fromRaw(data.?);
     COUNT += 1;
     var buf: [250]u8 = undefined;
@@ -38,7 +38,7 @@ pub fn main() !void {
     bar.setLabelAlign(Align.left | Align.inside);
     var text = try box.Box.init(.{ .x = 250, .y = 180, .w = 100, .h = 40, .label = "You have pushed the button this many times:" });
     var count = try box.Box.init(.{ .x = 250, .y = 220, .w = 100, .h = 40, .label = "0" });
-    var but = try button.Button(.normal).init(.{ .x = WIDTH - 100, .y = HEIGHT - 100, .w = 60, .h = 60, .label = "@+6plus" });
+    var but = try button.Button.init(.{ .x = WIDTH - 100, .y = HEIGHT - 100, .w = 60, .h = 60, .label = "@+6plus" });
     win.end();
     win.resizable(win);
     win.show();

diff --git a/examples/glwin.zig b/examples/glwin.zig
@@ -1,6 +1,6 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const GlutWindow = zfltk.GlutWindow;
+const GlutWindow = zfltk.window.GlutWindow;
 const Mode = zfltk.enums.Mode;
 
 extern fn glClearColor(r: f32, g: f32, b: f32, a: f32) void;

diff --git a/examples/handle.zig b/examples/handle.zig
@@ -1,14 +1,14 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
-const Window = zfltk.Window;
-const Button = zfltk.Button;
-const Box = zfltk.Box;
+const Window = zfltk.window.Window;
+const Button = zfltk.button.Button;
+const Box = zfltk.box.Box;
 const Color = zfltk.enums.Color;
 const Event = zfltk.enums.Event;
 const std = @import("std");
 const draw = zfltk.draw;
 
-fn butCb(but: *Button(.normal), data: ?*anyopaque) void {
+fn butCb(but: *Button, data: ?*anyopaque) void {
     var box = Box.fromRaw(data.?);
 
     box.setLabel("Hello World!");
@@ -17,7 +17,7 @@ fn butCb(but: *Button(.normal), data: ?*anyopaque) void {
 }
 
 fn boxEventHandler(_: *Box, ev: Event, data: ?*anyopaque) bool {
-    const btn = Button(.normal).fromRaw(data.?);
+    const btn = Button.fromRaw(data.?);
     switch (ev) {
         .push => {
             std.debug.print("Click the button: {s}\n", .{btn.label()});
@@ -43,7 +43,7 @@ pub fn main() !void {
         .label = "Hello",
     });
 
-    var but = try Button(.normal).init(.{
+    var but = try Button.init(.{
         .x = 160,
         .y = 220,
         .w = 80,

diff --git a/examples/image.zig b/examples/image.zig
@@ -1,10 +1,10 @@
 const zfltk = @import("zfltk");
 const app = zfltk.app;
 const SharedImage = zfltk.image.SharedImage;
-const Image = zfltk.Image;
-const Window = zfltk.Window;
-const Box = zfltk.Box;
-const Group = zfltk.Group;
+const Image = zfltk.image.Image;
+const Window = zfltk.window.Window;
+const Box = zfltk.box.Box;
+const Scroll = zfltk.group.Scroll;
 const Align = zfltk.enums.Align;
 const std = @import("std");
 
@@ -18,7 +18,7 @@ pub fn main() !void {
         .label = "Image demo",
     });
 
-    var scroll = try Group(.scroll).init(.{
+    var scroll = try Scroll.init(.{
         .w = 415,
         .h = 140,
     });