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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFPlus;
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->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
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 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
97 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
99 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $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; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
192 reconfigure_widgets; 207 reconfigure_widgets;
193} 208}
194 209
195############################################################################# 210#############################################################################
196 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
197package CFClient::UI::Base; 220package CFPlus::UI::Base;
198 221
199use strict; 222use strict;
200 223
201use CFClient::OpenGL; 224use CFPlus::OpenGL;
202 225
203sub new { 226sub new {
204 my $class = shift; 227 my $class = shift;
205 228
206 my $self = bless { 229 my $self = bless {
… …
211 h => undef, 234 h => undef,
212 can_events => 1, 235 can_events => 1,
213 @_ 236 @_
214 }, $class; 237 }, $class;
215 238
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 240
218 for (keys %$self) { 241 for (keys %$self) {
219 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
221 } 244 }
222 } 245 }
223 246
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $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}; 249 $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}; 250 $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}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 252
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 255
233 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
246sub show { 269sub show {
247 my ($self) = @_; 270 my ($self) = @_;
248 271
249 return if $self->{parent}; 272 return if $self->{parent};
250 273
251 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
252} 275}
253 276
254sub set_visible { 277sub set_visible {
255 my ($self) = @_; 278 my ($self) = @_;
256 279
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $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; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
397 419
398 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
399 421
400 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
401 423
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 427 }
406} 428}
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
424 450
425 return if $FOCUS == $self; 451 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
427 453
428 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
429 455
430 $self->_emit (focus_in => $focus); 456 $self->update;
431 457
432 $focus->update if $focus; 458 0
433 $FOCUS->update;
434} 459}
435 460
436sub focus_out { 461sub invoke_focus_out {
437 my ($self) = @_; 462 my ($self) = @_;
438 463
439 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
440 465
441 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
442 467
443 $self->_emit (focus_out => $focus); 468 $self->update;
444 469
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 471 unless $FOCUS;
449}
450 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
451sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 484sub invoke_button_up { 0 }
453sub key_down { 0 } 485sub invoke_key_down { 0 }
454sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
455 488
456sub button_down { 489sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
458 491
459 $self->focus_in; 492 $self->grab_focus;
460 493
461 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 531}
463 532
464sub find_widget { 533sub find_widget {
465 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
466 535
… …
476sub set_parent { 545sub set_parent {
477 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
478 547
479 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 550}
505 551
506sub realloc { 552sub realloc {
507 my ($self) = @_; 553 my ($self) = @_;
508 554
… …
541 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
542 588
543 # update screen rectangle 589 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 592
549 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 596
… …
575 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
578 glEnd; 622 glEnd;
579 glPopMatrix; 623 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 625 }
582 626
583 $self->_draw; 627 $self->_draw;
584 glPopMatrix; 628 glPopMatrix;
585} 629}
… …
591} 635}
592 636
593sub DESTROY { 637sub DESTROY {
594 my ($self) = @_; 638 my ($self) = @_;
595 639
640 return if CFPlus::in_destruct;
641
596 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
597 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 646}
599 647
600############################################################################# 648#############################################################################
601 649
602package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
603 651
604our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
605 653
606use strict; 654use strict;
607use CFClient::OpenGL; 655use CFPlus::OpenGL;
608 656
609sub new { 657sub new {
610 my $class = shift; 658 my $class = shift;
611 659
612 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
643 } 691 }
644} 692}
645 693
646############################################################################# 694#############################################################################
647 695
648package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
649 697
650our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
651 699
652sub new { 700sub new {
653 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
655} 703}
… …
662 710
663sub draw { } 711sub draw { }
664 712
665############################################################################# 713#############################################################################
666 714
667package CFClient::UI::Container; 715package CFPlus::UI::Container;
668 716
669our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
670 718
671sub new { 719sub new {
672 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
673 721
674 my $children = delete $arg{children}; 722 my $children = delete $arg{children};
… …
683 if $children; 731 if $children;
684 732
685 $self 733 $self
686} 734}
687 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
688sub add { 744sub add {
689 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
690 746
691 $_->set_parent ($self) 747 $_->set_parent ($self)
692 for @widgets; 748 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
753} 809}
754 810
755############################################################################# 811#############################################################################
756 812
757package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
758 814
759our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
760 816
761sub new { 817sub new {
762 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
763 819
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 821
766 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
767} 823}
768 824
769sub add { 825sub add {
770 my ($self, $child) = @_; 826 my ($self, $child) = @_;
771 827
772 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
775} 830}
776 831
777sub remove { 832sub remove {
778 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
779 834
780 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
781 836
782 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 838 unless @{$self->{children}};
784} 839}
785 840
786sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
787 842
788sub size_request { 843sub size_request {
789 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
790} 845}
791 846
792sub size_allocate { 847sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
794 849
795 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
796} 853}
797 854
798############################################################################# 855#############################################################################
799 856
800# back-buffered drawing area 857# back-buffered drawing area
801 858
802package CFClient::UI::Window; 859package CFPlus::UI::Window;
803 860
804our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
805 862
806use CFClient::OpenGL; 863use CFPlus::OpenGL;
807 864
808sub new { 865sub new {
809 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
810 867
811 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
816 873
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 875 $self->SUPER::update;
819} 876}
820 877
821sub size_allocate { 878sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
823 880
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
826} 884}
827 885
828sub _render { 886sub _render {
829 my ($self) = @_; 887 my ($self) = @_;
830 888
… …
832} 890}
833 891
834sub render_child { 892sub render_child {
835 my ($self) = @_; 893 my ($self) = @_;
836 894
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
840 898
841 { 899 {
842 package CFClient::UI::Base; 900 package CFPlus::UI::Base;
843 901
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 902 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
846 } 904 }
847 905
… …
866 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
867} 925}
868 926
869############################################################################# 927#############################################################################
870 928
871package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
872 930
873our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
874 932
875sub new { 933sub new {
876 my $class = shift; 934 my $class = shift;
877 935
878 $class->SUPER::new ( 936 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
892 950
893 ($w, $h) 951 ($w, $h)
894} 952}
895 953
896sub size_allocate { 954sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
898 956
899 my $child = $self->child; 957 my $child = $self->child;
900 958
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 961
904 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
905 $self->update; 963 $self->update;
964
965 1
906} 966}
907 967
908sub set_offset { 968sub set_offset {
909 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
910 970
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 998 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1000 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1002 }
943} 1003}
944 1004
945sub _render { 1005sub _render {
946 my ($self) = @_; 1006 my ($self) = @_;
947 1007
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1010
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1012
953 $self->SUPER::_render; 1013 $self->SUPER::_render;
954} 1014}
955 1015
956############################################################################# 1016#############################################################################
957 1017
958package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
959 1019
960our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
961 1021
962sub new { 1022sub new {
963 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
964 1024
965 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
966 1026
967 my $self; 1027 my $self;
968 1028
969 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1030 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1032 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
974 }, 1034 },
975 ; 1035 ;
976 1036
977 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
979 slider => $slider, 1040 slider => $slider,
980 %arg, 1041 %arg,
981 ); 1042 );
982 1043
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
985 1046
986 $self 1047 $self
987} 1048}
988 1049
1050#TODO# update range on size_allocate depending on child
1051
989sub add { 1052sub add {
990 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
991 1054
992 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
993} 1056}
994 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
995sub update { 1074sub update {
996 my ($self) = @_; 1075 my ($self) = @_;
997 1076
998 $self->SUPER::update; 1077 $self->SUPER::update;
999 1078
1000 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1080}
1004 1081
1005sub size_allocate { 1082sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1007 1084
1085 $self->update_slider;
1086
1008 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1088}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1089
1017############################################################################# 1090#############################################################################
1018 1091
1019package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
1020 1093
1021our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
1022 1095
1023use CFClient::OpenGL; 1096use CFPlus::OpenGL;
1024 1097
1025sub new { 1098sub new {
1026 my $class = shift; 1099 my $class = shift;
1027 1100
1028 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1055} 1128}
1056 1129
1057############################################################################# 1130#############################################################################
1058 1131
1059package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1060 1133
1061our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1062 1135
1063use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1064 1137
1065my $bg = 1138my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1068 1141
1069my @border = 1142my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1145
1073sub new { 1146sub new {
1074 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1148
1078 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1152 border => 0.6,
1082 can_events => 1, 1153 can_events => 1,
1083 min_w => 16, 1154 min_w => 64,
1084 min_h => 16, 1155 min_h => 32,
1085 %arg, 1156 %arg,
1086 ); 1157 );
1087 1158
1088 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1160 align => 0,
1090 valign => 1, 1161 valign => 1,
1091 text => $title, 1162 text => $self->{title},
1092 fontsize => $self->{border} 1163 fontsize => $self->{border},
1093 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 }
1094 1174
1095 $self 1175 $self
1096} 1176}
1097 1177
1098sub add { 1178sub add {
1099 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1100 1180
1101 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1184}
1104 1185
1105sub border { 1186sub border {
1106 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1107} 1188}
1108 1189
1109sub size_request { 1190sub size_request {
1110 my ($self) = @_; 1191 my ($self) = @_;
1111 1192
1112 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1113 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1114 1198
1115 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1116 1200
1117 ( 1201 (
1118 $w + $self->border * 2, 1202 $w + $self->border * 2,
1119 $h + $self->border * 2, 1203 $h + $self->border * 2,
1120 ) 1204 )
1121} 1205}
1122 1206
1123sub size_allocate { 1207sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1125 1209
1126 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1214 }
1131 1215
1132 my $border = $self->border; 1216 my $border = $self->border;
1133 1217
1134 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1136 1233
1137 $self->child->configure ($border, $border, $w, $h); 1234 1
1138} 1235}
1139 1236
1140sub button_down { 1237sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1142 1239
1143 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1241 my $border = $self->border;
1145 1242
… …
1176 1273
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1275
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1279 };
1183 } else { 1280 } else {
1184 return 0; 1281 return 0;
1185 } 1282 }
1186 1283
1187 1 1284 1
1188} 1285}
1189 1286
1190sub button_up { 1287sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1192 1289
1193 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1194} 1291}
1195 1292
1196sub mouse_motion { 1293sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1198 1295
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1297
1201 !!$self->{motion} 1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1202} 1307}
1203 1308
1204sub _draw { 1309sub _draw {
1205 my ($self) = @_; 1310 my ($self) = @_;
1206 1311
… …
1232 1337
1233 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1234 1339
1235 $child->draw; 1340 $child->draw;
1236 1341
1237 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1240 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1241} 1351}
1242 1352
1243############################################################################# 1353#############################################################################
1244 1354
1245package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1246 1356
1247our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1248 1358
1249use List::Util qw(max sum); 1359use List::Util qw(max sum);
1250 1360
1251use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1252 1362
1253sub new { 1363sub new {
1254 my $class = shift; 1364 my $class = shift;
1255 1365
1256 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1262sub children { 1372sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1374}
1265 1375
1266sub add { 1376sub add {
1267 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1268 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1381 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1271 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1273} 1394}
1274 1395
1275# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1397sub clear {
1277 my ($self) = @_; 1398 my ($self) = @_;
… …
1318 (sum @$ws), 1439 (sum @$ws),
1319 (sum @$hs), 1440 (sum @$hs),
1320 ) 1441 )
1321} 1442}
1322 1443
1323sub size_allocate { 1444sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1325 1446
1326 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1327 1448
1328 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1335 1456
1336 # linearly scale sizes 1457 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1460
1340 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1341 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1342 1463
1343 my $y; 1464 my $y;
1344 1465
1345 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1360 } 1481 }
1361 1482
1362 $y += $row_h; 1483 $y += $row_h;
1363 } 1484 }
1364 1485
1486 1
1365} 1487}
1366 1488
1367sub find_widget { 1489sub find_widget {
1368 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1369 1491
… …
1388 } 1510 }
1389} 1511}
1390 1512
1391############################################################################# 1513#############################################################################
1392 1514
1393package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1394 1516
1395our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1396 1518
1397sub size_request { 1519sub size_request {
1398 my ($self) = @_; 1520 my ($self) = @_;
1399 1521
1400 $self->{vertical} 1522 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1530 )
1409} 1531}
1410 1532
1411sub size_allocate { 1533sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1413 1535
1414 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1416 1538
1417 my @req; 1539 my @req;
1418 1540
1419 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1421 } else { 1543 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1424 1546
1425 if ($req > $space) { 1547 if ($req > $space) {
1426 # ah well, not enough space 1548 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1428 } else { 1550 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1552
1431 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1432 1554
1433 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1556 for 0 .. $#children;
1435 } 1557 }
1436 } 1558 }
1437 1559
1438 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1439 1561
1440 my $pos = 0; 1562 my $pos = 0;
1441 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1566
1445 $pos += $alloc; 1567 $pos += $alloc;
1446 } 1568 }
1447 1569
1448 1 1570 1
1449} 1571}
1450 1572
1451############################################################################# 1573#############################################################################
1452 1574
1453package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1454 1576
1455our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1456 1578
1457sub new { 1579sub new {
1458 my $class = shift; 1580 my $class = shift;
1459 1581
1460 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1463 ) 1585 )
1464} 1586}
1465 1587
1466############################################################################# 1588#############################################################################
1467 1589
1468package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1469 1591
1470our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1471 1593
1472sub new { 1594sub new {
1473 my $class = shift; 1595 my $class = shift;
1474 1596
1475 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1478 ) 1600 )
1479} 1601}
1480 1602
1481############################################################################# 1603#############################################################################
1482 1604
1483package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1484 1606
1485our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1486 1608
1487use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1488 1610
1489sub new { 1611sub new {
1490 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1491 1613
1492 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1496 #font => default_font 1618 #font => default_font
1497 #text => initial text 1619 #text => initial text
1498 #markup => initial narkup 1620 #markup => initial narkup
1499 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1500 ellipsise => 3, # end 1622 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1624 fontsize => 1,
1503 align => -1, 1625 align => -1,
1504 valign => -1, 1626 valign => -1,
1505 padding_x => 2, 1627 padding_x => 2,
1506 padding_y => 2, 1628 padding_y => 2,
1507 can_events => 0, 1629 can_events => 0,
1508 %arg 1630 %arg
1509 ); 1631 );
1510 1632
1511 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1636 $self->{template} = $layout;
1515 } 1637 }
1516 1638
1517 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1521 } 1643 }
1522 1644
1523 $self 1645 $self
1524} 1646}
1525 1647
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1648sub update {
1537 my ($self) = @_; 1649 my ($self) = @_;
1538 1650
1539 delete $self->{texture}; 1651 delete $self->{texture};
1540 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1542 1654
1543sub realloc { 1655sub realloc {
1544 my ($self) = @_; 1656 my ($self) = @_;
1545 1657
1546 delete $self->{ox}; 1658 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1659 $self->SUPER::realloc;
1549} 1660}
1550 1661
1551sub set_text { 1662sub set_text {
1552 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1553 1664
1554 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1556 1667
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1559 1669
1670 delete $self->{size_req};
1560 $self->realloc; 1671 $self->realloc;
1561 $self->update; 1672 $self->update;
1562} 1673}
1563 1674
1564sub set_markup { 1675sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1569 1680
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1682
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1574 1684
1685 delete $self->{size_req};
1575 $self->realloc; 1686 $self->realloc;
1576 $self->update; 1687 $self->update;
1577} 1688}
1578 1689
1579sub size_request { 1690sub size_request {
1580 my ($self) = @_; 1691 my ($self) = @_;
1581 1692
1582 if (exists $self->{req_h}) { 1693 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1699
1591 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1592 1701
1593 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1706
1597 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1598 1708
1599 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1601 } 1711 }
1602 1712
1603 ($w, $h) 1713 [$w, $h]
1604 } 1714 };
1605}
1606 1715
1716 @{ $self->{size_req} }
1717}
1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1607sub size_allocate { 1723sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1609 1725
1610 delete $self->{ox}; 1726 delete $self->{ox};
1611 1727
1612 delete $self->{texture} 1728 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1614} 1732}
1615 1733
1616sub set_fontsize { 1734sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1618 1736
1619 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1620 delete $self->{texture}; 1739 delete $self->{texture};
1621 1740
1622 $self->realloc; 1741 $self->realloc;
1623} 1742}
1624 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1625sub _draw { 1753sub _draw {
1626 my ($self) = @_; 1754 my ($self) = @_;
1627 1755
1628 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1629 1757
1630 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 1765
1638 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1639 }; 1767 };
1640 1768
1641 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1645 1773
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 1777 };
1650 1778
1651 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 1781
1654 glColor_premultiply @{$self->{fg}} 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 1783}
1661 1784
1662############################################################################# 1785#############################################################################
1663 1786
1664package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1665 1788
1666our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1667 1790
1668use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1669 1792
1670sub new { 1793sub new {
1671 my $class = shift; 1794 my $class = shift;
1672 1795
1673 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1678 can_hover => 1, 1801 can_hover => 1,
1679 can_focus => 1, 1802 can_focus => 1,
1680 valign => 0, 1803 valign => 0,
1681 can_events => 1, 1804 can_events => 1,
1682 #text => ... 1805 #text => ...
1806 #hidden => "*",
1683 @_ 1807 @_
1684 ) 1808 )
1685} 1809}
1686 1810
1687sub _set_text { 1811sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1819 $self->{text} = $text;
1696 1820
1697 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1699 1824
1700 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1701 $self->update; 1828 $self->update;
1702} 1829}
1703 1830
1704sub set_text { 1831sub set_text {
1705 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1706 1833
1707 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1835 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1836}
1712 1837
1713sub get_text { 1838sub get_text {
1714 $_[0]{text} 1839 $_[0]{text}
1715} 1840}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1721 1846
1722 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1723} 1848}
1724 1849
1725sub key_down { 1850sub invoke_key_down {
1726 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1727 1852
1728 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1733 1858
1734 if ($uni == 8) { 1859 if ($uni == 8) {
1735 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1737 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1738 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1739 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1740 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1741 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1743 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1745 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1872 $self->emit ('escape');
1748 } elsif ($uni) { 1873 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1875 } else {
1751 return 0; 1876 return 0;
1752 } 1877 }
… …
1756 $self->realloc; 1881 $self->realloc;
1757 1882
1758 1 1883 1
1759} 1884}
1760 1885
1761sub focus_in { 1886sub invoke_focus_in {
1762 my ($self) = @_; 1887 my ($self) = @_;
1763 1888
1764 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1765 1890
1766 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1767} 1892}
1768 1893
1769sub button_down { 1894sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1771 1896
1772 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 1898
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 1900
1776 # byte-index to char-index 1901 # byte-index to char-index
1777 my $text = $self->{text}; 1902 my $text = $self->{text};
1778 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1780 1905
1781 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1782 $self->update; 1907 $self->update;
1783 1908
1784 1 1909 1
1785} 1910}
1786 1911
1787sub mouse_motion { 1912sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790 1915
1791 0 1916 1
1792} 1917}
1793 1918
1794sub _draw { 1919sub _draw {
1795 my ($self) = @_; 1920 my ($self) = @_;
1796 1921
… …
1831 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832 glEnd; 1957 glEnd;
1833 } 1958 }
1834} 1959}
1835 1960
1836package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1837 1962
1838our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1839 1964
1840use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1841 1966
1842sub key_down { 1967sub invoke_key_down {
1843 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1844 1969
1845 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1846 1971
1847 if ($sym == 13) { 1972 if ($sym == 13) {
1848 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1850 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1853 $self->update; 1979 $self->update;
1854 1980
1855 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1858 } 1984 }
1859 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1860 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1862 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1863 } 1989 }
1864 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1865 } 1991 }
1866 1992
1867 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1868 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1869 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870 1996
1871 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1872 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1873 } else { 1999 } else {
1874 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1875 } 2001 }
1876 2002
1877 } else { 2003 } else {
1878 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1879 } 2005 }
1880 2006
1881 1 2007 1
1882} 2008}
1883 2009
1884############################################################################# 2010#############################################################################
1885 2011
1886package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1887 2013
1888our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1889 2015
1890use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1891 2017
1892my @tex = 2018my @tex =
1893 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1895 2021
1896sub new { 2022sub new {
1897 my $class = shift; 2023 my $class = shift;
1898 2024
… …
1907 can_events => 1, 2033 can_events => 1,
1908 @_ 2034 @_
1909 ) 2035 )
1910} 2036}
1911 2037
1912sub activate { }
1913
1914sub button_up { 2038sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1916 2040
1917 $self->emit ("activate") 2041 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1937 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1938} 2062}
1939 2063
1940############################################################################# 2064#############################################################################
1941 2065
1942package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1943 2067
1944our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1945 2069
1946my @tex = 2070my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949 2073
1950use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1951 2075
1952sub new { 2076sub new {
1953 my $class = shift; 2077 my $class = shift;
1954 2078
1955 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1969 my ($self) = @_; 2093 my ($self) = @_;
1970 2094
1971 (6) x 2 2095 (6) x 2
1972} 2096}
1973 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1974sub button_down { 2106sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1976 2108
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2111 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2112 } else {
1982 return 0 2113 return 0
1983 } 2114 }
1984 2115
1985 1 2116 1
… …
2005 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
2006} 2137}
2007 2138
2008############################################################################# 2139#############################################################################
2009 2140
2010package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2011 2142
2012our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2013 2144
2014use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2015use Carp qw/confess/;
2016 2146
2017our %loaded_images; 2147our %texture_cache;
2018 2148
2019sub new { 2149sub new {
2020 my $class = shift; 2150 my $class = shift;
2021 2151
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2023 2156
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2025 2159
2026 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028 2162
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2164
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2166
2035 $self 2167 $self
2036} 2168}
2037 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2038sub size_request { 2185sub size_request {
2039 my ($self) = @_; 2186 my ($self) = @_;
2040 2187
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2042} 2189}
2043 2190
2044sub _draw { 2191sub _draw {
2045 my ($self) = @_; 2192 my ($self) = @_;
2046 2193
… …
2056 } 2203 }
2057 2204
2058 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2207
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2062 2209
2063 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2064} 2211}
2065 2212
2066############################################################################# 2213#############################################################################
2067 2214
2215package CFPlus::UI::ImageButton;
2216
2217our @ISA = CFPlus::UI::Image::;
2218
2219use CFPlus::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2247}
2248
2249#############################################################################
2250
2068package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2069 2252
2070our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2071 2254
2072use List::Util qw(min max); 2255use List::Util qw(min max);
2073 2256
2074use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2075 2258
2076my %tex = ( 2259my %tex = (
2077 food => [ 2260 food => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080 ], 2263 ],
2081 grace => [ 2264 grace => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084 ], 2267 ],
2085 hp => [ 2268 hp => [
2086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088 ], 2271 ],
2089 mana => [ 2272 mana => [
2090 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092 ], 2275 ],
2093); 2276);
2094 2277
2095# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2340
2158 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2346
2161 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2183 2369
2184 if ($t3) { 2370 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2377 glEnd;
2192 } 2378 }
2193 2379
2194 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2195 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2196} 2382}
2197 2383
2198############################################################################# 2384#############################################################################
2199 2385
2200package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2201 2387
2202our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2203 2389
2204sub new { 2390sub new {
2205 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2206 2392
2207 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2209 can_hover => 1, 2395 can_hover => 1,
2210 can_events => 1, 2396 can_events => 1,
2211 %arg, 2397 %arg,
2212 ); 2398 );
2213 2399
2214 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2401 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217 2403
2218 $self 2404 $self
2219} 2405}
2220 2406
2221sub set_fontsize { 2407sub set_fontsize {
… …
2242 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2243} 2429}
2244 2430
2245############################################################################# 2431#############################################################################
2246 2432
2247package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2248 2434
2249use strict; 2435use strict;
2250 2436
2251use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2252 2438
2253our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2254 2440
2255my @tex = 2441my @tex =
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2258 2444
2259sub new { 2445sub new {
2260 my $class = shift; 2446 my $class = shift;
2261 2447
… …
2282 $self->update; 2468 $self->update;
2283 2469
2284 $self 2470 $self
2285} 2471}
2286 2472
2287sub changed { }
2288
2289sub set_range { 2473sub set_range {
2290 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2291 2475
2292 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2293 2477
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2296} 2482}
2297 2483
2298sub set_value { 2484sub set_value {
2299 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2300 2486
… …
2311 if $unit; 2497 if $unit;
2312 2498
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2500
2315 if ($value != $old_value) { 2501 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2317 $self->update; 2503 $self->update;
2318 } 2504 }
2319} 2505}
2320 2506
2321sub size_request { 2507sub size_request {
2322 my ($self) = @_; 2508 my ($self) = @_;
2323 2509
2324 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2325} 2511}
2326 2512
2327sub button_down { 2513sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2329 2515
2330 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2517
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2519
2334 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2521}
2336 2522
2337sub mouse_motion { 2523sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2339 2525
2340 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2528
… …
2348 } else { 2534 } else {
2349 return 0; 2535 return 0;
2350 } 2536 }
2351 2537
2352 1 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2353} 2549}
2354 2550
2355sub update { 2551sub update {
2356 my ($self) = @_; 2552 my ($self) = @_;
2357 2553
… …
2406 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2407} 2603}
2408 2604
2409############################################################################# 2605#############################################################################
2410 2606
2411package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2412 2608
2413our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2414 2610
2415sub new { 2611sub new {
2416 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2417 2613
2418 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2419 2615
2420 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift }, 2619 to_value => sub { shift },
2424 from_value => sub { shift }, 2620 from_value => sub { shift },
2425 %arg, 2621 %arg,
2426 ); 2622 );
2427 2623
… …
2447sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2449 2645
2450############################################################################# 2646#############################################################################
2451 2647
2452package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2453 2649
2454our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2455 2651
2456use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2457 2653
2458sub new { 2654sub new {
2459 my $class = shift; 2655 my $class = shift;
2460 2656
2461 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2462 fontsize => 1, 2658 fontsize => 1,
2463 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2464 #font => default_font 2661 #font => default_font
2465 @_, 2662 @_,
2466 2663
2467 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2468 par => [], 2665 par => [],
2469 height => 0, 2666 height => 0,
2470 children => [ 2667 children => [
2471 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2473 ], 2670 ],
2474 ); 2671 );
2475 2672
2476 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2477 2674
… …
2483 2680
2484 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2682 $self->reflow;
2486} 2683}
2487 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2488sub size_allocate { 2694sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2490 2696
2491 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2699
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2704
2497 $self->reflow; 2705 $self->reflow;
2498}
2499 2706
2500sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2501 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2502 2723
2503 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2504 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2508 2737 );
2738
2509 $layout->size 2739 $layout
2510} 2740}
2511 2741
2512sub reflow { 2742sub reflow {
2513 my ($self) = @_; 2743 my ($self) = @_;
2514 2744
… …
2523 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2524} 2754}
2525 2755
2526sub clear { 2756sub clear {
2527 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2528 2761
2529 $self->{par} = []; 2762 $self->{par} = [];
2530 $self->{height} = 0; 2763 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2765}
2533 2766
2534sub add_paragraph { 2767sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2536 2769
2537 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2538 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2539 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2541 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2542 2780
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2544} 2794}
2545 2795
2546sub update { 2796sub update {
2547 my ($self) = @_; 2797 my ($self) = @_;
2548 2798
… …
2550 2800
2551 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2552 2802
2553 delete $self->{texture}; 2803 delete $self->{texture};
2554 2804
2555 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2807
2558 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2559 my $height = 0; 2809 my $height = 0;
2560 2810
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3]; 2815
2571 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2572 } 2819 }
2573 2820
2574 $height += $_->[1]; 2821 $height += $para->{h};
2575 } 2822 }
2576 2823
2577 $self->{height} = $height; 2824 $self->{height} = $height;
2578 2825
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580 2827
2581 delete $self->{texture}; 2828 delete $self->{texture};
2582 } 2829 }
2583 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2587 2838
2588 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2589 2840
2590 my $y0 = $top; 2841 my $y0 = $top;
2591 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2592 2843
2593 my $y = 0; 2844 my $y = 0;
2594 2845
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2847 my $h = $para->{h};
2605 2848
2606 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] });
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 2850
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2612 2852
2613 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2615 } 2867 }
2616 2868
2617 $y += $h; 2869 $y += $h;
2618 } 2870 }
2619
2620 glDisable GL_BLEND;
2621 }; 2871 };
2622 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2623} 2882}
2624 2883
2625sub _draw { 2884sub _draw {
2626 my ($self) = @_; 2885 my ($self) = @_;
2627 2886
… …
2630 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2633 2892
2634 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2635
2636} 2894}
2637 2895
2638############################################################################# 2896#############################################################################
2639 2897
2640package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2641 2899
2642use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2643 2901
2644our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2645 2903
2646sub moveto { 2904sub moveto {
2647 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2648 2906
2649 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2677 glPopMatrix; 2935 glPopMatrix;
2678} 2936}
2679 2937
2680############################################################################# 2938#############################################################################
2681 2939
2682package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2683 2941
2684our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2685 2943
2686sub new { 2944sub new {
2687 my $class = shift; 2945 my $class = shift;
2688 2946
2689 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2701 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2702} 2960}
2703 2961
2704############################################################################# 2962#############################################################################
2705 2963
2706package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2707 2965
2708our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2709 2967
2710use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2711 2969
2712sub new { 2970sub new {
2713 my $class = shift; 2971 my $class = shift;
2714 2972
2715 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2731 } 2989 }
2732 2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2733 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2734 markup => $tooltip, 2995 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 2997 fontsize => 0.8,
2737 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2738 ellipsise => 0, 2999 ellipsise => 0,
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3008
2748 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2749} 3010}
2750 3011
2751sub size_allocate { 3012sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2753 3014
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3016}
2756 3017
2757sub visibility_change { 3018sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2759 3020
2760 return unless $visible; 3021 return unless $visible;
2761 3022
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2764 or return; 3025 or return;
2765 3026
3027 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3029
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2770 3032
2771 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2772 }); 3037 });
2773} 3038}
2774 3039
2775sub _draw { 3040sub _draw {
2776 my ($self) = @_; 3041 my ($self) = @_;
… …
2800 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2801} 3066}
2802 3067
2803############################################################################# 3068#############################################################################
2804 3069
2805package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2806 3071
2807our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2808 3073
2809use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2810 3075
2811sub new { 3076sub new {
2812 my $class = shift; 3077 my $class = shift;
2813 3078
2814 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2849sub _draw { 3114sub _draw {
2850 my ($self) = @_; 3115 my ($self) = @_;
2851 3116
2852 return unless $::CONN; 3117 return unless $::CONN;
2853 3118
3119 $self->SUPER::_draw;
3120
2854 my $face; 3121 my $face;
2855 3122
2856 if ($self->{frame}) { 3123 if ($self->{frame}) {
2857 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2858 3125
… …
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2871 } 3138 }
2872} 3139}
2873 3140
2874sub DESTROY { 3141sub destroy {
2875 my ($self) = @_; 3142 my ($self) = @_;
2876 3143
2877 $self->{timer}->cancel 3144 $self->{timer}->cancel
2878 if $self->{timer}; 3145 if $self->{timer};
2879 3146
2880 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2881} 3148}
2882 3149
2883############################################################################# 3150#############################################################################
2884 3151
2885package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2886 3153
2887our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2888 3155
2889# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2890 3157
2891############################################################################# 3158#############################################################################
2892 3159
2893package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2894 3161
2895our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2896 3163
2897use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2898 3165
2899sub new { 3166sub new {
2900 my $class = shift; 3167 my $class = shift;
2901 3168
2902 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2903 items => [], 3170 items => [],
2904 z => 100, 3171 z => 100,
2905 @_, 3172 @_,
2906 ); 3173 );
2907 3174
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909 3176
2910 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2912 3179
2913 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2914 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2915 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2916 can_hover => 1, 3186 can_hover => 1,
2917 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
2918 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2919 } 3202 }
2920 3203
2921 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2922 3205
2923 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2928 3211
2929# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2930sub popup { 3213sub popup {
2931 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2932 3215
2933 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2934 3217
2935 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3219 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2938 3221
2939 $self->show; 3222 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3224}
2942 3225
2943sub mouse_motion { 3226sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2945 3228
2946 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2949 3232
2950 0 3233 0
2951} 3234}
2952 3235
2953sub button_up { 3236sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2955 3238
2956 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3240 undef $GRAB;
2958 $self->hide; 3241 $self->hide;
2959 3242
2960 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3245 } else {
2963 return 0 3246 return 0
2964 } 3247 }
2965 3248
2966 1 3249 1
2967} 3250}
2968 3251
2969############################################################################# 3252#############################################################################
2970 3253
2971package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
2972 3255
2973our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
2974 3257
2975sub new { 3258sub new {
2976 my $class = shift; 3259 my $class = shift;
2977 3260
2978 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
2992 3275
2993 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3277 if @{ $self->{children} };
2995} 3278}
2996 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
2997sub set_current_page { 3286sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
2999 3288
3000 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3290 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3003 3292
3004 $self->{current} = $widget; 3293 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3295
3007 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3008 3297
3009 $self->realloc; 3298 $self->realloc;
3010} 3299}
3011 3300
3012sub visible_children { 3301sub visible_children {
… …
3017 my ($self) = @_; 3306 my ($self) = @_;
3018 3307
3019 $self->{current}->size_request 3308 $self->{current}->size_request
3020} 3309}
3021 3310
3022sub size_allocate { 3311sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3024 3313
3025 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3026} 3317}
3027 3318
3028sub _draw { 3319sub _draw {
3029 my ($self) = @_; 3320 my ($self) = @_;
3030 3321
3031 $self->{current}->draw; 3322 $self->{current}->draw;
3032} 3323}
3033 3324
3034############################################################################# 3325#############################################################################
3035 3326
3036package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3037 3328
3038our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3039 3330
3040sub new { 3331sub new {
3041 my $class = shift; 3332 my $class = shift;
3042 3333
3043 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3047 @_, 3338 @_,
3048 ); 3339 );
3049 3340
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3056sub add { 3347sub add {
3057 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3058 3349
3059 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3060 3351
3061 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3062 markup => $title, 3353 markup => $title,
3063 tooltip => $tooltip, 3354 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3065 ); 3356 );
3066 3357
3067 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3068} 3359}
3069 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3070sub set_current_page { 3367sub set_current_page {
3071 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3072 3369
3073 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3075} 3372}
3076 3373
3077############################################################################# 3374#############################################################################
3078 3375
3376package CFPlus::UI::Selector;
3377
3378use utf8;
3379
3380our @ISA = CFPlus::UI::Button::;
3381
3382sub new {
3383 my $class = shift;
3384
3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3079package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3080 3433
3081our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3082 3435
3083sub new { 3436sub new {
3084 my $class = shift; 3437 my $class = shift;
3085 3438
3086 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3098sub reorder { 3451sub reorder {
3099 my ($self) = @_; 3452 my ($self) = @_;
3100 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3101 3454
3102 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3106 3459
3107 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3108 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109 } 3462 }
… …
3130 for ($short) { 3483 for ($short) {
3131 s/^\s+//; 3484 s/^\s+//;
3132 s/\s+/ /g; 3485 s/\s+/ /g;
3133 } 3486 }
3134 3487
3135 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3136 markup => $short, 3489 markup => $short,
3137 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3138 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3139 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3140 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3178 $item->{count}++; 3531 $item->{count}++;
3179 } else { 3532 } else {
3180 $item->{count} = 1; 3533 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3182 } 3535 }
3183 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3538 delete $item->{label};
3186 } else { 3539 } else {
3187 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3194 count => 1, 3547 count => 1,
3195 %arg, 3548 %arg,
3196 }; 3549 };
3197 } 3550 }
3198 3551
3552 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3553 $self->reorder;
3554 });
3200} 3555}
3201 3556
3202sub reconfigure { 3557sub reconfigure {
3203 my ($self) = @_; 3558 my ($self) = @_;
3204 3559
… …
3207 3562
3208 $self->reorder; 3563 $self->reorder;
3209 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3210} 3565}
3211 3566
3212sub DESTROY { 3567sub destroy {
3213 my ($self) = @_; 3568 my ($self) = @_;
3214 3569
3215 $self->{timer}->cancel; 3570 $self->{timer}->cancel;
3216 3571
3217 $self->SUPER::DESTROY; 3572 $self->SUPER::destroy;
3218} 3573}
3219 3574
3220############################################################################# 3575#############################################################################
3221 3576
3222package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3223 3578
3224our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3225 3580
3226sub new { 3581sub new {
3227 my $class = shift; 3582 my $class = shift;
3228 3583
3229 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3231 @_, 3587 @_,
3232 ); 3588 );
3233 3589
3590 $self->set_sort_order (undef);
3591
3234 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3235} 3628}
3236 3629
3237sub set_items { 3630sub set_items {
3238 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3239 3632
3240 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3241 return unless $items; 3634 $self->update_items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260} 3635}
3261 3636
3262############################################################################# 3637#############################################################################
3263 3638
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3462 3640
3463our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3464 3642
3465sub new { 3643sub new {
3466 my $class = shift; 3644 my $class = shift;
3467 3645
3468 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3470 commands => [], 3648 commands => [],
3471 @_, 3649 @_,
3472 ) 3650 )
3473} 3651}
3474 3652
3475# XXX: Do sorting? Argl... 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3476sub add_spell { 3738sub add_spell {
3477 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3478 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3479 3742 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3743}
3508 3744
3509sub remove_spell { 3745sub remove_spell {
3510 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3511 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3512 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3513} 3750}
3514 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3515############################################################################# 3759#############################################################################
3516 3760
3517package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3518 3762
3519our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3520 3764
3521use List::Util qw(min max); 3765use List::Util qw(min max);
3522 3766
3523use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3524 3768
3525sub new { 3769sub new {
3526 my $class = shift; 3770 my $class = shift;
3527 3771
3528 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3553 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3554 3798
3555 int $coord + 0.5 3799 int $coord + 0.5
3556} 3800}
3557 3801
3558sub size_allocate { 3802sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3560 3804
3561 for my $child ($self->children) { 3805 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3807
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3569 3813
3570 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3571 } 3815 }
3816
3817 1
3572} 3818}
3573 3819
3574sub coord2local { 3820sub coord2local {
3575 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3576 3822
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 3949
3704 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3706 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3707 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3709 3964
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3736 glLoadIdentity; 3991 glLoadIdentity;
3737 3992
3738 { 3993 {
3739 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3740 3995
3741 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3743 } 3998 }
3744 3999
3745 $self->_draw; 4000 $self->_draw;
3746} 4001}
3747 4002
3748############################################################################# 4003#############################################################################
3749 4004
3750package CFClient::UI; 4005package CFPlus::UI;
3751 4006
3752$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3753$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754 4009
37551 40101
3756 4011

Diff Legend

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