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

Diff Legend

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