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

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

Diff Legend

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