ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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