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

Diff Legend

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