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.283 by root, Mon Jun 5 02:28:30 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;
… …
1551 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1552 1664
1553 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1555 1667
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1669
1558 delete $self->{req_h}; 1670 delete $self->{size_req};
1559
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);
1684
1574 delete $self->{req_h}; 1685 delete $self->{size_req};
1575
1576 $self->realloc; 1686 $self->realloc;
1577 $self->update; 1687 $self->update;
1578} 1688}
1579 1689
1580sub size_request { 1690sub size_request {
1581 my ($self) = @_; 1691 my ($self) = @_;
1582 1692
1583 if (exists $self->{req_h}) { 1693 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1699
1592 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1593 1701
1594 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1595 $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);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1706
1598 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1599 1708
1600 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1602 } 1711 }
1603 1712
1604 ($w, $h) 1713 [$w, $h]
1605 } 1714 };
1606}
1607 1715
1716 @{ $self->{size_req} }
1717}
1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1608sub size_allocate { 1723sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1610 1725
1611 delete $self->{ox}; 1726 delete $self->{ox};
1612 1727
1613 delete $self->{texture} 1728 delete $self->{texture}
1614 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
1615} 1732}
1616 1733
1617sub set_fontsize { 1734sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1619 1736
1620 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1621 delete $self->{texture}; 1739 delete $self->{texture};
1622 1740
1623 $self->realloc; 1741 $self->realloc;
1624} 1742}
1625 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1626sub _draw { 1753sub _draw {
1627 my ($self) = @_; 1754 my ($self) = @_;
1628 1755
1629 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1630 1757
1631 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1765
1639 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1640 }; 1767 };
1641 1768
1642 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1646 1773
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1777 };
1651 1778
1652 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1781
1655 glColor_premultiply @{$self->{fg}} 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 1783}
1662 1784
1663############################################################################# 1785#############################################################################
1664 1786
1665package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1666 1788
1667our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1668 1790
1669use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1670 1792
1671sub new { 1793sub new {
1672 my $class = shift; 1794 my $class = shift;
1673 1795
1674 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1679 can_hover => 1, 1801 can_hover => 1,
1680 can_focus => 1, 1802 can_focus => 1,
1681 valign => 0, 1803 valign => 0,
1682 can_events => 1, 1804 can_events => 1,
1683 #text => ... 1805 #text => ...
1806 #hidden => "*",
1684 @_ 1807 @_
1685 ) 1808 )
1686} 1809}
1687 1810
1688sub _set_text { 1811sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1819 $self->{text} = $text;
1697 1820
1698 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1823 delete $self->{size_req};
1701 1824
1702 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1703 1826
1704 $self->realloc; 1827 $self->realloc;
1705 $self->update; 1828 $self->update;
1706} 1829}
1707 1830
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1723 1846
1724 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1725} 1848}
1726 1849
1727sub key_down { 1850sub invoke_key_down {
1728 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1729 1852
1730 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1735 1858
1736 if ($uni == 8) { 1859 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1745 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1747 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1872 $self->emit ('escape');
1750 } elsif ($uni) { 1873 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1875 } else {
1753 return 0; 1876 return 0;
1754 } 1877 }
… …
1758 $self->realloc; 1881 $self->realloc;
1759 1882
1760 1 1883 1
1761} 1884}
1762 1885
1763sub focus_in { 1886sub invoke_focus_in {
1764 my ($self) = @_; 1887 my ($self) = @_;
1765 1888
1766 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1767 1890
1768 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1769} 1892}
1770 1893
1771sub button_down { 1894sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1773 1896
1774 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1898
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1900
1778 # byte-index to char-index 1901 # byte-index to char-index
1779 my $text = $self->{text}; 1902 my $text = $self->{text};
1780 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1782 1905
1783 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1784 $self->update; 1907 $self->update;
1785 1908
1786 1 1909 1
1787} 1910}
1788 1911
1789sub mouse_motion { 1912sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1791# 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#
1792 1915
1793 0 1916 1
1794} 1917}
1795 1918
1796sub _draw { 1919sub _draw {
1797 my ($self) = @_; 1920 my ($self) = @_;
1798 1921
… …
1833 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};
1834 glEnd; 1957 glEnd;
1835 } 1958 }
1836} 1959}
1837 1960
1838package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1839 1962
1840our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1841 1964
1842use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1843 1966
1844sub key_down { 1967sub invoke_key_down {
1845 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1846 1969
1847 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1848 1971
1849 if ($sym == 13) { 1972 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1852 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1855 $self->update; 1979 $self->update;
1856 1980
1857 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1860 } 1984 }
1861 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 1989 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 1991 }
1868 1992
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 1996
1873 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 1999 } else {
1876 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1877 } 2001 }
1878 2002
1879 } else { 2003 } else {
1880 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1881 } 2005 }
1882 2006
1883 1 2007 1
1884} 2008}
1885 2009
1886############################################################################# 2010#############################################################################
1887 2011
1888package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1889 2013
1890our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1891 2015
1892use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1893 2017
1894my @tex = 2018my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1897 2021
1898sub new { 2022sub new {
1899 my $class = shift; 2023 my $class = shift;
1900 2024
… …
1909 can_events => 1, 2033 can_events => 1,
1910 @_ 2034 @_
1911 ) 2035 )
1912} 2036}
1913 2037
1914sub activate { }
1915
1916sub button_up { 2038sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1918 2040
1919 $self->emit ("activate") 2041 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1939 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1940} 2062}
1941 2063
1942############################################################################# 2064#############################################################################
1943 2065
1944package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1945 2067
1946our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1947 2069
1948my @tex = 2070my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2073
1952use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1953 2075
1954sub new { 2076sub new {
1955 my $class = shift; 2077 my $class = shift;
1956 2078
1957 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1971 my ($self) = @_; 2093 my ($self) = @_;
1972 2094
1973 (6) x 2 2095 (6) x 2
1974} 2096}
1975 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1976sub button_down { 2106sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1978 2108
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2111 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2112 } else {
1984 return 0 2113 return 0
1985 } 2114 }
1986 2115
1987 1 2116 1
… …
2007 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
2008} 2137}
2009 2138
2010############################################################################# 2139#############################################################################
2011 2140
2012package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2013 2142
2014our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2015 2144
2016use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2146
2019our %loaded_images; 2147our %texture_cache;
2020 2148
2021sub new { 2149sub new {
2022 my $class = shift; 2150 my $class = shift;
2023 2151
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2025 2156
2026 $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";
2027 2159
2028 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 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;
2030 2162
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2164
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2166
2037 $self 2167 $self
2038} 2168}
2039 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
2040sub size_request { 2185sub size_request {
2041 my ($self) = @_; 2186 my ($self) = @_;
2042 2187
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2044} 2189}
2045 2190
2046sub _draw { 2191sub _draw {
2047 my ($self) = @_; 2192 my ($self) = @_;
2048 2193
… …
2058 } 2203 }
2059 2204
2060 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2207
2063 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2064 2209
2065 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2066} 2211}
2067 2212
2068############################################################################# 2213#############################################################################
2069 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
2070package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2071 2252
2072our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2073 2254
2074use List::Util qw(min max); 2255use List::Util qw(min max);
2075 2256
2076use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2077 2258
2078my %tex = ( 2259my %tex = (
2079 food => [ 2260 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2263 ],
2083 grace => [ 2264 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 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/
2086 ], 2267 ],
2087 hp => [ 2268 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2271 ],
2091 mana => [ 2272 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 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/
2094 ], 2275 ],
2095); 2276);
2096 2277
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2340
2160 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2161 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);
2162 2346
2163 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2185 2369
2186 if ($t3) { 2370 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2377 glEnd;
2194 } 2378 }
2195 2379
2196 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2198} 2382}
2199 2383
2200############################################################################# 2384#############################################################################
2201 2385
2202package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2203 2387
2204our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2205 2389
2206sub new { 2390sub new {
2207 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2208 2392
2209 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2395 can_hover => 1,
2212 can_events => 1, 2396 can_events => 1,
2213 %arg, 2397 %arg,
2214 ); 2398 );
2215 2399
2216 $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");
2217 $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);
2218 $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");
2219 2403
2220 $self 2404 $self
2221} 2405}
2222 2406
2223sub set_fontsize { 2407sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2245} 2429}
2246 2430
2247############################################################################# 2431#############################################################################
2248 2432
2249package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2250 2434
2251use strict; 2435use strict;
2252 2436
2253use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2254 2438
2255our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2256 2440
2257my @tex = 2441my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2260 2444
2261sub new { 2445sub new {
2262 my $class = shift; 2446 my $class = shift;
2263 2447
… …
2284 $self->update; 2468 $self->update;
2285 2469
2286 $self 2470 $self
2287} 2471}
2288 2472
2289sub changed { }
2290
2291sub set_range { 2473sub set_range {
2292 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2293 2475
2294 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2295 2477
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2298} 2482}
2299 2483
2300sub set_value { 2484sub set_value {
2301 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2302 2486
… …
2313 if $unit; 2497 if $unit;
2314 2498
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2500
2317 if ($value != $old_value) { 2501 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2319 $self->update; 2503 $self->update;
2320 } 2504 }
2321} 2505}
2322 2506
2323sub size_request { 2507sub size_request {
2324 my ($self) = @_; 2508 my ($self) = @_;
2325 2509
2326 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2327} 2511}
2328 2512
2329sub button_down { 2513sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2331 2515
2332 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2517
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2519
2336 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2521}
2338 2522
2339sub mouse_motion { 2523sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2341 2525
2342 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2528
… …
2350 } else { 2534 } else {
2351 return 0; 2535 return 0;
2352 } 2536 }
2353 2537
2354 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
2355} 2549}
2356 2550
2357sub update { 2551sub update {
2358 my ($self) = @_; 2552 my ($self) = @_;
2359 2553
… …
2408 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2409} 2603}
2410 2604
2411############################################################################# 2605#############################################################################
2412 2606
2413package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2414 2608
2415our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2416 2610
2417sub new { 2611sub new {
2418 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2419 2613
2420 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2421 2615
2422 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 2619 to_value => sub { shift },
2426 from_value => sub { shift }, 2620 from_value => sub { shift },
2427 %arg, 2621 %arg,
2428 ); 2622 );
2429 2623
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2451 2645
2452############################################################################# 2646#############################################################################
2453 2647
2454package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2455 2649
2456our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2457 2651
2458use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2459 2653
2460sub new { 2654sub new {
2461 my $class = shift; 2655 my $class = shift;
2462 2656
2463 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2464 fontsize => 1, 2658 fontsize => 1,
2465 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2466 #font => default_font 2661 #font => default_font
2467 @_, 2662 @_,
2468 2663
2469 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2470 par => [], 2665 par => [],
2471 height => 0, 2666 height => 0,
2472 children => [ 2667 children => [
2473 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2475 ], 2670 ],
2476 ); 2671 );
2477 2672
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2479 2674
… …
2485 2680
2486 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2682 $self->reflow;
2488} 2683}
2489 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
2490sub size_allocate { 2694sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2492 2696
2493 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2699
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $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});
2498 2704
2499 $self->reflow; 2705 $self->reflow;
2500}
2501 2706
2502sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2503 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) = @_;
2504 2723
2505 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2506 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $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});
2509 $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}}
2510 2737 );
2738
2511 $layout->size 2739 $layout
2512} 2740}
2513 2741
2514sub reflow { 2742sub reflow {
2515 my ($self) = @_; 2743 my ($self) = @_;
2516 2744
… …
2525 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2526} 2754}
2527 2755
2528sub clear { 2756sub clear {
2529 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2530 2761
2531 $self->{par} = []; 2762 $self->{par} = [];
2532 $self->{height} = 0; 2763 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2765}
2535 2766
2536sub add_paragraph { 2767sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2538 2769
2539 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2541 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2543 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2544 2780
2545 $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;
2546} 2794}
2547 2795
2548sub update { 2796sub update {
2549 my ($self) = @_; 2797 my ($self) = @_;
2550 2798
… …
2552 2800
2553 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2554 2802
2555 delete $self->{texture}; 2803 delete $self->{texture};
2556 2804
2557 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2807
2560 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2809 my $height = 0;
2562 2810
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2815
2573 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2574 } 2819 }
2575 2820
2576 $height += $_->[1]; 2821 $height += $para->{h};
2577 } 2822 }
2578 2823
2579 $self->{height} = $height; 2824 $self->{height} = $height;
2580 2825
2581 $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]);
2582 2827
2583 delete $self->{texture}; 2828 delete $self->{texture};
2584 } 2829 }
2585 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2589 2838
2590 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2591 2840
2592 my $y0 = $top; 2841 my $y0 = $top;
2593 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2594 2843
2595 my $y = 0; 2844 my $y = 0;
2596 2845
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2847 my $h = $para->{h};
2607 2848
2608 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 2850
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2614 2852
2615 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2616 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 }
2617 } 2867 }
2618 2868
2619 $y += $h; 2869 $y += $h;
2620 } 2870 }
2621
2622 glDisable GL_BLEND;
2623 }; 2871 };
2624 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2625} 2882}
2626 2883
2627sub _draw { 2884sub _draw {
2628 my ($self) = @_; 2885 my ($self) = @_;
2629 2886
… …
2632 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2633 $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});
2634 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2635 2892
2636 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2637
2638} 2894}
2639 2895
2640############################################################################# 2896#############################################################################
2641 2897
2642package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2643 2899
2644use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2645 2901
2646our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2647 2903
2648sub moveto { 2904sub moveto {
2649 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2650 2906
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 2935 glPopMatrix;
2680} 2936}
2681 2937
2682############################################################################# 2938#############################################################################
2683 2939
2684package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2685 2941
2686our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2687 2943
2688sub new { 2944sub new {
2689 my $class = shift; 2945 my $class = shift;
2690 2946
2691 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2704} 2960}
2705 2961
2706############################################################################# 2962#############################################################################
2707 2963
2708package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2709 2965
2710our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2711 2967
2712use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2713 2969
2714sub new { 2970sub new {
2715 my $class = shift; 2971 my $class = shift;
2716 2972
2717 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2733 } 2989 }
2734 2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2735 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 2995 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2997 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2740 ellipsise => 0, 2999 ellipsise => 0,
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3008
2750 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2751} 3010}
2752 3011
2753sub size_allocate { 3012sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2755 3014
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3016}
2758 3017
2759sub visibility_change { 3018sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2761 3020
2762 return unless $visible; 3021 return unless $visible;
2763 3022
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2766 or return; 3025 or return;
2767 3026
3027 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3029
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2772 3032
2773 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2774 }); 3037 });
2775} 3038}
2776 3039
2777sub _draw { 3040sub _draw {
2778 my ($self) = @_; 3041 my ($self) = @_;
… …
2802 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2803} 3066}
2804 3067
2805############################################################################# 3068#############################################################################
2806 3069
2807package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2808 3071
2809our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2810 3073
2811use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2812 3075
2813sub new { 3076sub new {
2814 my $class = shift; 3077 my $class = shift;
2815 3078
2816 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2851sub _draw { 3114sub _draw {
2852 my ($self) = @_; 3115 my ($self) = @_;
2853 3116
2854 return unless $::CONN; 3117 return unless $::CONN;
2855 3118
3119 $self->SUPER::_draw;
3120
2856 my $face; 3121 my $face;
2857 3122
2858 if ($self->{frame}) { 3123 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2860 3125
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2873 } 3138 }
2874} 3139}
2875 3140
2876sub DESTROY { 3141sub destroy {
2877 my ($self) = @_; 3142 my ($self) = @_;
2878 3143
2879 $self->{timer}->cancel 3144 $self->{timer}->cancel
2880 if $self->{timer}; 3145 if $self->{timer};
2881 3146
2882 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2883} 3148}
2884 3149
2885############################################################################# 3150#############################################################################
2886 3151
2887package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2888 3153
2889our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2890 3155
2891# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2892 3157
2893############################################################################# 3158#############################################################################
2894 3159
2895package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2896 3161
2897our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2898 3163
2899use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2900 3165
2901sub new { 3166sub new {
2902 my $class = shift; 3167 my $class = shift;
2903 3168
2904 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2905 items => [], 3170 items => [],
2906 z => 100, 3171 z => 100,
2907 @_, 3172 @_,
2908 ); 3173 );
2909 3174
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3176
2912 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2914 3179
2915 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2916 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2917 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3186 can_hover => 1,
2919 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,
2920 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2921 } 3202 }
2922 3203
2923 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2924 3205
2925 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2930 3211
2931# 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)
2932sub popup { 3213sub popup {
2933 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2934 3215
2935 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2936 3217
2937 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3219 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2940 3221
2941 $self->show; 3222 $self->show;
2942 $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);
2943} 3224}
2944 3225
2945sub mouse_motion { 3226sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2947 3228
2948 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2951 3232
2952 0 3233 0
2953} 3234}
2954 3235
2955sub button_up { 3236sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2957 3238
2958 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3240 undef $GRAB;
2960 $self->hide; 3241 $self->hide;
2961 3242
2962 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3245 } else {
2965 return 0 3246 return 0
2966 } 3247 }
2967 3248
2968 1 3249 1
2969} 3250}
2970 3251
2971############################################################################# 3252#############################################################################
2972 3253
2973package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
2974 3255
2975our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
2976 3257
2977sub new { 3258sub new {
2978 my $class = shift; 3259 my $class = shift;
2979 3260
2980 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
2994 3275
2995 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3277 if @{ $self->{children} };
2997} 3278}
2998 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
2999sub set_current_page { 3286sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3001 3288
3002 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3290 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3005 3292
3006 $self->{current} = $widget; 3293 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3295
3009 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3010 3297
3011 $self->realloc; 3298 $self->realloc;
3012} 3299}
3013 3300
3014sub visible_children { 3301sub visible_children {
… …
3019 my ($self) = @_; 3306 my ($self) = @_;
3020 3307
3021 $self->{current}->size_request 3308 $self->{current}->size_request
3022} 3309}
3023 3310
3024sub size_allocate { 3311sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3026 3313
3027 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3028} 3317}
3029 3318
3030sub _draw { 3319sub _draw {
3031 my ($self) = @_; 3320 my ($self) = @_;
3032 3321
3033 $self->{current}->draw; 3322 $self->{current}->draw;
3034} 3323}
3035 3324
3036############################################################################# 3325#############################################################################
3037 3326
3038package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3039 3328
3040our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3041 3330
3042sub new { 3331sub new {
3043 my $class = shift; 3332 my $class = shift;
3044 3333
3045 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3049 @_, 3338 @_,
3050 ); 3339 );
3051 3340
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3058sub add { 3347sub add {
3059 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3060 3349
3061 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3062 3351
3063 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3064 markup => $title, 3353 markup => $title,
3065 tooltip => $tooltip, 3354 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3067 ); 3356 );
3068 3357
3069 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3070} 3359}
3071 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3072sub set_current_page { 3367sub set_current_page {
3073 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3074 3369
3075 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3077} 3372}
3078 3373
3079############################################################################# 3374#############################################################################
3080 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
3081package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3082 3433
3083our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3084 3435
3085sub new { 3436sub new {
3086 my $class = shift; 3437 my $class = shift;
3087 3438
3088 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3100sub reorder { 3451sub reorder {
3101 my ($self) = @_; 3452 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3103 3454
3104 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3108 3459
3109 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 3462 }
… …
3132 for ($short) { 3483 for ($short) {
3133 s/^\s+//; 3484 s/^\s+//;
3134 s/\s+/ /g; 3485 s/\s+/ /g;
3135 } 3486 }
3136 3487
3137 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3138 markup => $short, 3489 markup => $short,
3139 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 3531 $item->{count}++;
3181 } else { 3532 } else {
3182 $item->{count} = 1; 3533 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3184 } 3535 }
3185 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3538 delete $item->{label};
3188 } else { 3539 } else {
3189 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3196 count => 1, 3547 count => 1,
3197 %arg, 3548 %arg,
3198 }; 3549 };
3199 } 3550 }
3200 3551
3552 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3553 $self->reorder;
3554 });
3202} 3555}
3203 3556
3204sub reconfigure { 3557sub reconfigure {
3205 my ($self) = @_; 3558 my ($self) = @_;
3206 3559
… …
3209 3562
3210 $self->reorder; 3563 $self->reorder;
3211 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3212} 3565}
3213 3566
3214sub DESTROY { 3567sub destroy {
3215 my ($self) = @_; 3568 my ($self) = @_;
3216 3569
3217 $self->{timer}->cancel; 3570 $self->{timer}->cancel;
3218 3571
3219 $self->SUPER::DESTROY; 3572 $self->SUPER::destroy;
3220} 3573}
3221 3574
3222############################################################################# 3575#############################################################################
3223 3576
3224package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3225 3578
3226our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3227 3580
3228sub new { 3581sub new {
3229 my $class = shift; 3582 my $class = shift;
3230 3583
3231 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3233 @_, 3587 @_,
3234 ); 3588 );
3235 3589
3590 $self->set_sort_order (undef);
3591
3236 $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;
3237} 3628}
3238 3629
3239sub set_items { 3630sub set_items {
3240 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3241 3632
3242 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3243 return unless $items; 3634 $self->update_items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262} 3635}
3263 3636
3264############################################################################# 3637#############################################################################
3265 3638
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3464 3640
3465our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3466 3642
3467sub new { 3643sub new {
3468 my $class = shift; 3644 my $class = shift;
3469 3645
3470 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3472 commands => [], 3648 commands => [],
3473 @_, 3649 @_,
3474 ) 3650 )
3475} 3651}
3476 3652
3477# 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
3478sub add_spell { 3738sub add_spell {
3479 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3480 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3481 3742 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3743}
3510 3744
3511sub remove_spell { 3745sub remove_spell {
3512 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3513 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3514 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3515} 3750}
3516 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3517############################################################################# 3759#############################################################################
3518 3760
3519package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3520 3762
3521our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3522 3764
3523use List::Util qw(min max); 3765use List::Util qw(min max);
3524 3766
3525use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3526 3768
3527sub new { 3769sub new {
3528 my $class = shift; 3770 my $class = shift;
3529 3771
3530 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3555 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3556 3798
3557 int $coord + 0.5 3799 int $coord + 0.5
3558} 3800}
3559 3801
3560sub size_allocate { 3802sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3562 3804
3563 for my $child ($self->children) { 3805 for my $child ($self->children) {
3564 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)};
3565 3807
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3571 3813
3572 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3573 } 3815 }
3816
3817 1
3574} 3818}
3575 3819
3576sub coord2local { 3820sub coord2local {
3577 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3578 3822
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 3949
3706 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3708 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
3709 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3711 3964
3712 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}) {
3713 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 3991 glLoadIdentity;
3739 3992
3740 { 3993 {
3741 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3742 3995
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3745 } 3998 }
3746 3999
3747 $self->_draw; 4000 $self->_draw;
3748} 4001}
3749 4002
3750############################################################################# 4003#############################################################################
3751 4004
3752package CFClient::UI; 4005package CFPlus::UI;
3753 4006
3754$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4009
37571 40101
3758 4011

Diff Legend

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