ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 38
31 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 40 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 41 }
43 42
44 return; 43 return;
45 } 44 }
46 } 45 }
47 } 46 }
48 47
49 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
51} 74}
52 75
53# class methods for events 76# class methods for events
54sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
… …
59sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 84 if $FOCUS;
62} 85}
63 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
64sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
65 my ($ev) = @_; 101 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
67 103
68 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
70 108
71 $GRAB = $widget; 109 $GRAB = $widget;
72 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
73 111
74 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
75 } 113 }
76 114
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
78 120
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
80 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
81} 129}
82 130
83sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
84 my ($ev) = @_; 132 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y});
86 133
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
88 135
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 137
91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
92 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
93 140
94 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 143 $grab->update if $grab;
97 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
98 145
99 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
100 } 148 }
101} 149}
102 150
103sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
104 my ($ev) = @_; 152 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
106 154
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
108 156
109 if ($widget != $HOVER) { 157 check_hover $widget;
110 my $hover = $HOVER; $HOVER = $widget;
111 158
112 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
113 $HOVER->update if $HOVER && $HOVER->{can_hover};
114
115 check_tooltip;
116 }
117
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 160 if $HOVER;
120} 161}
121 162
122# convert position array to integers 163# convert position array to integers
123sub harmonize { 164sub harmonize {
… …
152sub rescale_widgets { 193sub rescale_widgets {
153 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
154 195
155 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 197 if ($widget->{is_toplevel}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 207
208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
210
165 } 211 }
166 } 212 }
167 213
168 reconfigure_widgets; 214 reconfigure_widgets;
169} 215}
170 216
171############################################################################# 217#############################################################################
172 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
173package CFClient::UI::Base; 227package CFPlus::UI::Base;
174 228
175use strict; 229use strict;
176 230
177use CFClient::OpenGL; 231use CFPlus::OpenGL;
178 232
179sub new { 233sub new {
180 my $class = shift; 234 my $class = shift;
181 235
182 my $self = bless { 236 my $self = bless {
183 x => 0, 237 x => "center",
184 y => 0, 238 y => "center",
185 z => 0, 239 z => 0,
240 w => undef,
241 h => undef,
186 can_events => 1, 242 can_events => 1,
187 @_ 243 @_
188 }, $class; 244 }, $class;
189 245
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
247
190 for (keys %$self) { 248 for (keys %$self) {
191 if (/^connect_(.*)$/) { 249 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
193 } 251 }
194 } 252 }
195 253
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
259
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262
263 $self->show if $layout->{show};
264 }
197 265
198 $self 266 $self
199} 267}
200 268
201sub destroy { 269sub destroy {
202 my ($self) = @_; 270 my ($self) = @_;
203 271
204 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
205 %$self = (); 274 %$self = ();
206} 275}
207 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
208sub show { 281sub show {
209 my ($self) = @_; 282 my ($self) = @_;
283
210 return if $self->{parent}; 284 return if $self->{parent};
211 285
212 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
213} 287}
214 288
215sub show_centered { 289sub set_visible {
216 my ($self) = @_; 290 my ($self) = @_;
291
217 return if $self->{parent}; 292 return if $self->{visible};
218 293
219 $self->show; 294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1;
220 296
221 $CFClient::UI::ROOT->on_post_alloc ( 297 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 298
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 299 $self->realloc if !exists $self->{req_w};
224 }, 300
225 ); 301 $_->set_visible for $self->children;
226} 302}
227 303
228sub set_invisible { 304sub set_invisible {
229 my ($self) = @_; 305 my ($self) = @_;
230 306
231 # broken show/hide model 307 return unless $self->{visible};
308
309 $_->set_invisible for $self->children;
232 310
233 delete $self->{visible}; 311 delete $self->{visible};
312 delete $self->{root};
234 313
235 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
237 316
238 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
240 319
241 $self->focus_out; 320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0);
322}
323
324sub set_visibility {
325 my ($self, $visible) = @_;
326
327 return if $self->{visible} == $visible;
328
329 $visible ? $self->show
330 : $self->hide;
331}
332
333sub toggle_visibility {
334 my ($self) = @_;
335
336 $self->{visible}
337 ? $self->hide
338 : $self->show;
242} 339}
243 340
244sub hide { 341sub hide {
245 my ($self) = @_; 342 my ($self) = @_;
246 343
… …
248 345
249 $self->{parent}->remove ($self) 346 $self->{parent}->remove ($self)
250 if $self->{parent}; 347 if $self->{parent};
251} 348}
252 349
253sub move { 350sub move_abs {
254 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
255 352
256 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
259 356
260 $self->update; 357 $self->update;
261} 358}
262 359
263sub set_size { 360sub set_size {
264 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
265 362
266 $self->{user_w} = $w; 363 $self->{force_w} = $w;
267 $self->{user_h} = $h; 364 $self->{force_h} = $h;
268 365
269 $self->check_size; 366 $self->realloc;
270} 367}
271 368
272sub size_request { 369sub size_request {
273 require Carp; 370 require Carp;
274 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
275} 372}
276 373
374sub baseline_shift {
375 0
376}
377
277sub configure { 378sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
279 380
280 if ($self->{aspect}) { 381 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h);
383
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
283 386
284 # use alignment to adjust x, y 387 # use alignment to adjust x, y
285 388
286 $x += int +($w - $w2) * 0.5; 389 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 390 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 391 }
291 392
292 if ($self->{x} != $x || $self->{y} != $y) { 393 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 394 $self->{x} = $x;
294 $self->{y} = $y; 395 $self->{y} = $y;
295 $self->update; 396 $self->update;
296 } 397 }
297 398
298 if ($self->{w} != $w || $self->{h} != $h) { 399 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 400 return unless $self->{visible};
300 }
301}
302 401
303sub size_allocate { 402 $self->{alloc_w} = $w;
304 # nothing to be done 403 $self->{alloc_h} = $h;
305}
306 404
307sub reconfigure { 405 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 406 }
309
310 $self->check_size (1);
311 $self->update;
312} 407}
313 408
314sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
315} 415}
316 416
317sub set_max_size { 417sub set_max_size {
318 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
319 419
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
322} 424}
323 425
324sub set_tooltip { 426sub set_tooltip {
325 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
326 428
… …
329 431
330 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
331 433
332 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
333 435
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
337 } 439 }
338} 440}
339 441
340# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
341sub coord2local { 443sub coord2local {
342 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
343 445
446 Carp::confess unless $self->{parent};#d#
447
344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
345} 449}
346 450
347# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
348sub coord2global { 452sub coord2global {
349 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
350 454
455 Carp::confess unless $self->{parent};#d#
456
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 458}
353 459
354sub focus_in { 460sub invoke_focus_in {
355 my ($self) = @_; 461 my ($self) = @_;
356 462
357 return if $FOCUS == $self; 463 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
359 465
360 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
361 467
362 $self->_emit (focus_in => $focus); 468 $self->update;
363 469
364 $focus->update if $focus; 470 0
365 $FOCUS->update;
366} 471}
367 472
368sub focus_out { 473sub invoke_focus_out {
369 my ($self) = @_; 474 my ($self) = @_;
370 475
371 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
372 477
373 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
374 479
375 $self->_emit (focus_out => $focus); 480 $self->update;
376 481
377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 483 unless $FOCUS;
381}
382 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
383sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
384sub button_up { } 496sub invoke_button_up { 0 }
385sub key_down { } 497sub invoke_key_down { 0 }
386sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
387 500
388sub button_down { 501sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
390 503
391 $self->focus_in; 504 $self->grab_focus;
392}
393 505
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 508
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 509sub connect {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
556#sub find_widget {
557# in .xs
558
559sub set_parent {
560 my ($self, $parent) = @_;
561
562 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible};
564}
565
566sub realloc {
567 my ($self) = @_;
568
569 if ($self->{visible}) {
570 return if $self->{root}{realloc}{$self+0};
571
572 $self->{root}{realloc}{$self+0} = $self;
573 $self->{root}->update;
574 } else {
575 delete $self->{req_w};
576 delete $self->{req_h};
577 }
578}
579
580sub update {
581 my ($self) = @_;
582
583 $self->{parent}->update
584 if $self->{parent};
585}
586
587sub reconfigure {
588 my ($self) = @_;
589
590 $self->realloc;
591 $self->update;
592}
593
594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 597
400sub draw { 598sub draw {
401 my ($self) = @_; 599 my ($self) = @_;
402 600
403 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 610
405 glPushMatrix; 611 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 612 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 613
410 if ($self == $HOVER && $self->{can_hover}) { 614 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 616 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 618 glBegin GL_QUADS;
417 glVertex $x , $y; 619 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 620 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 621 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 622 glVertex 0 , $self->{h};
421 glEnd; 623 glEnd;
422 glDisable GL_BLEND; 624 glDisable GL_BLEND;
423 } 625 }
424 626
425 if ($ENV{PCLIENT_DEBUG}) { 627 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 628 glPushMatrix;
427 glColor 1, 1, 0, 1; 629 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 630 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 631 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 632 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
434 glEnd; 636 glEnd;
435 glPopMatrix; 637 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 639 }
640
641 $self->_draw;
642 glPopMatrix;
438} 643}
439 644
440sub _draw { 645sub _draw {
441 my ($self) = @_; 646 my ($self) = @_;
442 647
443 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
444} 649}
445 650
446sub find_widget { 651my $cntx;#d#
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 652sub DESTROY {
507 my ($self) = @_; 653 my ($self) = @_;
508 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
509 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
510 #$self->deactivate;
511} 661}
512 662
513############################################################################# 663#############################################################################
514 664
515package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
516 666
517our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
518 668
519use strict; 669use strict;
520use CFClient::OpenGL; 670use CFPlus::OpenGL;
521 671
522sub new { 672sub new {
523 my $class = shift; 673 my $class = shift;
524 674
525 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
540 690
541 if ($color && (@$color < 4 || $color->[3])) { 691 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 692 my ($w, $h) = @$self{qw(w h)};
543 693
544 glEnable GL_BLEND; 694 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 696 glColor_premultiply @$color;
547 697
548 glBegin GL_QUADS; 698 glBegin GL_QUADS;
549 glVertex 0 , 0; 699 glVertex 0 , 0;
550 glVertex 0 , $h; 700 glVertex 0 , $h;
551 glVertex $w, $h; 701 glVertex $w, $h;
… …
556 } 706 }
557} 707}
558 708
559############################################################################# 709#############################################################################
560 710
561package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
562 712
563our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
564 714
565sub new { 715sub new {
566 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
568} 718}
569 719
570sub size_request { 720sub size_request {
571 (0, 0) 721 my ($self) = @_;
722
723 ($self->{w} + 0, $self->{h} + 0)
572} 724}
573 725
574sub draw { } 726sub draw { }
575 727
576############################################################################# 728#############################################################################
577 729
578package CFClient::UI::Container; 730package CFPlus::UI::Container;
579 731
580our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
581 733
582sub new { 734sub new {
583 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
584 736
585 my $children = delete $arg{children} || []; 737 my $children = delete $arg{children};
586 738
587 my $self = $class->SUPER::new ( 739 my $self = $class->SUPER::new (
588 children => [], 740 children => [],
589 can_events => 0, 741 can_events => 0,
590 %arg, 742 %arg,
591 ); 743 );
744
592 $self->add ($_) for @$children; 745 $self->add (@$children)
746 if $children && @$children;
593 747
594 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
595} 757}
596 758
597sub add { 759sub add {
598 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
599 761
600 $_->set_parent ($self) 762 $_->set_parent ($self)
601 for @widgets; 763 for @widgets;
602 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
603 use sort 'stable'; 766 use sort 'stable';
604 767
605 $self->{children} = [ 768 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
608 ]; 771 ];
609 772
610 $self->check_size (1); 773 $self->realloc;
611 $self->update;
612} 774}
613 775
614sub children { 776sub children {
615 @{ $_[0]{children} } 777 @{ $_[0]{children} }
616} 778}
… …
621 delete $child->{parent}; 783 delete $child->{parent};
622 $child->hide; 784 $child->hide;
623 785
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 787
626 $self->check_size (1); 788 $self->realloc;
627 $self->update;
628} 789}
629 790
630sub clear { 791sub clear {
631 my ($self) = @_; 792 my ($self) = @_;
632 793
633 my $children = delete $self->{children}; 794 my $children = $self->{children};
634 $self->{children} = []; 795 $self->{children} = [];
635 796
636 for (@$children) { 797 for (@$children) {
637 delete $_->{parent}; 798 delete $_->{parent};
638 $_->hide; 799 $_->hide;
639 } 800 }
640 801
641 $self->check_size; 802 $self->realloc;
642 $self->update;
643} 803}
644 804
645sub find_widget { 805sub find_widget {
646 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
647 807
648 $x -= $self->{x}; 808 $x -= $self->{x};
649 $y -= $self->{y}; 809 $y -= $self->{y};
650 810
651 my $res; 811 my $res;
652 812
653 for (reverse @{ $self->{children} }) { 813 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 814 $res = $_->find_widget ($x, $y)
655 and return $res; 815 and return $res;
656 } 816 }
657 817
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 818 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
664 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
665} 825}
666 826
667############################################################################# 827#############################################################################
668 828
669package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
670 830
671our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
672 832
673sub new { 833sub new {
674 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
675 835
676 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
677 837
678 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
679} 839}
680 840
681sub add { 841sub add {
682 my ($self, $child) = @_; 842 my ($self, $child) = @_;
683 843
684 $self->{children} = []; 844 $self->SUPER::remove ($_) for @{ $self->{children} };
685
686 $self->SUPER::add ($child); 845 $self->SUPER::add ($child);
687} 846}
688 847
689sub remove { 848sub remove {
690 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
691 850
692 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
693 852
694 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
695 unless @{$self->{children}}; 854 unless @{$self->{children}};
696} 855}
697 856
698sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
699 858
700sub size_request { 859sub size_request {
701 $_[0]{children}[0]->size_request 860 $_[0]{children}[0]->size_request
702} 861}
703 862
704sub size_allocate { 863sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 864 my ($self, $w, $h) = @_;
706 865
707 $self->{children}[0]->configure (0, 0, $w, $h); 866 $self->{children}[0]->configure (0, 0, $w, $h);
867
868 1
708} 869}
709 870
710############################################################################# 871#############################################################################
711 872
873# back-buffered drawing area
874
712package CFClient::UI::Window; 875package CFPlus::UI::Window;
713 876
714our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
715 878
716use CFClient::OpenGL; 879use CFPlus::OpenGL;
717 880
718sub new { 881sub new {
719 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
720 883
721 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
726 889
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 890 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 891 $self->SUPER::update;
729} 892}
730 893
731sub size_allocate { 894sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
733 896
734 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 897 $self->update;
898
899 $self->SUPER::invoke_size_allocate ($w, $h)
736} 900}
737 901
738sub _render { 902sub _render {
903 my ($self) = @_;
904
739 $_[0]{children}[0]->draw; 905 $self->{children}[0]->draw;
740} 906}
741 907
742sub render_child { 908sub render_child {
743 my ($self) = @_; 909 my ($self) = @_;
744 910
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
748 914
915 {
916 package CFPlus::UI::Base;
917
918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
919 (0, 0, $self->{w}, $self->{h});
920
749 $self->_render; 921 $self->_render;
922 }
750 }; 923 };
751} 924}
752 925
753sub _draw { 926sub _draw {
754 my ($self) = @_; 927 my ($self) = @_;
755
756 my ($w, $h) = ($self->w, $self->h);
757 928
758 my $tex = $self->{texture} 929 my $tex = $self->{texture}
759 or return; 930 or return;
760 931
761 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 934 glColor 0, 0, 0, 1;
764 935
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
766 937
767 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
768} 939}
769 940
770############################################################################# 941#############################################################################
771 942
772package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
773 944
945use List::Util qw(min max);
946
774our @ISA = CFClient::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
775 948
776sub new { 949sub new {
777 my $class = shift; 950 my $class = shift;
778 951
779 $class->SUPER::new ( 952 $class->SUPER::new (
… …
784} 957}
785 958
786sub size_request { 959sub size_request {
787 my ($self) = @_; 960 my ($self) = @_;
788 961
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 963
791 @$self{qw(child_w child_h)} 964 $w = 1 if $self->{scroll_x};
792} 965 $h = 1 if $self->{scroll_y};
793 966
967 ($w, $h)
968}
969
794sub size_allocate { 970sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 971 my ($self, $w, $h) = @_;
796 972
973 my $child = $self->child;
974
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 975 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 976 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 977
800 $self->child->configure (0, 0, $w, $h); 978 $self->child->configure (0, 0, $w, $h);
801 $self->update; 979 $self->update;
980
981 1
802} 982}
803 983
804sub set_offset { 984sub set_offset {
805 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
806 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
807 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
808 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
809 993
994 $self->emit (changed => $x, $y);
810 $self->update; 995 $self->update;
996 }
811} 997}
812 998
813# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
814sub coord2local { 1000sub coord2local {
815 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
830 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
831 1017
832 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
833 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
834 ) { 1020 ) {
835 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
836 } else { 1022 } else {
837 $self->CFClient::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
838 } 1024 }
839} 1025}
840 1026
841sub _render { 1027sub _render {
842 my ($self) = @_; 1028 my ($self) = @_;
843 1029
1030 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1031 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1032
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 1034
846 $self->SUPER::_render; 1035 $self->SUPER::_render;
847} 1036}
848 1037
849############################################################################# 1038#############################################################################
850 1039
851package CFClient::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
852 1041
853our @ISA = CFClient::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
854 1043
855sub new { 1044sub new {
856 my $class = shift; 1045 my ($class, %arg) = @_;
1046
1047 my $child = delete $arg{child};
857 1048
858 my $self; 1049 my $self;
859 1050
860 my $slider = new CFClient::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
861 vertical => 1, 1054 vertical => 0,
862 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 1056 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
865 }, 1059 },
866 ; 1060 ;
867 1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1065 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub {
1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1070 },
1071 ;
1072
868 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
870 slider => $slider, 1077 hslider => $hslider,
871 @_, 1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1081 %arg,
872 ); 1082 );
873 1083
874 $self->{vp}->add ($self->{scrolled}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
875 $self->add ($self->{vp}); 1100 $self->SUPER::add ($self->{vp});
876 $self->add ($self->{slider}); 1101
1102 $self->add ($child) if $child;
877 1103
878 $self 1104 $self
879} 1105}
880 1106
1107#TODO# update range on size_allocate depending on child?
1108
1109sub add {
1110 my ($self, $widget) = @_;
1111
1112 $self->{vp}->add ($self->{child} = $widget);
1113}
1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub update {
1142 my ($self) = @_;
1143
1144 $self->update_slider;
1145 $self->SUPER::update;
1146}
1147
1148sub invoke_mouse_wheel {
1149 my ($self, $ev) = @_;
1150
1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->grab_focus;
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1201}
1202
881sub size_allocate { 1203sub invoke_size_allocate {
882 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
883 1205
1206 $self->update_slider;
884 $self->SUPER::size_allocate ($w, $h); 1207 $self->SUPER::invoke_size_allocate ($w, $h)
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
888} 1208}
889
890#TODO# update range on size_allocate depending on child
891# update viewport offset on scroll
892 1209
893############################################################################# 1210#############################################################################
894 1211
895package CFClient::UI::Frame; 1212package CFPlus::UI::Frame;
896 1213
897our @ISA = CFClient::UI::Bin::; 1214our @ISA = CFPlus::UI::Bin::;
898 1215
899use CFClient::OpenGL; 1216use CFPlus::OpenGL;
900 1217
901sub new { 1218sub new {
902 my $class = shift; 1219 my $class = shift;
903 1220
904 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
912 1229
913 if ($self->{bg}) { 1230 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)}; 1231 my ($w, $h) = @$self{qw(w h)};
915 1232
916 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
918 glColor @{ $self->{bg} }; 1235 glColor_premultiply @{ $self->{bg} };
919 1236
920 glBegin GL_QUADS; 1237 glBegin GL_QUADS;
921 glVertex 0 , 0; 1238 glVertex 0 , 0;
922 glVertex 0 , $h; 1239 glVertex 0 , $h;
923 glVertex $w, $h; 1240 glVertex $w, $h;
… …
930 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
931} 1248}
932 1249
933############################################################################# 1250#############################################################################
934 1251
935package CFClient::UI::FancyFrame; 1252package CFPlus::UI::FancyFrame;
936 1253
937our @ISA = CFClient::UI::Bin::; 1254our @ISA = CFPlus::UI::Bin::;
938 1255
939use CFClient::OpenGL; 1256use CFPlus::OpenGL;
940
941my @tex =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1257
945sub new { 1258sub new {
946 my $class = shift; 1259 my ($class, %arg) = @_;
947 1260
948 # TODO: user_x, user_y, overwrite moveto? 1261 if ((exists $arg{label}) && !ref $arg{label}) {
1262 $arg{label} = new CFPlus::UI::Label
1263 align => 1,
1264 valign => 0,
1265 text => $arg{label},
1266 fontsize => ($arg{border} || 0.8) * 0.75;
1267 }
1268
1269 my $self = $class->SUPER::new (
1270 # label => "",
1271 fg => [0.6, 0.3, 0.1],
1272 border => 0.8,
1273 style => 'single',
1274 %arg,
1275 );
1276
1277 $self
1278}
1279
1280sub add {
1281 my ($self, @widgets) = @_;
1282
1283 $self->SUPER::add (@widgets);
1284 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1285}
1286
1287sub border {
1288 int $_[0]{border} * $::FONTSIZE
1289}
1290
1291sub size_request {
1292 my ($self) = @_;
1293
1294 ($self->{label_w}, undef) = $self->{label}->size_request
1295 if $self->{label};
1296
1297 my ($w, $h) = $self->SUPER::size_request;
1298
1299 (
1300 $w + $self->border * 2,
1301 $h + $self->border * 2,
1302 )
1303}
1304
1305sub invoke_size_allocate {
1306 my ($self, $w, $h) = @_;
1307
1308 my $border = $self->border;
1309
1310 $w -= List::Util::max 0, $border * 2;
1311 $h -= List::Util::max 0, $border * 2;
1312
1313 if (my $label = $self->{label}) {
1314 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1315 $label->{h} = List::Util::min $h, $border;
1316 $label->invoke_size_allocate ($label->{w}, $label->{h});
1317 }
1318
1319 $self->child->configure ($border, $border, $w, $h);
1320
1321 1
1322}
1323
1324sub _draw {
1325 my ($self) = @_;
1326
1327 my $child = $self->{children}[0];
1328
1329 my $border = $self->border;
1330 my ($w, $h) = ($self->{w}, $self->{h});
1331
1332 $child->draw;
1333
1334 glColor @{$self->{fg}};
1335 glBegin GL_LINE_STRIP;
1336 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1337 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1339 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1340 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1341 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1342 glEnd;
1343
1344 if ($self->{label}) {
1345 glTranslate $border * 2, 0;
1346 $self->{label}->_draw;
1347 }
1348}
1349
1350#############################################################################
1351
1352package CFPlus::UI::Toplevel;
1353
1354our @ISA = CFPlus::UI::Bin::;
1355
1356use CFPlus::OpenGL;
1357
1358my $bg =
1359 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1360 mipmap => 1, wrap => 1;
1361
1362my @border =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1370sub new {
1371 my ($class, %arg) = @_;
949 1372
950 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1375 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1376 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1377 can_events => 1,
956 @_ 1378 min_w => 64,
1379 min_h => 32,
1380 %arg,
957 ); 1381 );
958 1382
959 $self->{title} &&= new CFClient::UI::Label 1383 $self->{title_widget} = new CFPlus::UI::Label
960 align => 0, 1384 align => 0,
961 valign => 1, 1385 valign => 1,
962 text => $self->{title}, 1386 text => $self->{title},
963 fontsize => $self->{border}; 1387 fontsize => $self->{border},
1388 if exists $self->{title};
1389
1390 if ($self->{has_close_button}) {
1391 $self->{close_button} =
1392 new CFPlus::UI::ImageButton
1393 path => 'x1_close.png',
1394 on_activate => sub { $self->emit ("delete") };
1395
1396 $self->CFPlus::UI::Container::add ($self->{close_button});
1397 }
964 1398
965 $self 1399 $self
1400}
1401
1402sub add {
1403 my ($self, @widgets) = @_;
1404
1405 $self->SUPER::add (@widgets);
1406 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1407 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
966} 1408}
967 1409
968sub border { 1410sub border {
969 int $_[0]{border} * $::FONTSIZE 1411 int $_[0]{border} * $::FONTSIZE
970} 1412}
971 1413
972sub size_request { 1414sub size_request {
973 my ($self) = @_; 1415 my ($self) = @_;
1416
1417 $self->{title_widget}->size_request
1418 if $self->{title_widget};
1419
1420 $self->{close_button}->size_request
1421 if $self->{close_button};
974 1422
975 my ($w, $h) = $self->SUPER::size_request; 1423 my ($w, $h) = $self->SUPER::size_request;
976 1424
977 ( 1425 (
978 $w + $self->border * 2, 1426 $w + $self->border * 2,
979 $h + $self->border * 2, 1427 $h + $self->border * 2,
980 ) 1428 )
981} 1429}
982 1430
983sub size_allocate { 1431sub invoke_size_allocate {
984 my ($self, $w, $h) = @_; 1432 my ($self, $w, $h) = @_;
985 1433
1434 if ($self->{title_widget}) {
1435 $self->{title_widget}{w} = $w;
1436 $self->{title_widget}{h} = $h;
1437 $self->{title_widget}->invoke_size_allocate ($w, $h);
1438 }
1439
1440 my $border = $self->border;
1441
986 $h -= List::Util::max 0, $self->border * 2; 1442 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1443 $w -= List::Util::max 0, $border * 2;
988 1444
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1445 $self->child->configure ($border, $border, $w, $h);
993}
994 1446
1447 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1448 if $self->{close_button};
1449
1450 1
1451}
1452
1453sub invoke_delete {
1454 my ($self) = @_;
1455
1456 $self->hide;
1457
1458 1
1459}
1460
995sub button_down { 1461sub invoke_button_down {
996 my ($self, $ev, $x, $y) = @_; 1462 my ($self, $ev, $x, $y) = @_;
997 1463
998 my ($w, $h) = @$self{qw(w h)}; 1464 my ($w, $h) = @$self{qw(w h)};
999 my $border = $self->border; 1465 my $border = $self->border;
1000 1466
… …
1013 my ($ev, $x, $y) = @_; 1479 my ($ev, $x, $y) = @_;
1014 1480
1015 my $dx = $ev->{x} - $ox; 1481 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1482 my $dy = $ev->{y} - $oy;
1017 1483
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1484 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1485 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1486
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1487 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1488 $self->realloc;
1022 }; 1489 };
1023 1490
1024 } elsif ($lr ^ $td) { 1491 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1492 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1493 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1495 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1496 my ($ev, $x, $y) = @_;
1030 1497
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1498 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1499
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1500 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1501 # HACK: the next line is required to enforce placement
1502 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1503 };
1504 } else {
1505 return 0;
1506 }
1507
1036 } 1508 1
1037} 1509}
1038 1510
1039sub button_up { 1511sub invoke_button_up {
1040 my ($self, $ev, $x, $y) = @_; 1512 my ($self, $ev, $x, $y) = @_;
1041 1513
1042 delete $self->{motion}; 1514 ! ! delete $self->{motion}
1043} 1515}
1044 1516
1045sub mouse_motion { 1517sub invoke_mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1518 my ($self, $ev, $x, $y) = @_;
1047 1519
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1520 $self->{motion}->($ev, $x, $y) if $self->{motion};
1521
1522 ! ! $self->{motion}
1523}
1524
1525sub invoke_visibility_change {
1526 my ($self, $visible) = @_;
1527
1528 delete $self->{motion} unless $visible;
1529
1530 0
1049} 1531}
1050 1532
1051sub _draw { 1533sub _draw {
1052 my ($self) = @_; 1534 my ($self) = @_;
1053 1535
1536 my $child = $self->{children}[0];
1537
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1538 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1539 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1540
1057 glEnable GL_TEXTURE_2D; 1541 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1543
1060 my $border = $self->border; 1544 my $border = $self->border;
1061 1545
1062 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1067 1565
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1567 glColor @{ $self->{bg} };
1070 1568
1071 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
1570 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1571 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1572 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1573 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1574 }
1082 1575
1083 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1084 1577
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1578 $child->draw;
1579
1580 if ($self->{title_widget}) {
1581 glTranslate 0, $border - $self->{h};
1582 $self->{title_widget}->_draw;
1583
1584 glTranslate 0, - ($border - $self->{h});
1585 }
1586
1587 $self->{close_button}->draw
1588 if $self->{close_button};
1088} 1589}
1089 1590
1090############################################################################# 1591#############################################################################
1091 1592
1092package CFClient::UI::Table; 1593package CFPlus::UI::Table;
1093 1594
1094our @ISA = CFClient::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1095 1596
1096use List::Util qw(max sum); 1597use List::Util qw(max sum);
1097 1598
1098use CFClient::OpenGL; 1599use CFPlus::OpenGL;
1099 1600
1100sub new { 1601sub new {
1101 my $class = shift; 1602 my $class = shift;
1102 1603
1103 $class->SUPER::new ( 1604 $class->SUPER::new (
1104 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1105 @_, 1607 @_,
1106 ) 1608 )
1107} 1609}
1108 1610
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1111}
1112
1113sub add { 1611sub add {
1114 my ($self, $x, $y, $child) = @_;
1115
1116 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child;
1118
1119 $self->check_size (1);
1120}
1121
1122# TODO: move to container class maybe? send children a signal on removal?
1123sub clear {
1124 my ($self) = @_; 1612 my ($self, @widgets) = @_;
1613
1614 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1618
1619 $self->SUPER::add (@widgets);
1620}
1621
1622sub add_at {
1623 my $self = shift;
1624
1625 my @widgets;
1626
1627 while (@_) {
1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1629
1630 $child->{row} = $row;
1631 $child->{col} = $col;
1632
1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1640 my ($self) = @_;
1641
1642 my (@w, @h);
1125 1643
1126 my @children = $self->children; 1644 my @children = $self->children;
1127 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1128 1655 }
1129 for (@children) {
1130 delete $_->{parent};
1131 $_->hide;
1132 }
1133 1656
1134 $self->check_size (1); 1657 # second pass, rows
1135 $self->update; 1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1136}
1137
1138sub get_wh {
1139 my ($self) = @_;
1140
1141 my (@w, @h);
1142
1143 for my $y (0 .. $#{$self->{children}}) {
1144 my $row = $self->{children}[$y]
1145 or next;
1146
1147 for my $x (0 .. $#$row) {
1148 my $widget = $row->[$x]
1149 or next;
1150 my ($w, $h) = @$widget{qw(req_w req_h)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1151 1660
1152 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1153 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1154 } 1665 }
1155 } 1666 }
1156 1667
1157 (\@w, \@h) 1668 (\@w, \@h)
1158} 1669}
… …
1166 (sum @$ws), 1677 (sum @$ws),
1167 (sum @$hs), 1678 (sum @$hs),
1168 ) 1679 )
1169} 1680}
1170 1681
1171sub size_allocate { 1682sub invoke_size_allocate {
1172 my ($self, $w, $h) = @_; 1683 my ($self, $w, $h) = @_;
1173 1684
1174 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1175 1686
1176 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1177 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1178 1689
1179 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1180 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1183 1694
1184 # linearly scale sizes
1185 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1186 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1187 1696
1188 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1189 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1190 1706
1191 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1192 1709
1193 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1194 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1195 or next;
1196 1712
1197 my $x = 0; 1713 $widget->configure (
1198 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1199 1716 );
1200 for my $c (0 .. $#$row) { 1717 }
1201 my $col_w = $ws->[$c];
1202 1718
1203 if (my $widget = $row->[$c]) { 1719 1
1204 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1205 }
1206 1721
1207 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1208 } 1760 }
1209
1210 $y += $row_h;
1211 } 1761 }
1212 1762
1213} 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1214 1765
1215sub find_widget { 1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1216 my ($self, $x, $y) = @_; 1788 my ($self, $W, $H) = @_;
1217 1789
1218 $x -= $self->{x}; 1790 for my $child ($self->visible_children) {
1219 $y -= $self->{y}; 1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1220 1792
1221 my $res; 1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1222 1797
1223 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1798 $child->configure ($x, $y, $w, $h);
1224 $res = $_->find_widget ($x, $y) 1799 }
1225 and return $res; 1800
1226 } 1801 1
1227
1228 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1229}
1230
1231sub _draw {
1232 my ($self) = @_;
1233
1234 for (grep $_, @{$self->{children}}) {
1235 $_->draw for grep $_, @$_;
1236 }
1237} 1802}
1238 1803
1239############################################################################# 1804#############################################################################
1240 1805
1241package CFClient::UI::HBox; 1806package CFPlus::UI::Box;
1242 1807
1243# TODO: wrap into common Box base class
1244
1245our @ISA = CFClient::UI::Container::; 1808our @ISA = CFPlus::UI::Container::;
1246 1809
1247sub size_request { 1810sub size_request {
1248 my ($self) = @_; 1811 my ($self) = @_;
1249 1812
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1813 $self->{vertical}
1814 ? (
1815 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1816 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1817 )
1818 : (
1819 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1820 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1821 )
1822}
1251 1823
1824sub invoke_size_allocate {
1825 my ($self, $w, $h) = @_;
1826
1827 my $space = $self->{vertical} ? $h : $w;
1828 my @children = $self->visible_children;
1829
1830 my @req;
1831
1832 if ($self->{homogeneous}) {
1833 @req = ($space / (@children || 1)) x @children;
1834 } else {
1835 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1836 my $req = List::Util::sum @req;
1837
1838 if ($req > $space) {
1839 # ah well, not enough space
1840 $_ *= $space / $req for @req;
1841 } else {
1842 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1843
1844 $space = ($space - $req) / $expand; # remaining space to give away
1845
1846 $req[$_] += $space * $children[$_]{expand}
1847 for 0 .. $#children;
1848 }
1252 ( 1849 }
1253 (List::Util::sum map $_->[0], @alloc), 1850
1254 (List::Util::max map $_->[1], @alloc), 1851 CFPlus::UI::harmonize \@req;
1852
1853 my $pos = 0;
1854 for (0 .. $#children) {
1855 my $alloc = $req[$_];
1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1857
1858 $pos += $alloc;
1859 }
1860
1861 1
1862}
1863
1864#############################################################################
1865
1866package CFPlus::UI::HBox;
1867
1868our @ISA = CFPlus::UI::Box::;
1869
1870sub new {
1871 my $class = shift;
1872
1873 $class->SUPER::new (
1874 vertical => 0,
1875 @_,
1255 ) 1876 )
1256} 1877}
1257 1878
1258sub size_allocate {
1259 my ($self, $w, $h) = @_;
1260
1261 ($h, $w) = ($w, $h);
1262
1263 my $children = $self->{children};
1264
1265 my @h = map $_->{req_w}, @$children;
1266
1267 my $req_h = List::Util::sum @h;
1268
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children;
1274 $exp ||= 1;
1275
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 }
1283 }
1284
1285 CFClient::UI::harmonize \@h;
1286
1287 my $y = 0;
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_];
1291 $child->configure ($y, 0, $h, $w);
1292
1293 $y += $h;
1294 }
1295
1296 1
1297}
1298
1299############################################################################# 1879#############################################################################
1300 1880
1301package CFClient::UI::VBox; 1881package CFPlus::UI::VBox;
1302 1882
1303# TODO: wrap into common Box base class 1883our @ISA = CFPlus::UI::Box::;
1304 1884
1305our @ISA = CFClient::UI::Container::; 1885sub new {
1886 my $class = shift;
1306 1887
1307sub size_request { 1888 $class->SUPER::new (
1308 my ($self) = @_; 1889 vertical => 1,
1309 1890 @_,
1310 my @alloc = map [$_->size_request], @{$self->{children}};
1311
1312 (
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1891 )
1316} 1892}
1317 1893
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355}
1356
1357############################################################################# 1894#############################################################################
1358 1895
1359package CFClient::UI::Label; 1896package CFPlus::UI::Label;
1360 1897
1361our @ISA = CFClient::UI::DrawBG::; 1898our @ISA = CFPlus::UI::DrawBG::;
1362 1899
1363use CFClient::OpenGL; 1900use CFPlus::OpenGL;
1364 1901
1365sub new { 1902sub new {
1366 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1367 1904
1368 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1371 #active_bg => none 1908 #active_bg => none
1372 #font => default_font 1909 #font => default_font
1373 #text => initial text 1910 #text => initial text
1374 #markup => initial narkup 1911 #markup => initial narkup
1375 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1913 #style => 0, # render flags
1376 ellipsise => 3, # end 1914 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1915 layout => (new CFPlus::Layout),
1378 fontsize => 1, 1916 fontsize => 1,
1379 align => -1, 1917 align => -1,
1380 valign => -1, 1918 valign => -1,
1381 padding => 2, 1919 padding_x => 2,
1920 padding_y => 2,
1382 can_events => 0, 1921 can_events => 0,
1383 %arg 1922 %arg
1384 ); 1923 );
1385 1924
1386 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1387 my $layout = new CFClient::Layout; 1926 my $layout = new CFPlus::Layout;
1388 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1389 $self->{template} = $layout; 1928 $self->{template} = $layout;
1390 } 1929 }
1391 1930
1392 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1396 } 1935 }
1397 1936
1398 $self 1937 $self
1399} 1938}
1400 1939
1401sub escape($) {
1402 local $_ = $_[0];
1403
1404 s/&/&amp;/g;
1405 s/>/&gt;/g;
1406 s/</&lt;/g;
1407
1408 $_
1409}
1410
1411sub update { 1940sub update {
1412 my ($self) = @_; 1941 my ($self) = @_;
1413 1942
1414 delete $self->{texture}; 1943 delete $self->{texture};
1415 $self->SUPER::update; 1944 $self->SUPER::update;
1416} 1945}
1417 1946
1947sub realloc {
1948 my ($self) = @_;
1949
1950 delete $self->{ox};
1951 $self->SUPER::realloc;
1952}
1953
1418sub set_text { 1954sub set_text {
1419 my ($self, $text) = @_; 1955 my ($self, $text) = @_;
1420 1956
1421 return if $self->{text} eq "T$text"; 1957 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text"; 1958 $self->{text} = "T$text";
1423 1959
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1960 $self->{layout}->set_text ($text);
1426 1961
1962 delete $self->{size_req};
1963 $self->realloc;
1427 $self->update; 1964 $self->update;
1428 $self->check_size;
1429} 1965}
1430 1966
1431sub set_markup { 1967sub set_markup {
1432 my ($self, $markup) = @_; 1968 my ($self, $markup) = @_;
1433 1969
1434 return if $self->{text} eq "M$markup"; 1970 return if $self->{text} eq "M$markup";
1435 $self->{text} = "M$markup"; 1971 $self->{text} = "M$markup";
1436 1972
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1973 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1974
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1975 $self->{layout}->set_markup ($markup);
1441 1976
1977 delete $self->{size_req};
1978 $self->realloc;
1442 $self->update; 1979 $self->update;
1443 $self->check_size;
1444} 1980}
1445 1981
1446sub size_request { 1982sub size_request {
1447 my ($self) = @_; 1983 my ($self) = @_;
1448 1984
1985 $self->{size_req} ||= do {
1449 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1454 1991
1455 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1456 1993
1457 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1996 $self->{template}->set_width ($self->{max_w} || -1);
1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1460 1998
1461 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1462 2000
1463 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 2002 $h = List::Util::max $h, $h2;
2003 }
2004
2005 [$w, $h]
1465 } 2006 };
1466 2007
1467 ( 2008 @{ $self->{size_req} }
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 2009}
1472 2010
2011sub baseline_shift {
2012 $_[0]{layout}->descent
2013}
2014
1473sub size_allocate { 2015sub invoke_size_allocate {
1474 my ($self, $w, $h) = @_; 2016 my ($self, $w, $h) = @_;
1475 2017
2018 delete $self->{ox};
2019
1476 delete $self->{texture}; 2020 delete $self->{texture}
2021 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2022
2023 1
1477} 2024}
1478 2025
1479sub set_fontsize { 2026sub set_fontsize {
1480 my ($self, $fontsize) = @_; 2027 my ($self, $fontsize) = @_;
1481 2028
1482 $self->{fontsize} = $fontsize; 2029 $self->{fontsize} = $fontsize;
2030 delete $self->{size_req};
1483 delete $self->{texture}; 2031 delete $self->{texture};
1484 2032
1485 $self->update; 2033 $self->realloc;
1486 $self->check_size; 2034}
2035
2036sub reconfigure {
2037 my ($self) = @_;
2038
2039 delete $self->{size_req};
2040 delete $self->{texture};
2041
2042 $self->SUPER::reconfigure;
1487} 2043}
1488 2044
1489sub _draw { 2045sub _draw {
1490 my ($self) = @_; 2046 my ($self) = @_;
1491 2047
1492 $self->SUPER::_draw; # draw background, if applicable 2048 $self->SUPER::_draw; # draw background, if applicable
1493 2049
1494 my $tex = $self->{texture} ||= do { 2050 my $size = $self->{texture} ||= do {
1495 $self->{layout}->set_foreground (@{$self->{fg}}); 2051 $self->{layout}->set_foreground (@{$self->{fg}});
1496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2052 $self->{layout}->set_font ($self->{font}) if $self->{font};
1497 $self->{layout}->set_width ($self->{w}); 2053 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2054 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2055 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2056 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 2057
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2058 [$self->{layout}->size]
1503
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1506 : ($self->{w} - $tex->{w}) * 0.5);
1507
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1510 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 2059 };
1514 2060
1515 glEnable GL_TEXTURE_2D; 2061 unless (exists $self->{ox}) {
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2063 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2064 : ($self->{w} - $size->[0]) * 0.5);
1517 2065
1518 if ($tex->{format} == GL_ALPHA) { 2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 glColor @{$self->{fg}}; 2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2068 : ($self->{h} - $size->[1]) * 0.5);
1521 } else {
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 } 2069 };
1524 2070
1525 glDisable GL_TEXTURE_2D; 2071 my $w = List::Util::min $self->{w} + 4, $size->[0];
2072 my $h = List::Util::min $self->{h} + 2, $size->[1];
2073
2074 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1526} 2075}
1527 2076
1528############################################################################# 2077#############################################################################
1529 2078
1530package CFClient::UI::EntryBase; 2079package CFPlus::UI::EntryBase;
1531 2080
1532our @ISA = CFClient::UI::Label::; 2081our @ISA = CFPlus::UI::Label::;
1533 2082
1534use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1535 2084
1536sub new { 2085sub new {
1537 my $class = shift; 2086 my $class = shift;
1538 2087
1539 $class->SUPER::new ( 2088 $class->SUPER::new (
… …
1543 active_fg => [0, 0, 0], 2092 active_fg => [0, 0, 0],
1544 can_hover => 1, 2093 can_hover => 1,
1545 can_focus => 1, 2094 can_focus => 1,
1546 valign => 0, 2095 valign => 0,
1547 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1548 #text => ... 2098 #text => ...
2099 #hidden => "*",
1549 @_ 2100 @_
1550 ) 2101 )
1551} 2102}
1552 2103
1553sub _set_text { 2104sub _set_text {
… …
1555 2106
1556 delete $self->{cur_h}; 2107 delete $self->{cur_h};
1557 2108
1558 return if $self->{text} eq $text; 2109 return if $self->{text} eq $text;
1559 2110
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 2112 $self->{text} = $text;
1564 2113
1565 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
2116 delete $self->{size_req};
1567 2117
1568 $self->_emit (changed => $self->{text}); 2118 $self->emit (changed => $self->{text});
2119
2120 $self->realloc;
2121 $self->update;
1569} 2122}
1570 2123
1571sub set_text { 2124sub set_text {
1572 my ($self, $text) = @_; 2125 my ($self, $text) = @_;
1573 2126
1574 $self->{cursor} = length $text; 2127 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 2128 $self->_set_text ($text);
1576 $self->update;
1577 $self->check_size;
1578} 2129}
1579 2130
1580sub get_text { 2131sub get_text {
1581 $_[0]{text} 2132 $_[0]{text}
1582} 2133}
… …
1587 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1588 2139
1589 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1590} 2141}
1591 2142
1592sub key_down { 2143sub invoke_key_down {
1593 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1594 2145
1595 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1596 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1597 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1598 2149
1599 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1600 2153
1601 if ($uni == 8) { 2154 if ($uni == 8) {
1602 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1603 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1604 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1605 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1606 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1607 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1608 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1609 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1610 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1611 } elsif ($sym == CFClient::SDLK_END) {
1612 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 2178 $self->emit ('escape');
1615 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
2183 } else {
2184 return 0;
1617 } 2185 }
1618 2186
1619 $self->_set_text ($text); 2187 $self->_set_text ($text);
2188
2189 $self->realloc;
1620 $self->update; 2190 $self->update;
1621 $self->check_size;
1622}
1623 2191
2192 1
2193}
2194
1624sub focus_in { 2195sub invoke_focus_in {
1625 my ($self) = @_; 2196 my ($self) = @_;
1626 2197
1627 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1628 2199
1629 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1630} 2201}
1631 2202
1632sub button_down { 2203sub invoke_button_down {
1633 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1634 2205
1635 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1636 2207
1637 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1638 2209
1639 # byte-index to char-index 2210 # byte-index to char-index
1640 my $text = $self->{text}; 2211 my $text = $self->{text};
1641 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1643 2214
1644 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1645 $self->update; 2216 $self->update;
2217
2218 1
1646} 2219}
1647 2220
1648sub mouse_motion { 2221sub invoke_mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1650# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2223# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2224
2225 1
1651} 2226}
1652 2227
1653sub _draw { 2228sub _draw {
1654 my ($self) = @_; 2229 my ($self) = @_;
1655 2230
1656 local $self->{fg} = $self->{fg}; 2231 local $self->{fg} = $self->{fg};
1657 2232
1658 if ($FOCUS == $self) { 2233 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 2234 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 2235 $self->{fg} = $self->{active_fg};
1661 } else { 2236 } else {
1662 glColor @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1663 } 2238 }
1664 2239
1665 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 2242 glBegin GL_QUADS;
1668 glVertex 0 , 0; 2243 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 2244 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 2245 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 2246 glVertex $self->{w}, 0;
… …
1682 utf8::encode $text; 2257 utf8::encode $text;
1683 2258
1684 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1685 } 2260 }
1686 2261
1687 glColor @{$self->{fg}};
1688 glBegin GL_LINES; 2262 glBegin GL_LINES;
1689 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1690 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1691 glEnd; 2265 glEnd;
1692 } 2266 }
1693} 2267}
1694 2268
2269#############################################################################
2270
1695package CFClient::UI::Entry; 2271package CFPlus::UI::Entry;
1696 2272
1697our @ISA = CFClient::UI::EntryBase::; 2273our @ISA = CFPlus::UI::EntryBase::;
1698 2274
1699use CFClient::OpenGL; 2275use CFPlus::OpenGL;
1700 2276
1701sub key_down { 2277sub invoke_key_down {
1702 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
1703 2279
1704 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
1705 2281
1706 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
1707 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
1708 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
2285
1709 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
1710 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
1711 $self->_emit (activate => $txt); 2288 $self->emit (activate => $txt);
1712 $self->update; 2289 $self->update;
1713 2290
1714 } elsif ($sym == CFClient::SDLK_UP) { 2291 } elsif ($sym == CFPlus::SDLK_UP) {
1715 if ($self->{history_pointer} < 0) { 2292 if ($self->{history_pointer} < 0) {
1716 $self->{history_saveback} = $self->get_text; 2293 $self->{history_saveback} = $self->get_text;
1717 } 2294 }
1718 if (@{$self->{history} || []} > 0) { 2295 if (@{$self->{history} || []} > 0) {
1719 $self->{history_pointer}++; 2296 $self->{history_pointer}++;
… …
1721 $self->{history_pointer} = @{$self->{history} || []} - 1; 2298 $self->{history_pointer} = @{$self->{history} || []} - 1;
1722 } 2299 }
1723 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2300 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1724 } 2301 }
1725 2302
1726 } elsif ($sym == CFClient::SDLK_DOWN) { 2303 } elsif ($sym == CFPlus::SDLK_DOWN) {
1727 $self->{history_pointer}--; 2304 $self->{history_pointer}--;
1728 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2305 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1729 2306
1730 if ($self->{history_pointer} >= 0) { 2307 if ($self->{history_pointer} >= 0) {
1731 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2308 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1732 } else { 2309 } else {
1733 $self->set_text ($self->{history_saveback}); 2310 $self->set_text ($self->{history_saveback});
1734 } 2311 }
1735 2312
1736 } else { 2313 } else {
1737 $self->SUPER::key_down ($ev); 2314 return $self->SUPER::invoke_key_down ($ev)
2315 }
2316
1738 } 2317 1
1739
1740} 2318}
1741 2319
1742############################################################################# 2320#############################################################################
1743 2321
2322package CFPlus::UI::TextEdit;
2323
2324our @ISA = CFPlus::UI::EntryBase::;
2325
2326use CFPlus::OpenGL;
2327
2328sub move_cursor_ver {
2329 my ($self, $dy) = @_;
2330
2331 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2332
2333 $y += $dy;
2334
2335 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2336 $self->{cursor} = $index;
2337 delete $self->{cur_h};
2338 $self->update;
2339 return;
2340 }
2341}
2342
2343sub invoke_key_down {
2344 my ($self, $ev) = @_;
2345
2346 my $sym = $ev->{sym};
2347
2348 if ($sym == CFPlus::SDLK_UP) {
2349 $self->move_cursor_ver (-1);
2350 } elsif ($sym == CFPlus::SDLK_DOWN) {
2351 $self->move_cursor_ver (+1);
2352 } else {
2353 return $self->SUPER::invoke_key_down ($ev)
2354 }
2355
2356 1
2357}
2358
2359#############################################################################
2360
1744package CFClient::UI::Button; 2361package CFPlus::UI::Button;
1745 2362
1746our @ISA = CFClient::UI::Label::; 2363our @ISA = CFPlus::UI::Label::;
1747 2364
1748use CFClient::OpenGL; 2365use CFPlus::OpenGL;
1749 2366
1750my @tex = 2367my @tex =
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1752 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
1753 2370
1754sub new { 2371sub new {
1755 my $class = shift; 2372 my $class = shift;
1756 2373
1757 $class->SUPER::new ( 2374 $class->SUPER::new (
1758 padding => 4, 2375 padding_x => 4,
2376 padding_y => 4,
1759 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
1760 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
1761 can_hover => 1, 2379 can_hover => 1,
1762 align => 0, 2380 align => 0,
1763 valign => 0, 2381 valign => 0,
1764 can_events => 1, 2382 can_events => 1,
1765 @_ 2383 @_
1766 ) 2384 )
1767} 2385}
1768 2386
1769sub activate { }
1770
1771sub button_up { 2387sub invoke_button_up {
1772 my ($self, $ev, $x, $y) = @_; 2388 my ($self, $ev, $x, $y) = @_;
1773 2389
1774 $self->emit ("activate") 2390 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 2391 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 2392 && $y >= 0 && $y < $self->{h};
2393
2394 1
1777} 2395}
1778 2396
1779sub _draw { 2397sub _draw {
1780 my ($self) = @_; 2398 my ($self) = @_;
1781 2399
1782 local $self->{fg} = $self->{fg}; 2400 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 2401
1788 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
1791 2405
2406 my $tex = $tex[$GRAB == $self];
1792 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1793 2408
1794 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1795 2410
1796 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
1797} 2412}
1798 2413
1799############################################################################# 2414#############################################################################
1800 2415
1801package CFClient::UI::CheckBox; 2416package CFPlus::UI::CheckBox;
1802 2417
1803our @ISA = CFClient::UI::DrawBG::; 2418our @ISA = CFPlus::UI::DrawBG::;
1804 2419
1805my @tex = 2420my @tex =
1806 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1807 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2422 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1808 2423
1809use CFClient::OpenGL; 2424use CFPlus::OpenGL;
1810 2425
1811sub new { 2426sub new {
1812 my $class = shift; 2427 my $class = shift;
1813 2428
1814 $class->SUPER::new ( 2429 $class->SUPER::new (
1815 padding => 2, 2430 padding_x => 2,
2431 padding_y => 2,
1816 fg => [1, 1, 1], 2432 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 2433 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 2434 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 2435 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 2436 state => 0,
… …
1824} 2440}
1825 2441
1826sub size_request { 2442sub size_request {
1827 my ($self) = @_; 2443 my ($self) = @_;
1828 2444
1829 ($self->{padding} * 2 + 6) x 2 2445 (6) x 2
1830} 2446}
1831 2447
2448sub toggle {
2449 my ($self) = @_;
2450
2451 $self->{state} = !$self->{state};
2452 $self->emit (changed => $self->{state});
2453 $self->update;
2454}
2455
1832sub button_down { 2456sub invoke_button_down {
1833 my ($self, $ev, $x, $y) = @_; 2457 my ($self, $ev, $x, $y) = @_;
1834 2458
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2459 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2460 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 2461 $self->toggle;
1838 $self->_emit (changed => $self->{state}); 2462 } else {
2463 return 0
2464 }
2465
1839 } 2466 1
1840} 2467}
1841 2468
1842sub _draw { 2469sub _draw {
1843 my ($self) = @_; 2470 my ($self) = @_;
1844 2471
1845 $self->SUPER::_draw; 2472 $self->SUPER::_draw;
1846 2473
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2474 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 2475
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2476 my ($w, $h) = @$self{qw(w h)};
2477
2478 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 2479
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2480 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 2481
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2482 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 2483
… …
1857 glDisable GL_TEXTURE_2D; 2486 glDisable GL_TEXTURE_2D;
1858} 2487}
1859 2488
1860############################################################################# 2489#############################################################################
1861 2490
1862package CFClient::UI::Image; 2491package CFPlus::UI::Image;
1863 2492
1864our @ISA = CFClient::UI::Base::; 2493our @ISA = CFPlus::UI::Base::;
1865 2494
1866use CFClient::OpenGL; 2495use CFPlus::OpenGL;
1867use Carp qw/confess/;
1868 2496
1869our %loaded_images; 2497our %texture_cache;
1870 2498
1871sub new { 2499sub new {
1872 my $class = shift; 2500 my $class = shift;
1873 2501
1874 my $self = $class->SUPER::new (can_events => 0, @_); 2502 my $self = $class->SUPER::new (
2503 can_events => 0,
2504 @_,
2505 );
1875 2506
1876 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2507 $self->{path} || $self->{tex}
2508 or Carp::croak "'path' or 'tex' attributes required";
1877 2509
1878 $loaded_images{$self->{image}} ||= 2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1879 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2511 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1880 2512
1881 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2513 CFPlus::weaken $texture_cache{$self->{path}};
1882 2514
1883 Scalar::Util::weaken $loaded_images{$self->{image}}; 2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1884
1885 $self->{aspect} = $tex->{w} / $tex->{h};
1886 2516
1887 $self 2517 $self
1888} 2518}
1889 2519
2520sub STORABLE_freeze {
2521 my ($self, $cloning) = @_;
2522
2523 $self->{path}
2524 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2525
2526 $self->{path}
2527}
2528
2529sub STORABLE_attach {
2530 my ($self, $cloning, $path) = @_;
2531
2532 $self->new (path => $path)
2533}
2534
1890sub size_request { 2535sub size_request {
1891 my ($self) = @_; 2536 my ($self) = @_;
1892 2537
1893 ($self->{tex}->{w}, $self->{tex}->{h}) 2538 ($self->{tex}{w}, $self->{tex}{h})
1894} 2539}
1895 2540
1896sub _draw { 2541sub _draw {
1897 my ($self) = @_; 2542 my ($self) = @_;
1898 2543
… …
1908 } 2553 }
1909 2554
1910 glEnable GL_TEXTURE_2D; 2555 glEnable GL_TEXTURE_2D;
1911 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1912 2557
1913 $tex->draw_quad_alpha (0, 0, $w, $h); 2558 $tex->draw_quad (0, 0, $w, $h);
1914 2559
1915 glDisable GL_TEXTURE_2D; 2560 glDisable GL_TEXTURE_2D;
1916} 2561}
1917 2562
1918############################################################################# 2563#############################################################################
1919 2564
2565package CFPlus::UI::ImageButton;
2566
2567our @ISA = CFPlus::UI::Image::;
2568
2569use CFPlus::OpenGL;
2570
2571my %textures;
2572
2573sub new {
2574 my $class = shift;
2575
2576 my $self = $class->SUPER::new (
2577 padding_x => 4,
2578 padding_y => 4,
2579 fg => [1, 1, 1],
2580 active_fg => [0, 0, 1],
2581 can_hover => 1,
2582 align => 0,
2583 valign => 0,
2584 can_events => 1,
2585 @_
2586 );
2587}
2588
2589sub invoke_button_up {
2590 my ($self, $ev, $x, $y) = @_;
2591
2592 $self->emit ("activate")
2593 if $x >= 0 && $x < $self->{w}
2594 && $y >= 0 && $y < $self->{h};
2595
2596 1
2597}
2598
2599#############################################################################
2600
1920package CFClient::UI::VGauge; 2601package CFPlus::UI::VGauge;
1921 2602
1922our @ISA = CFClient::UI::Base::; 2603our @ISA = CFPlus::UI::Base::;
1923 2604
1924use List::Util qw(min max); 2605use List::Util qw(min max);
1925 2606
1926use CFClient::OpenGL; 2607use CFPlus::OpenGL;
1927 2608
1928my %tex = ( 2609my %tex = (
1929 food => [ 2610 food => [
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2612 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1932 ], 2613 ],
1933 grace => [ 2614 grace => [
1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1935 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2616 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1936 ], 2617 ],
1937 hp => [ 2618 hp => [
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2620 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1940 ], 2621 ],
1941 mana => [ 2622 mana => [
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2623 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2624 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1944 ], 2625 ],
1945); 2626);
1946 2627
1947# eg. VGauge->new (gauge => 'food'), default gauge: food 2628# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2007 my $ycut1 = max 0, min 1, $ycut; 2688 my $ycut1 = max 0, min 1, $ycut;
2008 my $ycut2 = max 0, min 1, $ycut - 1; 2689 my $ycut2 = max 0, min 1, $ycut - 1;
2009 2690
2010 my $h1 = $self->{h} * (1 - $ycut1); 2691 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2692 my $h2 = $self->{h} * (1 - $ycut2);
2693 my $h3 = $self->{h};
2694
2695 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2012 2696
2013 glEnable GL_BLEND; 2697 glEnable GL_BLEND;
2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2698 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2699 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2015 glEnable GL_TEXTURE_2D; 2700 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2702
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2703 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2704 glBegin GL_QUADS;
… …
2034 2719
2035 if ($t3) { 2720 if ($t3) {
2036 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2721 glBindTexture GL_TEXTURE_2D, $t3->{name};
2037 glBegin GL_QUADS; 2722 glBegin GL_QUADS;
2038 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2723 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2039 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2724 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2040 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2725 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2041 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2726 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2042 glEnd; 2727 glEnd;
2043 } 2728 }
2044 2729
2045 glDisable GL_BLEND; 2730 glDisable GL_BLEND;
2046 glDisable GL_TEXTURE_2D; 2731 glDisable GL_TEXTURE_2D;
2047} 2732}
2048 2733
2049############################################################################# 2734#############################################################################
2050 2735
2051package CFClient::UI::Gauge; 2736package CFPlus::UI::Gauge;
2052 2737
2053our @ISA = CFClient::UI::VBox::; 2738our @ISA = CFPlus::UI::VBox::;
2054 2739
2055sub new { 2740sub new {
2056 my ($class, %arg) = @_; 2741 my ($class, %arg) = @_;
2057 2742
2058 my $self = $class->SUPER::new ( 2743 my $self = $class->SUPER::new (
… …
2060 can_hover => 1, 2745 can_hover => 1,
2061 can_events => 1, 2746 can_events => 1,
2062 %arg, 2747 %arg,
2063 ); 2748 );
2064 2749
2065 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2750 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2066 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2751 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2067 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2752 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2068 2753
2069 $self 2754 $self
2070} 2755}
2071 2756
2072sub set_fontsize { 2757sub set_fontsize {
… …
2093 $self->{value}->set_text ($val); 2778 $self->{value}->set_text ($val);
2094} 2779}
2095 2780
2096############################################################################# 2781#############################################################################
2097 2782
2098package CFClient::UI::Slider; 2783package CFPlus::UI::Slider;
2099 2784
2100use strict; 2785use strict;
2101 2786
2102use CFClient::OpenGL; 2787use CFPlus::OpenGL;
2103 2788
2104our @ISA = CFClient::UI::DrawBG::; 2789our @ISA = CFPlus::UI::DrawBG::;
2105 2790
2106my @tex = 2791my @tex =
2107 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2792 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2108 qw(s1_slider.png s1_slider_bg.png); 2793 qw(s1_slider.png s1_slider_bg.png);
2109 2794
2110sub new { 2795sub new {
2111 my $class = shift; 2796 my $class = shift;
2112 2797
… …
2119 fg => [1, 1, 1], 2804 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2805 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2806 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2807 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2808 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2809 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2810 min_h => $::WIDTH / 80,
2126 vertical => 0, 2811 vertical => 0,
2127 can_hover => 1, 2812 can_hover => 1,
2128 inner_pad => 0.02, 2813 inner_pad => 0.02,
2129 @_ 2814 @_
2130 ); 2815 );
… …
2136} 2821}
2137 2822
2138sub set_range { 2823sub set_range {
2139 my ($self, $range) = @_; 2824 my ($self, $range) = @_;
2140 2825
2141 $self->{range} = $range; 2826 ($range, $self->{range}) = ($self->{range}, $range);
2142 2827
2828 if ("@$range" ne "@{$self->{range}}") {
2143 $self->update; 2829 $self->update;
2830 $self->set_value ($self->{range}[0]);
2831 }
2144} 2832}
2145 2833
2146sub set_value { 2834sub set_value {
2147 my ($self, $value) = @_; 2835 my ($self, $value) = @_;
2148 2836
… …
2159 if $unit; 2847 if $unit;
2160 2848
2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2849 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2162 2850
2163 if ($value != $old_value) { 2851 if ($value != $old_value) {
2164 $self->_emit (changed => $value); 2852 $self->emit (changed => $value);
2165 $self->update; 2853 $self->update;
2166 } 2854 }
2167} 2855}
2168 2856
2169sub size_request { 2857sub size_request {
2170 my ($self) = @_; 2858 my ($self) = @_;
2171 2859
2172 my $w = $self->{req_w}; 2860 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2861}
2177 2862
2178sub button_down { 2863sub invoke_button_down {
2179 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2180 2865
2181 $self->SUPER::button_down ($ev, $x, $y); 2866 $self->SUPER::invoke_button_down ($ev, $x, $y);
2182 2867
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2868 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2869
2185 $self->mouse_motion ($ev, $x, $y); 2870 $self->invoke_mouse_motion ($ev, $x, $y)
2186} 2871}
2187 2872
2188sub mouse_motion { 2873sub invoke_mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2190 2875
2191 if ($GRAB == $self) { 2876 if ($GRAB == $self) {
2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2877 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2193 2878
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2879 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2880
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2881 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2882
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2883 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2884 } else {
2885 return 0;
2886 }
2887
2199 } 2888 1
2889}
2890
2891sub invoke_mouse_wheel {
2892 my ($self, $ev) = @_;
2893
2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899
2900 ! ! $delta
2200} 2901}
2201 2902
2202sub update { 2903sub update {
2203 my ($self) = @_; 2904 my ($self) = @_;
2204 2905
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2906 delete $self->{knob_w};
2907 $self->SUPER::update;
2908}
2909
2910sub _draw {
2911 my ($self) = @_;
2912
2913 unless ($self->{knob_w}) {
2206 $self->set_value ($self->{range}[0]); 2914 $self->set_value ($self->{range}[0]);
2207 2915
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2916 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2917 my $range = ($hi - $page - $lo) || 1e-100;
2210 2918
… …
2216 $value = ($value - $lo) / $range; 2924 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2925 $value = $value * $self->{scale} + $self->{offset};
2218 2926
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2927 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2928 $self->{knob_w} = $knob_w;
2221 }); 2929 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2930
2229 $self->SUPER::_draw (); 2931 $self->SUPER::_draw ();
2230 2932
2231 glScale $self->{w}, $self->{h}; 2933 glScale $self->{w}, $self->{h};
2232 2934
… …
2252 glDisable GL_TEXTURE_2D; 2954 glDisable GL_TEXTURE_2D;
2253} 2955}
2254 2956
2255############################################################################# 2957#############################################################################
2256 2958
2257package CFClient::UI::ValSlider; 2959package CFPlus::UI::ValSlider;
2258 2960
2259our @ISA = CFClient::UI::HBox::; 2961our @ISA = CFPlus::UI::HBox::;
2260 2962
2261sub new { 2963sub new {
2262 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2263 2965
2264 my $range = delete $arg{range}; 2966 my $range = delete $arg{range};
2265 2967
2266 my $self = $class->SUPER::new ( 2968 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2969 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2970 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift }, 2971 to_value => sub { shift },
2270 from_value => sub { shift }, 2972 from_value => sub { shift },
2271 %arg, 2973 %arg,
2272 ); 2974 );
2273 2975
… …
2293sub set_range { shift->{slider}->set_range (@_) } 2995sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) } 2996sub set_value { shift->{slider}->set_value (@_) }
2295 2997
2296############################################################################# 2998#############################################################################
2297 2999
2298package CFClient::UI::TextView; 3000package CFPlus::UI::TextScroller;
2299 3001
2300our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2301 3003
2302use CFClient::OpenGL; 3004use CFPlus::OpenGL;
2303 3005
2304sub new { 3006sub new {
2305 my $class = shift; 3007 my $class = shift;
2306 3008
2307 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2308 fontsize => 1, 3010 fontsize => 1,
2309 can_events => 0, 3011 can_events => 1,
3012 indent => 0,
2310 #font => default_font 3013 #font => default_font
2311 @_, 3014 @_,
2312 3015
2313 layout => (new CFClient::Layout 1), 3016 layout => (new CFPlus::Layout),
2314 par => [], 3017 par => [],
3018 max_par => 0,
2315 height => 0, 3019 height => 0,
2316 children => [ 3020 children => [
2317 (new CFClient::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2318 (new CFClient::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2319 ], 3023 ],
2320 ); 3024 );
2321 3025
2322 $self->{children}[1]->connect (changed => sub { $self->update }); 3026 $self->{children}[1]->connect (changed => sub { $self->update });
2323 3027
… …
2329 3033
2330 $self->{fontsize} = $fontsize; 3034 $self->{fontsize} = $fontsize;
2331 $self->reflow; 3035 $self->reflow;
2332} 3036}
2333 3037
3038sub size_request {
3039 my ($self) = @_;
3040
3041 my ($empty, $slider) = @{ $self->{children} };
3042
3043 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request
3045}
3046
2334sub size_allocate { 3047sub invoke_size_allocate {
2335 my ($self, $w, $h) = @_; 3048 my ($self, $w, $h) = @_;
2336 3049
2337 $self->SUPER::size_allocate ($w, $h); 3050 my ($empty, $slider, @other) = @{ $self->{children} };
3051 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2338 3052
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3053 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w}); 3055 $self->{layout}->set_width ($empty->{w});
3056 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2342 3057
2343 $self->reflow; 3058 $self->reflow;
2344}
2345 3059
2346sub text_size { 3060 local $self->{children} = [$empty, $slider];
3061 $self->SUPER::invoke_size_allocate ($w, $h)
3062}
3063
3064sub invoke_mouse_wheel {
2347 my ($self, $text, $indent) = @_; 3065 my ($self, $ev) = @_;
3066
3067 return 0 unless $ev->{dy}; # only vertical movements
3068
3069 $self->{children}[1]->emit (mouse_wheel => $ev);
3070
3071 1
3072}
3073
3074sub get_layout {
3075 my ($self, $para) = @_;
2348 3076
2349 my $layout = $self->{layout}; 3077 my $layout = $self->{layout};
2350 3078
3079 $layout->set_font ($self->{font}) if $self->{font};
3080 $layout->set_foreground (@{$para->{fg}});
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3081 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent); 3082 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3083 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2353 $layout->set_markup ($text); 3084 $layout->set_markup ($para->{markup});
3085
3086 $layout->set_shapes (
3087 map
3088 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3089 @{$para->{widget}}
2354 3090 );
3091
2355 $layout->size 3092 $layout
2356} 3093}
2357 3094
2358sub reflow { 3095sub reflow {
2359 my ($self) = @_; 3096 my ($self) = @_;
2360 3097
… …
2367 3104
2368 # todo: base offset on lines or so, not on pixels 3105 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset); 3106 $self->{children}[1]->set_value ($offset);
2370} 3107}
2371 3108
3109sub current_paragraph {
3110 my ($self) = @_;
3111
3112 $self->{top_paragraph} - 1
3113}
3114
3115sub scroll_to {
3116 my ($self, $para) = @_;
3117
3118 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3119
3120 $self->{scroll_to} = $para;
3121 $self->update;
3122}
3123
2372sub clear { 3124sub clear {
2373 my ($self) = @_; 3125 my ($self) = @_;
3126
3127 my (undef, undef, @other) = @{ $self->{children} };
3128 $self->remove ($_) for @other;
2374 3129
2375 $self->{par} = []; 3130 $self->{par} = [];
2376 $self->{height} = 0; 3131 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3132 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378} 3133}
2379 3134
2380sub add_paragraph { 3135sub add_paragraph {
2381 my ($self, $color, $text, $indent) = @_; 3136 my $self = shift;
2382 3137
2383 for my $line (split /\n/, $text) { 3138 for my $para (@_) {
2384 my ($w, $h) = $self->text_size ($line); 3139 $para = {
3140 fg => [1, 1, 1, 1],
3141 indent => 0,
3142 markup => "",
3143 widget => [],
3144 ref $para ? %$para : (markup => $para),
3145 w => 1e10,
3146 wrapped => 1,
3147 };
3148
3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3150 push @{$self->{par}}, $para;
3151 }
3152
3153 if (my $max = $self->{max_par}) {
3154 shift @{$self->{par}} while @{$self->{par}} > $max;
3155 }
3156
3157 $self->{need_reflow}++;
3158 $self->update;
3159}
3160
3161sub scroll_to_bottom {
3162 my ($self) = @_;
3163
3164 $self->{scroll_to} = $#{$self->{par}};
3165 $self->update;
3166}
3167
3168sub force_uptodate {
3169 my ($self) = @_;
3170
3171 if (delete $self->{need_reflow}) {
3172 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3173
3174 my $height = 0;
3175
3176 for my $para (@{$self->{par}}) {
3177 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3178 my $layout = $self->get_layout ($para);
3179 my ($w, $h) = $layout->size;
3180
3181 $para->{w} = $w + $para->{indent};
3182 $para->{h} = $h;
3183 $para->{wrapped} = $layout->has_wrapped;
3184 }
3185
3186 $para->{y} = $height;
3187 $height += $para->{h};
3188 }
3189
2385 $self->{height} += $h; 3190 $self->{height} = $height;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3191 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2387 }
2388 3192
2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3193 delete $self->{texture};
3194 }
3195
3196 if (my $paridx = delete $self->{scroll_to}) {
3197 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3198 }
2390} 3199}
2391 3200
2392sub update { 3201sub update {
2393 my ($self) = @_; 3202 my ($self) = @_;
2394 3203
… …
2396 3205
2397 return unless $self->{h} > 0; 3206 return unless $self->{h} > 0;
2398 3207
2399 delete $self->{texture}; 3208 delete $self->{texture};
2400 3209
2401 $ROOT->on_post_alloc ($self, sub { 3210 $ROOT->on_post_alloc ($self => sub {
3211 $self->force_uptodate;
3212
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403 3214
2404 if (delete $self->{need_reflow}) {
2405 my $height = 0;
2406
2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2422
2423 $self->{height} = $height;
2424
2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2426
2427 delete $self->{texture};
2428 }
2429
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3215 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 3216 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2433 3218
3219 package CFPlus::UI::Base;
3220 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3221 (0, 0, $self->{w}, $self->{h});
3222
3223 my $top = int $self->{children}[1]{range}[0];
3224
3225 my $paridx = 0;
3226 my $top_paragraph;
2434 my $top = int $self->{children}[1]{range}[0]; 3227 my $top = int $self->{children}[1]{range}[0];
2435 3228
2436 my $y0 = $top; 3229 my $y0 = $top;
2437 my $y1 = $top + $H; 3230 my $y1 = $top + $H;
2438 3231
2439 my $y = 0;
2440
2441 my $layout = $self->{layout};
2442
2443 $layout->set_font ($self->{font}) if $self->{font};
2444
2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2448
2449 for my $par (@{$self->{par}}) { 3232 for my $para (@{$self->{par}}) {
2450 my $h = $par->[1]; 3233 my $h = $para->{h};
3234 my $y = $para->{y};
2451 3235
2452 if ($y0 < $y + $h && $y < $y1) { 3236 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] }); 3237 my $layout = $self->get_layout ($para);
2454 $layout->set_width ($W - $par->[3]);
2455 $layout->set_markup ($par->[4]);
2456 3238
2457 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3239 $layout->render ($para->{indent}, $y - $y0);
2458 3240
2459 glRasterPos $par->[3], $y - $y0; 3241 if (my @w = @{ $para->{widget} }) {
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3242 my @s = $layout->get_shapes;
3243
3244 for (@w) {
3245 my ($dx, $dy) = splice @s, 0, 2, ();
3246
3247 $_->{x} = $dx + $para->{indent};
3248 $_->{y} = $dy + $y - $y0;
3249
3250 $_->draw;
3251 }
3252 }
2461 } 3253 }
2462 3254
2463 $y += $h; 3255 $paridx++;
3256 $top_paragraph ||= $paridx if $y >= $top;
2464 } 3257 }
2465 3258
2466 glDisable GL_BLEND; 3259 $self->{top_paragraph} = $top_paragraph;
2467 }; 3260 };
2468 }); 3261 });
2469} 3262}
2470 3263
3264sub reconfigure {
3265 my ($self) = @_;
3266
3267 $self->SUPER::reconfigure;
3268
3269 $_->{w} = 1e10 for @{ $self->{par} };
3270 $self->reflow;
3271}
3272
2471sub _draw { 3273sub _draw {
2472 my ($self) = @_; 3274 my ($self) = @_;
2473 3275
2474 glEnable GL_TEXTURE_2D; 3276 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3277 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 3278 glColor 0, 0, 0, 1;
2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3279 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2478 glDisable GL_TEXTURE_2D; 3280 glDisable GL_TEXTURE_2D;
2479 3281
2480 $self->{children}[1]->draw; 3282 $self->{children}[1]->draw;
2481
2482} 3283}
2483 3284
2484############################################################################# 3285#############################################################################
2485 3286
2486package CFClient::UI::Animator; 3287package CFPlus::UI::Animator;
2487 3288
2488use CFClient::OpenGL; 3289use CFPlus::OpenGL;
2489 3290
2490our @ISA = CFClient::UI::Bin::; 3291our @ISA = CFPlus::UI::Bin::;
2491 3292
2492sub moveto { 3293sub moveto {
2493 my ($self, $x, $y) = @_; 3294 my ($self, $x, $y) = @_;
2494 3295
2495 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3296 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2523 glPopMatrix; 3324 glPopMatrix;
2524} 3325}
2525 3326
2526############################################################################# 3327#############################################################################
2527 3328
2528package CFClient::UI::Flopper; 3329package CFPlus::UI::Flopper;
2529 3330
2530our @ISA = CFClient::UI::Button::; 3331our @ISA = CFPlus::UI::Button::;
2531 3332
2532sub new { 3333sub new {
2533 my $class = shift; 3334 my $class = shift;
2534 3335
2535 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
2536 state => 0, 3337 state => 0,
2537 connect_activate => \&toggle_flopper, 3338 on_activate => \&toggle_flopper,
2538 @_ 3339 @_
2539 ); 3340 );
2540 3341
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 3342 $self
2547} 3343}
2548 3344
2549sub toggle_flopper { 3345sub toggle_flopper {
2550 my ($self) = @_; 3346 my ($self) = @_;
2551 3347
2552 # TODO: use animation 3348 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 3349}
2564 3350
2565############################################################################# 3351#############################################################################
2566 3352
2567package CFClient::UI::Tooltip; 3353package CFPlus::UI::Tooltip;
2568 3354
2569our @ISA = CFClient::UI::Bin::; 3355our @ISA = CFPlus::UI::Bin::;
2570 3356
2571use CFClient::OpenGL; 3357use CFPlus::OpenGL;
2572 3358
2573sub new { 3359sub new {
2574 my $class = shift; 3360 my $class = shift;
2575 3361
2576 $class->SUPER::new ( 3362 $class->SUPER::new (
… …
2580} 3366}
2581 3367
2582sub set_tooltip_from { 3368sub set_tooltip_from {
2583 my ($self, $widget) = @_; 3369 my ($self, $widget) = @_;
2584 3370
3371 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3372 if $widget->{tooltip} =~ /^#(.*)$/;
3373
3374 my $tooltip = $widget->{tooltip};
3375
3376 if ($ENV{CFPLUS_DEBUG} & 2) {
3377 $tooltip .= "\n\n" . (ref $widget) . "\n"
3378 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3379 . "req $widget->{req_w} $widget->{req_h}\n"
3380 . "visible $widget->{visible}";
3381 }
3382
3383 $tooltip =~ s/^\n+//;
3384 $tooltip =~ s/\n+$//;
3385
2585 $self->add (new CFClient::UI::Label 3386 $self->add (new CFPlus::UI::Label
2586 markup => $widget->{tooltip}, 3387 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3388 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 3389 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 3390 style => 1, # FLAG_INVERSE
2590 ellipsise => 0, 3391 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 3392 font => ($widget->{tooltip_font} || $::FONT_PROP),
2592 ); 3393 );
2593} 3394}
2594 3395
… …
2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3399 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2599 3400
2600 ($w + 4, $h + 4) 3401 ($w + 4, $h + 4)
2601} 3402}
2602 3403
2603sub size_allocate { 3404sub invoke_size_allocate {
2604 my ($self, $w, $h) = @_; 3405 my ($self, $w, $h) = @_;
2605 3406
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 3407 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3408}
3409
3410sub invoke_visibility_change {
3411 my ($self, $visible) = @_;
3412
3413 return unless $visible;
3414
3415 $self->{root}->on_post_alloc ("move_$self" => sub {
3416 my $widget = $self->{owner}
3417 or return;
3418
3419 if ($widget->{visible}) {
3420 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3421
3422 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3423 if $x + $self->{w} > $self->{root}{w};
3424
3425 $self->move_abs ($x, $y);
3426 } else {
3427 $self->hide;
3428 }
3429 });
2607} 3430}
2608 3431
2609sub _draw { 3432sub _draw {
2610 my ($self) = @_; 3433 my ($self) = @_;
2611 3434
… …
2628 glVertex $w, $h; 3451 glVertex $w, $h;
2629 glVertex $w, 0; 3452 glVertex $w, 0;
2630 glEnd; 3453 glEnd;
2631 3454
2632 glTranslate 2 - 0.375, 2 - 0.375; 3455 glTranslate 2 - 0.375, 2 - 0.375;
3456
2633 $self->SUPER::_draw; 3457 $self->SUPER::_draw;
2634} 3458}
2635 3459
2636############################################################################# 3460#############################################################################
2637 3461
2638package CFClient::UI::Face; 3462package CFPlus::UI::Face;
2639 3463
2640our @ISA = CFClient::UI::Base::; 3464our @ISA = CFPlus::UI::DrawBG::;
2641 3465
2642use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2643 3467
2644sub new { 3468sub new {
2645 my $class = shift; 3469 my $class = shift;
2646 3470
2647 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
2648 aspect => 1, 3474 aspect => 1,
2649 can_events => 0, 3475 can_events => 0,
2650 @_, 3476 @_,
2651 ); 3477 );
2652 3478
2653 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
2655 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2656 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1, 3485 parked => 1,
2659 interval => $self->{animspeed},
2660 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
2661 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
2662 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
2663 }, 3494 },
2664 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
2665 } 3499 }
2666 3500
2667 $self 3501 $self
2668} 3502}
2669 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
2670sub size_request { 3534sub size_request {
2671 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
2672} 3550}
2673 3551
2674sub update { 3552sub update {
2675 my ($self) = @_; 3553 my ($self) = @_;
2676 3554
2677 return unless $self->{visible}; 3555 return unless $self->{visible};
2678 3556
2679 $self->SUPER::update; 3557 $self->SUPER::update;
2680} 3558}
2681 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
2682sub _draw { 3568sub _draw {
2683 my ($self) = @_; 3569 my ($self) = @_;
2684 3570
2685 return unless $::CONN; 3571 return unless $::CONN;
2686 3572
2687 my $face; 3573 $self->SUPER::_draw;
2688 3574
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
2691 3576 or return;
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695 3577
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
2697 3579
2698 if ($tex) { 3580 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 3583 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
2704 } 3586 }
2705} 3587}
2706 3588
2707sub DESTROY { 3589sub destroy {
2708 my ($self) = @_; 3590 my ($self) = @_;
2709 3591
2710 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
2711 if $self->{timer}; 3593 if $self->{timer};
2712 3594
2713 $self->SUPER::DESTROY; 3595 $self->SUPER::destroy;
2714} 3596}
2715 3597
2716############################################################################# 3598#############################################################################
2717 3599
2718package CFClient::UI::Inventory; 3600package CFPlus::UI::Buttonbar;
2719 3601
2720our @ISA = CFClient::UI::ScrolledWindow::; 3602our @ISA = CFPlus::UI::HBox::;
2721 3603
2722sub new { 3604# TODO: should actually wrap buttons and other goodies.
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764 3605
2765############################################################################# 3606#############################################################################
2766 3607
2767package CFClient::UI::Menu; 3608package CFPlus::UI::Menu;
2768 3609
2769our @ISA = CFClient::UI::FancyFrame::; 3610our @ISA = CFPlus::UI::Toplevel::;
2770 3611
2771use CFClient::OpenGL; 3612use CFPlus::OpenGL;
2772 3613
2773sub new { 3614sub new {
2774 my $class = shift; 3615 my $class = shift;
2775 3616
2776 my $self = $class->SUPER::new ( 3617 my $self = $class->SUPER::new (
2777 items => [], 3618 items => [],
2778 z => 100, 3619 z => 100,
2779 @_, 3620 @_,
2780 ); 3621 );
2781 3622
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2783 3624
2784 for my $item (@{ $self->{items} }) { 3625 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item; 3626 my ($widget, $cb, $tooltip) = @$item;
2786 3627
2787 # handle various types of items, only text for now 3628 # handle various types of items, only text for now
2788 if (!ref $widget) { 3629 if (!ref $widget) {
3630 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2;
3632
2789 $widget = new CFClient::UI::Label 3633 $widget = new CFPlus::UI::HBox
2790 can_hover => 1, 3634 can_hover => 1,
2791 can_events => 1, 3635 can_events => 1,
3636 tooltip => $tooltip,
3637 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ],
3641 ;
3642
3643 } else {
3644 $widget = new CFPlus::UI::Label
3645 can_hover => 1,
3646 can_events => 1,
2792 text => $widget; 3647 markup => $widget,
3648 tooltip => $tooltip;
3649 }
2793 } 3650 }
2794 3651
2795 $self->{item}{$widget} = $item; 3652 $self->{item}{$widget} = $item;
2796 3653
2797 $self->{vbox}->add ($widget); 3654 $self->{vbox}->add ($widget);
… …
2802 3659
2803# popup given the event (must be a mouse button down event currently) 3660# popup given the event (must be a mouse button down event currently)
2804sub popup { 3661sub popup {
2805 my ($self, $ev) = @_; 3662 my ($self, $ev) = @_;
2806 3663
2807 $self->_emit ("popdown"); 3664 $self->emit ("popdown");
2808 3665
2809 # maybe save $GRAB? must be careful about events... 3666 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 3667 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 3668 $self->{button} = $ev->{button};
2812 3669
2813 $self->show; 3670 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3671 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 3672}
2816 3673
2817sub mouse_motion { 3674sub invoke_mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 3675 my ($self, $ev, $x, $y) = @_;
2819 3676
2820 # TODO: should use vbox->find_widget or so 3677 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3678 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 3679 $self->{hover} = $self->{item}{$HOVER};
2823}
2824 3680
3681 0
3682}
3683
2825sub button_up { 3684sub invoke_button_up {
2826 my ($self, $ev, $x, $y) = @_; 3685 my ($self, $ev, $x, $y) = @_;
2827 3686
2828 if ($ev->{button} == $self->{button}) { 3687 if ($ev->{button} == $self->{button}) {
2829 undef $GRAB; 3688 undef $GRAB;
2830 $self->hide; 3689 $self->hide;
2831 3690
2832 $self->_emit ("popdown"); 3691 $self->emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 3692 $self->{hover}[1]->() if $self->{hover};
3693 } else {
3694 return 0
3695 }
3696
2834 } 3697 1
2835} 3698}
2836 3699
2837############################################################################# 3700#############################################################################
2838 3701
2839package CFClient::UI::Statusbox; 3702package CFPlus::UI::Multiplexer;
2840 3703
2841our @ISA = CFClient::UI::VBox::; 3704our @ISA = CFPlus::UI::Container::;
2842 3705
2843sub new { 3706sub new {
2844 my $class = shift; 3707 my $class = shift;
2845 3708
2846 $class->SUPER::new ( 3709 my $self = $class->SUPER::new (
3710 @_,
3711 );
3712
3713 $self->{current} = $self->{children}[0]
3714 if @{ $self->{children} };
3715
3716 $self
3717}
3718
3719sub add {
3720 my ($self, @widgets) = @_;
3721
3722 $self->SUPER::add (@widgets);
3723
3724 $self->{current} = $self->{children}[0]
3725 if @{ $self->{children} };
3726}
3727
3728sub get_current_page {
3729 my ($self) = @_;
3730
3731 $self->{current}
3732}
3733
3734sub set_current_page {
3735 my ($self, $page_or_widget) = @_;
3736
3737 my $widget = ref $page_or_widget
3738 ? $page_or_widget
3739 : $self->{children}[$page_or_widget];
3740
3741 $self->{current} = $widget;
3742 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3743
3744 $self->emit (page_changed => $self->{current});
3745
3746 $self->realloc;
3747}
3748
3749sub visible_children {
3750 $_[0]{current}
3751}
3752
3753sub size_request {
3754 my ($self) = @_;
3755
3756 $self->{current}->size_request
3757}
3758
3759sub invoke_size_allocate {
3760 my ($self, $w, $h) = @_;
3761
3762 $self->{current}->configure (0, 0, $w, $h);
3763
3764 1
3765}
3766
3767sub _draw {
3768 my ($self) = @_;
3769
3770 $self->{current}->draw;
3771}
3772
3773#############################################################################
3774
3775package CFPlus::UI::Notebook;
3776
3777our @ISA = CFPlus::UI::VBox::;
3778
3779sub new {
3780 my $class = shift;
3781
3782 my $self = $class->SUPER::new (
3783 buttonbar => (new CFPlus::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3785 # filter => # will be put between multiplexer and $self
3786 @_,
3787 );
3788
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791
3792 $self
3793}
3794
3795sub add {
3796 my ($self, $title, $widget, $tooltip) = @_;
3797
3798 CFPlus::weaken $self;
3799
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget);
3807}
3808
3809sub get_current_page {
3810 my ($self) = @_;
3811
3812 $self->{multiplexer}->get_current_page
3813}
3814
3815sub set_current_page {
3816 my ($self, $page) = @_;
3817
3818 $self->{multiplexer}->set_current_page ($page);
3819 $self->emit (page_changed => $self->{multiplexer}{current});
3820}
3821
3822#############################################################################
3823
3824package CFPlus::UI::Selector;
3825
3826use utf8;
3827
3828our @ISA = CFPlus::UI::Button::;
3829
3830sub new {
3831 my $class = shift;
3832
3833 my $self = $class->SUPER::new (
3834 options => [], # [value, title, longdesc], ...
3835 value => undef,
3836 @_,
3837 );
3838
3839 $self->_set_value ($self->{value});
3840
3841 $self
3842}
3843
3844sub invoke_button_down {
3845 my ($self, $ev) = @_;
3846
3847 my @menu_items;
3848
3849 for (@{ $self->{options} }) {
3850 my ($value, $title, $tooltip) = @$_;
3851
3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3853 }
3854
3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3856}
3857
3858sub _set_value {
3859 my ($self, $value) = @_;
3860
3861 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3862 or return;
3863
3864 $self->{value} = $item->[0];
3865 $self->set_markup ("$item->[1] ⇓");
3866 $self->set_tooltip ($item->[2]);
3867}
3868
3869sub set_value {
3870 my ($self, $value) = @_;
3871
3872 return unless $self->{value} ne $value;
3873
3874 $self->_set_value ($value);
3875 $self->emit (changed => $value);
3876}
3877
3878#############################################################################
3879
3880package CFPlus::UI::Statusbox;
3881
3882our @ISA = CFPlus::UI::VBox::;
3883
3884sub new {
3885 my $class = shift;
3886
3887 my $self = $class->SUPER::new (
2847 fontsize => 0.8, 3888 fontsize => 0.8,
2848 @_, 3889 @_,
2849 ) 3890 );
3891
3892 CFPlus::weaken (my $this = $self);
3893
3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3895
3896 $self
2850} 3897}
2851 3898
2852sub reorder { 3899sub reorder {
2853 my ($self) = @_; 3900 my ($self) = @_;
2854 my $NOW = time; 3901 my $NOW = Time::HiRes::time;
3902
3903 # freeze display when hovering over any label
3904 return if $CFPlus::UI::TOOLTIP->{owner}
3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3906 values %{ $self->{item} };
2855 3907
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3908 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3909 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3910 }
2859 3911
… …
2862 my @items = sort { 3914 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3915 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3916 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3917 } values %{ $self->{item} };
2866 3918
3919 $self->{timer}->interval (1);
3920
2867 my $count = 10 + 1; 3921 my $count = 10 + 1;
2868 for my $item (@items) { 3922 for my $item (@items) {
2869 last unless --$count; 3923 last unless --$count;
2870 3924
2871 push @widgets, $item->{label} ||= do { 3925 my $label = $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all) 3926 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1 3927 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}" 3928 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text}; 3929 : $item->{text};
2876 3930
2877 for ($short) { 3931 for ($short) {
2878 s/^\s+//; 3932 s/^\s+//;
2879 s/\s+/ /g; 3933 s/\s+/ /g;
2880 } 3934 }
2881 3935
2882 new CFClient::UI::Label 3936 new CFPlus::UI::Label
2883 markup => $short, 3937 markup => $short,
2884 tooltip => $item->{tooltip}, 3938 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP, 3939 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3940 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3941 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3942 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3943 fg => [@{ $item->{fg} }],
2890 can_events => 1, 3944 can_events => 1,
2891 can_hover => 1 3945 can_hover => 1
2892 }; 3946 };
3947
3948 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3949 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3950 $label->update;
3951 $label->set_max_size (undef, $label->{req_h} * $diff)
3952 if $diff < 1;
3953 $self->{timer}->interval (1/30);
3954 } else {
3955 $label->{fg}[3] = $item->{fg}[3] || 1;
3956 }
3957
3958 push @widgets, $label;
2893 } 3959 }
2894 3960
2895 $self->clear; 3961 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3962 $self->SUPER::add (reverse @widgets);
2897} 3963}
… …
2902 $text =~ s/^\s+//; 3968 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3969 $text =~ s/\s+$//;
2904 3970
2905 return unless $text; 3971 return unless $text;
2906 3972
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3973 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3974
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3975 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3976
2911 if (my $item = $self->{item}{$group}) { 3977 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3978 if ($item->{text} eq $text) {
2913 $item->{count}++; 3979 $item->{count}++;
2914 } else { 3980 } else {
2915 $item->{count} = 1; 3981 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text; 3982 $item->{text} = $item->{tooltip} = $text;
2917 } 3983 }
2918 $item->{id} = ++$self->{id}; 3984 $item->{id} += 0.2;#d#
2919 $item->{timeout} = $timeout; 3985 $item->{timeout} = $timeout;
2920 delete $item->{label}; 3986 delete $item->{label};
2921 } else { 3987 } else {
2922 $self->{item}{$group} = { 3988 $self->{item}{$group} = {
2923 id => ++$self->{id}, 3989 id => ++$self->{id},
… …
2929 count => 1, 3995 count => 1,
2930 %arg, 3996 %arg,
2931 }; 3997 };
2932 } 3998 }
2933 3999
4000 $ROOT->on_refresh (reorder => sub {
2934 $self->reorder; 4001 $self->reorder;
4002 });
2935} 4003}
2936 4004
2937sub reconfigure { 4005sub reconfigure {
2938 my ($self) = @_; 4006 my ($self) = @_;
2939 4007
… …
2942 4010
2943 $self->reorder; 4011 $self->reorder;
2944 $self->SUPER::reconfigure; 4012 $self->SUPER::reconfigure;
2945} 4013}
2946 4014
4015sub destroy {
4016 my ($self) = @_;
4017
4018 $self->{timer}->cancel;
4019
4020 $self->SUPER::destroy;
4021}
4022
2947############################################################################# 4023#############################################################################
2948 4024
2949package CFClient::UI::Root; 4025package CFPlus::UI::Root;
2950 4026
2951our @ISA = CFClient::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
2952 4028
4029use List::Util qw(min max);
4030
2953use CFClient::OpenGL; 4031use CFPlus::OpenGL;
2954 4032
2955sub new { 4033sub new {
2956 my $class = shift; 4034 my $class = shift;
2957 4035
2958 $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
4037 visible => 1,
2959 @_, 4038 @_,
2960 ) 4039 );
2961}
2962 4040
2963sub configure { 4041 CFPlus::weaken ($self->{root} = $self);
2964 my ($self, $x, $y, $w, $h) = @_;
2965 4042
2966 $self->{w} = $w; 4043 $self
2967 $self->{h} = $h;
2968}
2969
2970sub check_size {
2971 my ($self) = @_;
2972
2973 $self->size_allocate ($self->{w}, $self->{h})
2974 if $self->{w};
2975} 4044}
2976 4045
2977sub size_request { 4046sub size_request {
2978 my ($self) = @_; 4047 my ($self) = @_;
2979 4048
2980 ($self->{w}, $self->{h}) 4049 ($self->{w}, $self->{h})
2981} 4050}
2982 4051
4052sub _to_pixel {
4053 my ($coord, $size, $max) = @_;
4054
4055 $coord =
4056 $coord eq "center" ? ($max - $size) * 0.5
4057 : $coord eq "max" ? $max
4058 : $coord;
4059
4060 $coord = 0 if $coord < 0;
4061 $coord = $max - $size if $coord > $max - $size;
4062
4063 int $coord + 0.5
4064}
4065
2983sub size_allocate { 4066sub invoke_size_allocate {
2984 my ($self, $w, $h) = @_; 4067 my ($self, $w, $h) = @_;
2985 4068
2986 for my $child ($self->children) { 4069 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4070 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 4071
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4072 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 4073 $Y = $child->{force_y} if exists $child->{force_y};
2991 4074
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4075 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 4076 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 4077
2998 $child->configure ($X, $Y, $W, $H); 4078 $child->configure ($X, $Y, $W, $H);
2999 } 4079 }
4080
4081 1
3000} 4082}
3001 4083
3002sub coord2local { 4084sub coord2local {
3003 my ($self, $x, $y) = @_; 4085 my ($self, $x, $y) = @_;
3004 4086
… …
3012} 4094}
3013 4095
3014sub update { 4096sub update {
3015 my ($self) = @_; 4097 my ($self) = @_;
3016 4098
3017 $self->check_size;
3018 $::WANT_REFRESH++; 4099 $::WANT_REFRESH++;
3019} 4100}
3020 4101
3021sub add { 4102sub add {
3022 my ($self, @children) = @_; 4103 my ($self, @children) = @_;
3023 4104
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 4105 $_->{is_toplevel} = 1
3032 4106 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 4107
3038 $self->SUPER::add (@children); 4108 $self->SUPER::add (@children);
3039} 4109}
3040 4110
3041sub remove { 4111sub remove {
3042 my ($self, @children) = @_; 4112 my ($self, @children) = @_;
3043 4113
3044 $self->SUPER::remove (@children); 4114 $self->SUPER::remove (@children);
4115
4116 delete $self->{is_toplevel}
4117 for @children;
3045 4118
3046 while (@children) { 4119 while (@children) {
3047 my $w = pop @children; 4120 my $w = pop @children;
3048 push @children, $w->children; 4121 push @children, $w->children;
3049 $w->set_invisible; 4122 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
3069 $_->() 4142 $_->()
3070 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
3071 } 4144 }
3072 4145
3073 if ($self->{check_size}) { 4146 if ($self->{realloc}) {
3074 my @queue = ([], []); 4147 my %queue;
4148 my @queue;
4149 my $widget;
3075 4150
3076 for (;;) { 4151 outer:
3077 if ($self->{check_size}) { 4152 while () {
3078 # heuristic: check containers last 4153 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4154 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 4155 $widget->{visible} or next; # do not resize invisible widgets
4156
4157 $queue{$widget+0}++ and next; # duplicates are common
4158
4159 push @{ $queue[$widget->{visible}] }, $widget;
4160 }
3081 } 4161 }
3082 4162
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4163 while () {
4164 @queue or last outer;
3084 4165
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4166 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 4167 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 4168
4169 pop @queue;
4170 }
4171
4172 delete $queue{$widget+0};
4173
4174 my ($w, $h) = $widget->size_request;
4175
4176 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4177 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4178
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181
4182 $w = $widget->{force_w} if exists $widget->{force_w};
4183 $h = $widget->{force_h} if exists $widget->{force_h};
4184
4185 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4186 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 4187 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 4188 $widget->{req_h} = $h;
3095 4189
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4190 $self->{size_alloc}{$widget+0} = $widget;
3097 4191
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 4192 if (my $parent = $widget->{parent}) {
4193 $self->{realloc}{$parent+0} = $parent
4194 unless $queue{$parent+0};
4195
4196 $parent->{force_size_alloc} = 1;
4197 $self->{size_alloc}{$parent+0} = $parent;
4198 }
3100 } 4199 }
4200
4201 delete $self->{realloc}{$widget+0};
3101 } 4202 }
3102 } 4203 }
3103 4204
3104 while ($self->{size_alloc}) { 4205 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 4206 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 4207 values %$size_alloc;
4208
4209 while () {
4210 my $widget = pop @queue || last;
4211
4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 4213
3108 $w = 0 if $w < 0; 4214 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 4215 $h = 0 if $h < 0;
3110 4216
4217 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h;
4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
4226 $w = int $w + 0.5;
4227 $h = int $h + 0.5;
4228
4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4230 $widget->{old_w} = $widget->{w};
4231 $widget->{old_h} = $widget->{h};
4232
3111 $widget->{w} = $w; 4233 $widget->{w} = $w;
3112 $widget->{h} = $h; 4234 $widget->{h} = $h;
4235
3113 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
3114 } 4238 }
3115 } 4239 }
3116 4240
3117 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
3118 $_->() 4242 $_->()
… …
3127 glLoadIdentity; 4251 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4252 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 4253 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 4254 glLoadIdentity;
3131 4255
4256 {
4257 package CFPlus::UI::Base;
4258
4259 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4260 (0, 0, $self->{w}, $self->{h});
4261
3132 $self->_draw; 4262 $self->_draw;
4263 }
3133} 4264}
3134 4265
3135############################################################################# 4266#############################################################################
3136 4267
3137package CFClient::UI; 4268package CFPlus::UI;
3138 4269
3139$ROOT = new CFClient::UI::Root; 4270$ROOT = new CFPlus::UI::Root;
3140$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4271$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3141 4272
31421 42731
3143 4274

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines