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

Diff Legend

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