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

Diff Legend

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