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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.356 by root, Wed Dec 6 00:15:12 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 {
… …
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 do not like duplication
520 # and needlessly verbose code, either.
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 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
846 } 907 }
847
848 $self->_render;
849 }; 908 };
850} 909}
851 910
852sub _draw { 911sub _draw {
853 my ($self) = @_; 912 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 913
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
1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1136
1073sub new { 1137sub new {
1074 my ($class, %arg) = @_; 1138 my ($class, %arg) = @_;
1075 1139
1076 my $title = delete $arg{title}; 1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1077 1247
1078 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1251 border => 0.6,
1082 can_events => 1, 1252 can_events => 1,
1083 min_w => 16, 1253 min_w => 64,
1084 min_h => 16, 1254 min_h => 32,
1085 %arg, 1255 %arg,
1086 ); 1256 );
1087 1257
1088 $self->{title} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1259 align => 0,
1090 valign => 1, 1260 valign => 1,
1091 text => $title, 1261 text => $self->{title},
1092 fontsize => $self->{border} 1262 fontsize => $self->{border},
1093 if defined $title; 1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1094 1273
1095 $self 1274 $self
1096} 1275}
1097 1276
1098sub add { 1277sub add {
1099 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1100 1279
1101 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1283}
1104 1284
1105sub border { 1285sub border {
1106 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1107} 1287}
1108 1288
1109sub size_request { 1289sub size_request {
1110 my ($self) = @_; 1290 my ($self) = @_;
1111 1291
1112 $self->{title}->size_request 1292 $self->{title_widget}->size_request
1113 if $self->{title}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1114 1297
1115 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1116 1299
1117 ( 1300 (
1118 $w + $self->border * 2, 1301 $w + $self->border * 2,
1119 $h + $self->border * 2, 1302 $h + $self->border * 2,
1120 ) 1303 )
1121} 1304}
1122 1305
1123sub size_allocate { 1306sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1125 1308
1126 if ($self->{title}) { 1309 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1313 }
1131 1314
1132 my $border = $self->border; 1315 my $border = $self->border;
1133 1316
1134 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1136 1332
1137 $self->child->configure ($border, $border, $w, $h); 1333 1
1138} 1334}
1139 1335
1140sub button_down { 1336sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1142 1338
1143 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1340 my $border = $self->border;
1145 1341
… …
1176 1372
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1374
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1378 };
1183 } else { 1379 } else {
1184 return 0; 1380 return 0;
1185 } 1381 }
1186 1382
1187 1 1383 1
1188} 1384}
1189 1385
1190sub button_up { 1386sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1192 1388
1193 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1194} 1390}
1195 1391
1196sub mouse_motion { 1392sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1198 1394
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1396
1201 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1202} 1406}
1203 1407
1204sub _draw { 1408sub _draw {
1205 my ($self) = @_; 1409 my ($self) = @_;
1206 1410
… …
1232 1436
1233 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1234 1438
1235 $child->draw; 1439 $child->draw;
1236 1440
1237 if ($self->{title}) { 1441 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1240 } 1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1241} 1450}
1242 1451
1243############################################################################# 1452#############################################################################
1244 1453
1245package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1246 1455
1247our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1248 1457
1249use List::Util qw(max sum); 1458use List::Util qw(max sum);
1250 1459
1251use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1252 1461
1253sub new { 1462sub new {
1254 my $class = shift; 1463 my $class = shift;
1255 1464
1256 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1262sub children { 1471sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1473}
1265 1474
1266sub add { 1475sub add {
1267 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1268 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1480 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1271 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1273} 1493}
1274 1494
1275# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1496sub clear {
1277 my ($self) = @_; 1497 my ($self) = @_;
… …
1318 (sum @$ws), 1538 (sum @$ws),
1319 (sum @$hs), 1539 (sum @$hs),
1320 ) 1540 )
1321} 1541}
1322 1542
1323sub size_allocate { 1543sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1325 1545
1326 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1327 1547
1328 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1335 1555
1336 # linearly scale sizes 1556 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1559
1340 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1341 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1342 1562
1343 my $y; 1563 my $y;
1344 1564
1345 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1360 } 1580 }
1361 1581
1362 $y += $row_h; 1582 $y += $row_h;
1363 } 1583 }
1364 1584
1585 1
1365} 1586}
1366 1587
1367sub find_widget { 1588sub find_widget {
1368 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1369 1590
… …
1388 } 1609 }
1389} 1610}
1390 1611
1391############################################################################# 1612#############################################################################
1392 1613
1393package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1394 1615
1395our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1396 1617
1397sub size_request { 1618sub size_request {
1398 my ($self) = @_; 1619 my ($self) = @_;
1399 1620
1400 $self->{vertical} 1621 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1629 )
1409} 1630}
1410 1631
1411sub size_allocate { 1632sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1413 1634
1414 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1416 1637
1417 my @req; 1638 my @req;
1418 1639
1419 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1421 } else { 1642 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1424 1645
1425 if ($req > $space) { 1646 if ($req > $space) {
1426 # ah well, not enough space 1647 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1428 } else { 1649 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1651
1431 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1432 1653
1433 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1655 for 0 .. $#children;
1435 } 1656 }
1436 } 1657 }
1437 1658
1438 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1439 1660
1440 my $pos = 0; 1661 my $pos = 0;
1441 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1665
1445 $pos += $alloc; 1666 $pos += $alloc;
1446 } 1667 }
1447 1668
1448 1 1669 1
1449} 1670}
1450 1671
1451############################################################################# 1672#############################################################################
1452 1673
1453package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1454 1675
1455our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1456 1677
1457sub new { 1678sub new {
1458 my $class = shift; 1679 my $class = shift;
1459 1680
1460 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1463 ) 1684 )
1464} 1685}
1465 1686
1466############################################################################# 1687#############################################################################
1467 1688
1468package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1469 1690
1470our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1471 1692
1472sub new { 1693sub new {
1473 my $class = shift; 1694 my $class = shift;
1474 1695
1475 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1478 ) 1699 )
1479} 1700}
1480 1701
1481############################################################################# 1702#############################################################################
1482 1703
1483package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1484 1705
1485our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1486 1707
1487use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1488 1709
1489sub new { 1710sub new {
1490 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1491 1712
1492 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1716 #active_bg => none
1496 #font => default_font 1717 #font => default_font
1497 #text => initial text 1718 #text => initial text
1498 #markup => initial narkup 1719 #markup => initial narkup
1499 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1500 ellipsise => 3, # end 1722 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1724 fontsize => 1,
1503 align => -1, 1725 align => -1,
1504 valign => -1, 1726 valign => -1,
1505 padding_x => 2, 1727 padding_x => 2,
1506 padding_y => 2, 1728 padding_y => 2,
1507 can_events => 0, 1729 can_events => 0,
1508 %arg 1730 %arg
1509 ); 1731 );
1510 1732
1511 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1736 $self->{template} = $layout;
1515 } 1737 }
1516 1738
1517 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1521 } 1743 }
1522 1744
1523 $self 1745 $self
1524} 1746}
1525 1747
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1748sub update {
1537 my ($self) = @_; 1749 my ($self) = @_;
1538 1750
1539 delete $self->{texture}; 1751 delete $self->{texture};
1540 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1542 1754
1543sub realloc { 1755sub realloc {
1544 my ($self) = @_; 1756 my ($self) = @_;
1545 1757
1546 delete $self->{ox}; 1758 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1759 $self->SUPER::realloc;
1549} 1760}
1550 1761
1551sub set_text { 1762sub set_text {
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1556 1767
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1559 1769
1770 delete $self->{size_req};
1560 $self->realloc; 1771 $self->realloc;
1561 $self->update; 1772 $self->update;
1562} 1773}
1563 1774
1564sub set_markup { 1775sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1569 1780
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1782
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1574 1784
1785 delete $self->{size_req};
1575 $self->realloc; 1786 $self->realloc;
1576 $self->update; 1787 $self->update;
1577} 1788}
1578 1789
1579sub size_request { 1790sub size_request {
1580 my ($self) = @_; 1791 my ($self) = @_;
1581 1792
1582 if (exists $self->{req_h}) { 1793 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1794 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1795 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1796 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1799
1591 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1592 1801
1593 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1806
1597 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1598 1808
1599 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1810 $h = List::Util::max $h, $h2;
1601 } 1811 }
1602 1812
1603 ($w, $h) 1813 [$w, $h]
1604 } 1814 };
1605}
1606 1815
1816 @{ $self->{size_req} }
1817}
1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1607sub size_allocate { 1823sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1609 1825
1610 delete $self->{ox}; 1826 delete $self->{ox};
1611 1827
1612 delete $self->{texture} 1828 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1614} 1832}
1615 1833
1616sub set_fontsize { 1834sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1618 1836
1619 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1620 delete $self->{texture}; 1839 delete $self->{texture};
1621 1840
1622 $self->realloc; 1841 $self->realloc;
1623} 1842}
1624 1843
1844sub reconfigure {
1845 my ($self) = @_;
1846
1847 delete $self->{size_req};
1848 delete $self->{texture};
1849
1850 $self->SUPER::reconfigure;
1851}
1852
1625sub _draw { 1853sub _draw {
1626 my ($self) = @_; 1854 my ($self) = @_;
1627 1855
1628 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1629 1857
1630 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 1865
1638 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1639 }; 1867 };
1640 1868
1641 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1645 1873
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 1877 };
1650 1878
1651 glEnable GL_TEXTURE_2D; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 1881
1654 glColor_premultiply @{$self->{fg}} 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 1883}
1661 1884
1662############################################################################# 1885#############################################################################
1663 1886
1664package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1665 1888
1666our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1667 1890
1668use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1669 1892
1670sub new { 1893sub new {
1671 my $class = shift; 1894 my $class = shift;
1672 1895
1673 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1678 can_hover => 1, 1901 can_hover => 1,
1679 can_focus => 1, 1902 can_focus => 1,
1680 valign => 0, 1903 valign => 0,
1681 can_events => 1, 1904 can_events => 1,
1682 #text => ... 1905 #text => ...
1906 #hidden => "*",
1683 @_ 1907 @_
1684 ) 1908 )
1685} 1909}
1686 1910
1687sub _set_text { 1911sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 1918 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1919 $self->{text} = $text;
1696 1920
1697 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1923 delete $self->{size_req};
1699 1924
1700 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1926
1927 $self->realloc;
1701 $self->update; 1928 $self->update;
1702} 1929}
1703 1930
1704sub set_text { 1931sub set_text {
1705 my ($self, $text) = @_; 1932 my ($self, $text) = @_;
1706 1933
1707 $self->{cursor} = length $text; 1934 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1935 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1936}
1712 1937
1713sub get_text { 1938sub get_text {
1714 $_[0]{text} 1939 $_[0]{text}
1715} 1940}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1721 1946
1722 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1723} 1948}
1724 1949
1725sub key_down { 1950sub invoke_key_down {
1726 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1727 1952
1728 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1733 1958
1734 if ($uni == 8) { 1959 if ($uni == 8) {
1735 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1737 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1738 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1739 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1740 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1741 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1743 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1745 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1746 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1975 $self->emit ('escape');
1748 } elsif ($uni) { 1976 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1978 } else {
1751 return 0; 1979 return 0;
1752 } 1980 }
… …
1756 $self->realloc; 1984 $self->realloc;
1757 1985
1758 1 1986 1
1759} 1987}
1760 1988
1761sub focus_in { 1989sub invoke_focus_in {
1762 my ($self) = @_; 1990 my ($self) = @_;
1763 1991
1764 $self->{last_activity} = $::NOW; 1992 $self->{last_activity} = $::NOW;
1765 1993
1766 $self->SUPER::focus_in; 1994 $self->SUPER::invoke_focus_in
1767} 1995}
1768 1996
1769sub button_down { 1997sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1771 1999
1772 $self->SUPER::button_down ($ev, $x, $y); 2000 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 2001
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 2003
1776 # byte-index to char-index 2004 # byte-index to char-index
1777 my $text = $self->{text}; 2005 my $text = $self->{text};
1778 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1780 2008
1781 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1782 $self->update; 2010 $self->update;
1783 2011
1784 1 2012 1
1785} 2013}
1786 2014
1787sub mouse_motion { 2015sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2016 my ($self, $ev, $x, $y) = @_;
1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2017# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790 2018
1791 0 2019 1
1792} 2020}
1793 2021
1794sub _draw { 2022sub _draw {
1795 my ($self) = @_; 2023 my ($self) = @_;
1796 2024
… …
1823 utf8::encode $text; 2051 utf8::encode $text;
1824 2052
1825 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1826 } 2054 }
1827 2055
1828 glColor @{$self->{fg}};
1829 glBegin GL_LINES; 2056 glBegin GL_LINES;
1830 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1831 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832 glEnd; 2059 glEnd;
1833 } 2060 }
1834} 2061}
1835 2062
1836package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1837 2064
1838our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1839 2066
1840use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1841 2068
1842sub key_down { 2069sub invoke_key_down {
1843 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1844 2071
1845 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
1846 2073
1847 if ($sym == 13) { 2074 if ($sym == 13) {
1848 unshift @{$self->{history}}, 2075 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 2076 my $txt = $self->get_text;
2077
1850 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 2080 $self->emit (activate => $txt);
1853 $self->update; 2081 $self->update;
1854 2082
1855 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1858 } 2086 }
1859 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1860 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1862 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1863 } 2091 }
1864 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1865 } 2093 }
1866 2094
1867 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1868 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1869 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870 2098
1871 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1872 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1873 } else { 2101 } else {
1874 $self->set_text ($self->{history_saveback}); 2102 $self->set_text ($self->{history_saveback});
1875 } 2103 }
1876 2104
1877 } else { 2105 } else {
1878 return $self->SUPER::key_down ($ev) 2106 return $self->SUPER::invoke_key_down ($ev)
1879 } 2107 }
1880 2108
1881 1 2109 1
1882} 2110}
1883 2111
1884############################################################################# 2112#############################################################################
1885 2113
1886package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1887 2115
1888our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1889 2117
1890use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1891 2119
1892my @tex = 2120my @tex =
1893 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1895 2123
1896sub new { 2124sub new {
1897 my $class = shift; 2125 my $class = shift;
1898 2126
… …
1907 can_events => 1, 2135 can_events => 1,
1908 @_ 2136 @_
1909 ) 2137 )
1910} 2138}
1911 2139
1912sub activate { }
1913
1914sub button_up { 2140sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1916 2142
1917 $self->emit ("activate") 2143 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2144 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2145 && $y >= 0 && $y < $self->{h};
… …
1937 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1938} 2164}
1939 2165
1940############################################################################# 2166#############################################################################
1941 2167
1942package CFClient::UI::CheckBox; 2168package CFPlus::UI::CheckBox;
1943 2169
1944our @ISA = CFClient::UI::DrawBG::; 2170our @ISA = CFPlus::UI::DrawBG::;
1945 2171
1946my @tex = 2172my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949 2175
1950use CFClient::OpenGL; 2176use CFPlus::OpenGL;
1951 2177
1952sub new { 2178sub new {
1953 my $class = shift; 2179 my $class = shift;
1954 2180
1955 $class->SUPER::new ( 2181 $class->SUPER::new (
… …
1969 my ($self) = @_; 2195 my ($self) = @_;
1970 2196
1971 (6) x 2 2197 (6) x 2
1972} 2198}
1973 2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
1974sub button_down { 2208sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1976 2210
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2213 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2214 } else {
1982 return 0 2215 return 0
1983 } 2216 }
1984 2217
1985 1 2218 1
… …
2005 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2006} 2239}
2007 2240
2008############################################################################# 2241#############################################################################
2009 2242
2010package CFClient::UI::Image; 2243package CFPlus::UI::Image;
2011 2244
2012our @ISA = CFClient::UI::Base::; 2245our @ISA = CFPlus::UI::Base::;
2013 2246
2014use CFClient::OpenGL; 2247use CFPlus::OpenGL;
2015use Carp qw/confess/;
2016 2248
2017our %loaded_images; 2249our %texture_cache;
2018 2250
2019sub new { 2251sub new {
2020 my $class = shift; 2252 my $class = shift;
2021 2253
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
2023 2258
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
2025 2261
2026 $loaded_images{$self->{image}} ||= 2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028 2264
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2265 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2266
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2268
2035 $self 2269 $self
2036} 2270}
2037 2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
2038sub size_request { 2287sub size_request {
2039 my ($self) = @_; 2288 my ($self) = @_;
2040 2289
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2290 ($self->{tex}{w}, $self->{tex}{h})
2042} 2291}
2043 2292
2044sub _draw { 2293sub _draw {
2045 my ($self) = @_; 2294 my ($self) = @_;
2046 2295
… …
2056 } 2305 }
2057 2306
2058 glEnable GL_TEXTURE_2D; 2307 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2309
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2310 $tex->draw_quad (0, 0, $w, $h);
2062 2311
2063 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2064} 2313}
2065 2314
2066############################################################################# 2315#############################################################################
2067 2316
2317package CFPlus::UI::ImageButton;
2318
2319our @ISA = CFPlus::UI::Image::;
2320
2321use CFPlus::OpenGL;
2322
2323my %textures;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 padding_x => 4,
2330 padding_y => 4,
2331 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1],
2333 can_hover => 1,
2334 align => 0,
2335 valign => 0,
2336 can_events => 1,
2337 @_
2338 );
2339}
2340
2341sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_;
2343
2344 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w}
2346 && $y >= 0 && $y < $self->{h};
2347
2348 1
2349}
2350
2351#############################################################################
2352
2068package CFClient::UI::VGauge; 2353package CFPlus::UI::VGauge;
2069 2354
2070our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
2071 2356
2072use List::Util qw(min max); 2357use List::Util qw(min max);
2073 2358
2074use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2075 2360
2076my %tex = ( 2361my %tex = (
2077 food => [ 2362 food => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080 ], 2365 ],
2081 grace => [ 2366 grace => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084 ], 2369 ],
2085 hp => [ 2370 hp => [
2086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088 ], 2373 ],
2089 mana => [ 2374 mana => [
2090 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092 ], 2377 ],
2093); 2378);
2094 2379
2095# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2440 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2441 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2442
2158 my $h1 = $self->{h} * (1 - $ycut1); 2443 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2444 my $h2 = $self->{h} * (1 - $ycut2);
2445 my $h3 = $self->{h};
2446
2447 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2448
2161 glEnable GL_BLEND; 2449 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2450 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2451 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
… …
2183 2471
2184 if ($t3) { 2472 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2473 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2474 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2475 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2476 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2477 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2478 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2479 glEnd;
2192 } 2480 }
2193 2481
2194 glDisable GL_BLEND; 2482 glDisable GL_BLEND;
2195 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2196} 2484}
2197 2485
2198############################################################################# 2486#############################################################################
2199 2487
2200package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2201 2489
2202our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2203 2491
2204sub new { 2492sub new {
2205 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2206 2494
2207 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2209 can_hover => 1, 2497 can_hover => 1,
2210 can_events => 1, 2498 can_events => 1,
2211 %arg, 2499 %arg,
2212 ); 2500 );
2213 2501
2214 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217 2505
2218 $self 2506 $self
2219} 2507}
2220 2508
2221sub set_fontsize { 2509sub set_fontsize {
… …
2242 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2243} 2531}
2244 2532
2245############################################################################# 2533#############################################################################
2246 2534
2247package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2248 2536
2249use strict; 2537use strict;
2250 2538
2251use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2252 2540
2253our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2254 2542
2255my @tex = 2543my @tex =
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2258 2546
2259sub new { 2547sub new {
2260 my $class = shift; 2548 my $class = shift;
2261 2549
… …
2282 $self->update; 2570 $self->update;
2283 2571
2284 $self 2572 $self
2285} 2573}
2286 2574
2287sub changed { }
2288
2289sub set_range { 2575sub set_range {
2290 my ($self, $range) = @_; 2576 my ($self, $range) = @_;
2291 2577
2292 ($range, $self->{range}) = ($self->{range}, $range); 2578 ($range, $self->{range}) = ($self->{range}, $range);
2293 2579
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2580 if ("@$range" ne "@{$self->{range}}") {
2581 $self->update;
2582 $self->set_value ($self->{range}[0]);
2583 }
2296} 2584}
2297 2585
2298sub set_value { 2586sub set_value {
2299 my ($self, $value) = @_; 2587 my ($self, $value) = @_;
2300 2588
… …
2311 if $unit; 2599 if $unit;
2312 2600
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2602
2315 if ($value != $old_value) { 2603 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2604 $self->emit (changed => $value);
2317 $self->update; 2605 $self->update;
2318 } 2606 }
2319} 2607}
2320 2608
2321sub size_request { 2609sub size_request {
2322 my ($self) = @_; 2610 my ($self) = @_;
2323 2611
2324 ($self->{req_w}, $self->{req_h}) 2612 ($self->{req_w}, $self->{req_h})
2325} 2613}
2326 2614
2327sub button_down { 2615sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2329 2617
2330 $self->SUPER::button_down ($ev, $x, $y); 2618 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2619
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2621
2334 $self->mouse_motion ($ev, $x, $y) 2622 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2623}
2336 2624
2337sub mouse_motion { 2625sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2626 my ($self, $ev, $x, $y) = @_;
2339 2627
2340 if ($GRAB == $self) { 2628 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2630
… …
2348 } else { 2636 } else {
2349 return 0; 2637 return 0;
2350 } 2638 }
2351 2639
2352 1 2640 1
2641}
2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2353} 2651}
2354 2652
2355sub update { 2653sub update {
2356 my ($self) = @_; 2654 my ($self) = @_;
2357 2655
… …
2406 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2407} 2705}
2408 2706
2409############################################################################# 2707#############################################################################
2410 2708
2411package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2412 2710
2413our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2414 2712
2415sub new { 2713sub new {
2416 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2417 2715
2418 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2419 2717
2420 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift }, 2721 to_value => sub { shift },
2424 from_value => sub { shift }, 2722 from_value => sub { shift },
2425 %arg, 2723 %arg,
2426 ); 2724 );
2427 2725
… …
2447sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2449 2747
2450############################################################################# 2748#############################################################################
2451 2749
2452package CFClient::UI::TextView; 2750package CFPlus::UI::TextScroller;
2453 2751
2454our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2455 2753
2456use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2457 2755
2458sub new { 2756sub new {
2459 my $class = shift; 2757 my $class = shift;
2460 2758
2461 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2462 fontsize => 1, 2760 fontsize => 1,
2463 can_events => 0, 2761 can_events => 1,
2762 indent => 0,
2464 #font => default_font 2763 #font => default_font
2465 @_, 2764 @_,
2466 2765
2467 layout => (new CFClient::Layout 1), 2766 layout => (new CFPlus::Layout),
2468 par => [], 2767 par => [],
2469 height => 0, 2768 height => 0,
2470 children => [ 2769 children => [
2471 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2473 ], 2772 ],
2474 ); 2773 );
2475 2774
2476 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2477 2776
… …
2483 2782
2484 $self->{fontsize} = $fontsize; 2783 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2784 $self->reflow;
2486} 2785}
2487 2786
2787sub size_request {
2788 my ($self) = @_;
2789
2790 my ($empty, $slider) = @{ $self->{children} };
2791
2792 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request
2794}
2795
2488sub size_allocate { 2796sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2797 my ($self, $w, $h) = @_;
2490 2798
2491 $self->SUPER::size_allocate ($w, $h); 2799 my ($empty, $slider, @other) = @{ $self->{children} };
2800 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2801
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2802 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2803 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2804 $self->{layout}->set_width ($empty->{w});
2805 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2806
2497 $self->reflow; 2807 $self->reflow;
2498}
2499 2808
2500sub text_size { 2809 local $self->{children} = [$empty, $slider];
2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2501 my ($self, $text, $indent) = @_; 2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2821}
2822
2823sub get_layout {
2824 my ($self, $para) = @_;
2502 2825
2503 my $layout = $self->{layout}; 2826 my $layout = $self->{layout};
2504 2827
2828 $layout->set_font ($self->{font}) if $self->{font};
2829 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2830 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2831 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2833 $layout->set_markup ($para->{markup});
2834
2835 $layout->set_shapes (
2836 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}}
2508 2839 );
2840
2509 $layout->size 2841 $layout
2510} 2842}
2511 2843
2512sub reflow { 2844sub reflow {
2513 my ($self) = @_; 2845 my ($self) = @_;
2514 2846
… …
2521 2853
2522 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2523 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2524} 2856}
2525 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2526sub clear { 2873sub clear {
2527 my ($self) = @_; 2874 my ($self) = @_;
2875
2876 my (undef, undef, @other) = @{ $self->{children} };
2877 $self->remove ($_) for @other;
2528 2878
2529 $self->{par} = []; 2879 $self->{par} = [];
2530 $self->{height} = 0; 2880 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2882}
2533 2883
2534sub add_paragraph { 2884sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2885 my $self = shift;
2536 2886
2537 for my $line (split /\n/, $text) { 2887 for my $para (@_) {
2538 my ($w, $h) = $self->text_size ($line); 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2894 w => 1e10,
2895 wrapped => 1,
2896 };
2897
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para;
2900 }
2901
2902 $self->{need_reflow}++;
2903 $self->update;
2904}
2905
2906sub scroll_to_bottom {
2907 my ($self) = @_;
2908
2909 $self->{scroll_to} = $#{$self->{par}};
2910 $self->update;
2911}
2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2539 $self->{height} += $h; 2935 $self->{height} = $height;
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2541 }
2542 2937
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2544} 2944}
2545 2945
2546sub update { 2946sub update {
2547 my ($self) = @_; 2947 my ($self) = @_;
2548 2948
… …
2550 2950
2551 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2552 2952
2553 delete $self->{texture}; 2953 delete $self->{texture};
2554 2954
2555 $ROOT->on_post_alloc ($self, sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2959
2558 if (delete $self->{need_reflow}) {
2559 my $height = 0;
2560
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567 $layout->set_width ($W - $_->[3]);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3];
2571 $_->[1] = $h;
2572 }
2573
2574 $height += $_->[1];
2575 }
2576
2577 $self->{height} = $height;
2578
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580
2581 delete $self->{texture};
2582 }
2583
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2587 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2968 my $top = int $self->{children}[1]{range}[0];
2969
2970 my $paridx = 0;
2971 my $top_paragraph;
2588 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2589 2973
2590 my $y0 = $top; 2974 my $y0 = $top;
2591 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2592 2976
2593 my $y = 0;
2594
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2605 2980
2606 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 2982 my $layout = $self->get_layout ($para);
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 2983
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2984 $layout->render ($para->{indent}, $y - $y0);
2612 2985
2613 glRasterPos $par->[3], $y - $y0; 2986 if (my @w = @{ $para->{widget} }) {
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2987 my @s = $layout->get_shapes;
2988
2989 for (@w) {
2990 my ($dx, $dy) = splice @s, 0, 2, ();
2991
2992 $_->{x} = $dx + $para->{indent};
2993 $_->{y} = $dy + $y - $y0;
2994
2995 $_->draw;
2996 }
2997 }
2615 } 2998 }
2616 2999
2617 $y += $h; 3000 $paridx++;
3001 $top_paragraph ||= $paridx if $y >= $top;
2618 } 3002 }
2619 3003
2620 glDisable GL_BLEND; 3004 $self->{top_paragraph} = $top_paragraph;
2621 }; 3005 };
2622 }); 3006 });
3007}
3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 $self->SUPER::reconfigure;
3013
3014 $_->{w} = 1e10 for @{ $self->{par} };
3015 $self->reflow;
2623} 3016}
2624 3017
2625sub _draw { 3018sub _draw {
2626 my ($self) = @_; 3019 my ($self) = @_;
2627 3020
… …
2630 glColor 0, 0, 0, 1; 3023 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3024 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2633 3026
2634 $self->{children}[1]->draw; 3027 $self->{children}[1]->draw;
2635
2636} 3028}
2637 3029
2638############################################################################# 3030#############################################################################
2639 3031
2640package CFClient::UI::Animator; 3032package CFPlus::UI::Animator;
2641 3033
2642use CFClient::OpenGL; 3034use CFPlus::OpenGL;
2643 3035
2644our @ISA = CFClient::UI::Bin::; 3036our @ISA = CFPlus::UI::Bin::;
2645 3037
2646sub moveto { 3038sub moveto {
2647 my ($self, $x, $y) = @_; 3039 my ($self, $x, $y) = @_;
2648 3040
2649 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3041 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2677 glPopMatrix; 3069 glPopMatrix;
2678} 3070}
2679 3071
2680############################################################################# 3072#############################################################################
2681 3073
2682package CFClient::UI::Flopper; 3074package CFPlus::UI::Flopper;
2683 3075
2684our @ISA = CFClient::UI::Button::; 3076our @ISA = CFPlus::UI::Button::;
2685 3077
2686sub new { 3078sub new {
2687 my $class = shift; 3079 my $class = shift;
2688 3080
2689 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2701 $self->{other}->toggle_visibility; 3093 $self->{other}->toggle_visibility;
2702} 3094}
2703 3095
2704############################################################################# 3096#############################################################################
2705 3097
2706package CFClient::UI::Tooltip; 3098package CFPlus::UI::Tooltip;
2707 3099
2708our @ISA = CFClient::UI::Bin::; 3100our @ISA = CFPlus::UI::Bin::;
2709 3101
2710use CFClient::OpenGL; 3102use CFPlus::OpenGL;
2711 3103
2712sub new { 3104sub new {
2713 my $class = shift; 3105 my $class = shift;
2714 3106
2715 $class->SUPER::new ( 3107 $class->SUPER::new (
… …
2718 ) 3110 )
2719} 3111}
2720 3112
2721sub set_tooltip_from { 3113sub set_tooltip_from {
2722 my ($self, $widget) = @_; 3114 my ($self, $widget) = @_;
3115
3116 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117 if $widget->{tooltip} =~ /^#(.*)$/;
2723 3118
2724 my $tooltip = $widget->{tooltip}; 3119 my $tooltip = $widget->{tooltip};
2725 3120
2726 if ($ENV{CFPLUS_DEBUG} & 2) { 3121 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 3122 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3123 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 3124 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 3125 . "visible $widget->{visible}";
2731 } 3126 }
2732 3127
3128 $tooltip =~ s/^\n+//;
3129 $tooltip =~ s/\n+$//;
3130
2733 $self->add (new CFClient::UI::Label 3131 $self->add (new CFPlus::UI::Label
2734 markup => $tooltip, 3132 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3133 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 3134 fontsize => 0.8,
2737 fg => [0, 0, 0, 1], 3135 style => 1, # FLAG_INVERSE
2738 ellipsise => 0, 3136 ellipsise => 0,
2739 font => ($widget->{tooltip_font} || $::FONT_PROP), 3137 font => ($widget->{tooltip_font} || $::FONT_PROP),
2740 ); 3138 );
2741} 3139}
2742 3140
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3144 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3145
2748 ($w + 4, $h + 4) 3146 ($w + 4, $h + 4)
2749} 3147}
2750 3148
2751sub size_allocate { 3149sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3150 my ($self, $w, $h) = @_;
2753 3151
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3152 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3153}
2756 3154
2757sub visibility_change { 3155sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3156 my ($self, $visible) = @_;
2759 3157
2760 return unless $visible; 3158 return unless $visible;
2761 3159
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3160 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3161 my $widget = $self->{owner}
2764 or return; 3162 or return;
2765 3163
3164 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3165 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3166
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3167 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3168 if $x + $self->{w} > $self->{root}{w};
2770 3169
2771 $self->move_abs ($x, $y); 3170 $self->move_abs ($x, $y);
3171 } else {
3172 $self->hide;
3173 }
2772 }); 3174 });
2773} 3175}
2774 3176
2775sub _draw { 3177sub _draw {
2776 my ($self) = @_; 3178 my ($self) = @_;
… …
2800 $self->SUPER::_draw; 3202 $self->SUPER::_draw;
2801} 3203}
2802 3204
2803############################################################################# 3205#############################################################################
2804 3206
2805package CFClient::UI::Face; 3207package CFPlus::UI::Face;
2806 3208
2807our @ISA = CFClient::UI::Base::; 3209our @ISA = CFPlus::UI::DrawBG::;
2808 3210
2809use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2810 3212
2811sub new { 3213sub new {
2812 my $class = shift; 3214 my $class = shift;
2813 3215
2814 my $self = $class->SUPER::new ( 3216 my $self = $class->SUPER::new (
… …
2849sub _draw { 3251sub _draw {
2850 my ($self) = @_; 3252 my ($self) = @_;
2851 3253
2852 return unless $::CONN; 3254 return unless $::CONN;
2853 3255
3256 $self->SUPER::_draw;
3257
2854 my $face; 3258 my $face;
2855 3259
2856 if ($self->{frame}) { 3260 if ($self->{frame}) {
2857 my $anim = $::CONN->{anim}[$self->{anim}]; 3261 my $anim = $::CONN->{anim}[$self->{anim}];
2858 3262
… …
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3273 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3274 glDisable GL_TEXTURE_2D;
2871 } 3275 }
2872} 3276}
2873 3277
2874sub DESTROY { 3278sub destroy {
2875 my ($self) = @_; 3279 my ($self) = @_;
2876 3280
2877 $self->{timer}->cancel 3281 $self->{timer}->cancel
2878 if $self->{timer}; 3282 if $self->{timer};
2879 3283
2880 $self->SUPER::DESTROY; 3284 $self->SUPER::destroy;
2881} 3285}
2882 3286
2883############################################################################# 3287#############################################################################
2884 3288
2885package CFClient::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
2886 3290
2887our @ISA = CFClient::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
2888 3292
2889# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
2890 3294
2891############################################################################# 3295#############################################################################
2892 3296
2893package CFClient::UI::Menu; 3297package CFPlus::UI::Menu;
2894 3298
2895our @ISA = CFClient::UI::FancyFrame::; 3299our @ISA = CFPlus::UI::Toplevel::;
2896 3300
2897use CFClient::OpenGL; 3301use CFPlus::OpenGL;
2898 3302
2899sub new { 3303sub new {
2900 my $class = shift; 3304 my $class = shift;
2901 3305
2902 my $self = $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
2903 items => [], 3307 items => [],
2904 z => 100, 3308 z => 100,
2905 @_, 3309 @_,
2906 ); 3310 );
2907 3311
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3312 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909 3313
2910 for my $item (@{ $self->{items} }) { 3314 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3315 my ($widget, $cb, $tooltip) = @$item;
2912 3316
2913 # handle various types of items, only text for now 3317 # handle various types of items, only text for now
2914 if (!ref $widget) { 3318 if (!ref $widget) {
3319 if ($widget =~ /\t/) {
3320 my ($left, $right) = split /\t/, $widget, 2;
3321
2915 $widget = new CFClient::UI::Label 3322 $widget = new CFPlus::UI::HBox
2916 can_hover => 1, 3323 can_hover => 1,
2917 can_events => 1, 3324 can_events => 1,
3325 tooltip => $tooltip,
3326 children => [
3327 (new CFPlus::UI::Label markup => $left, expand => 1),
3328 (new CFPlus::UI::Label markup => $right, align => +1),
3329 ],
3330 ;
3331
3332 } else {
3333 $widget = new CFPlus::UI::Label
3334 can_hover => 1,
3335 can_events => 1,
2918 text => $widget; 3336 markup => $widget,
3337 tooltip => $tooltip;
3338 }
2919 } 3339 }
2920 3340
2921 $self->{item}{$widget} = $item; 3341 $self->{item}{$widget} = $item;
2922 3342
2923 $self->{vbox}->add ($widget); 3343 $self->{vbox}->add ($widget);
… …
2928 3348
2929# popup given the event (must be a mouse button down event currently) 3349# popup given the event (must be a mouse button down event currently)
2930sub popup { 3350sub popup {
2931 my ($self, $ev) = @_; 3351 my ($self, $ev) = @_;
2932 3352
2933 $self->_emit ("popdown"); 3353 $self->emit ("popdown");
2934 3354
2935 # maybe save $GRAB? must be careful about events... 3355 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3356 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3357 $self->{button} = $ev->{button};
2938 3358
2939 $self->show; 3359 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3360 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3361}
2942 3362
2943sub mouse_motion { 3363sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3364 my ($self, $ev, $x, $y) = @_;
2945 3365
2946 # TODO: should use vbox->find_widget or so 3366 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3367 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3368 $self->{hover} = $self->{item}{$HOVER};
2949 3369
2950 0 3370 0
2951} 3371}
2952 3372
2953sub button_up { 3373sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3374 my ($self, $ev, $x, $y) = @_;
2955 3375
2956 if ($ev->{button} == $self->{button}) { 3376 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3377 undef $GRAB;
2958 $self->hide; 3378 $self->hide;
2959 3379
2960 $self->_emit ("popdown"); 3380 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3381 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3382 } else {
2963 return 0 3383 return 0
2964 } 3384 }
2965 3385
2966 1 3386 1
2967} 3387}
2968 3388
2969############################################################################# 3389#############################################################################
2970 3390
2971package CFClient::UI::Multiplexer; 3391package CFPlus::UI::Multiplexer;
2972 3392
2973our @ISA = CFClient::UI::Container::; 3393our @ISA = CFPlus::UI::Container::;
2974 3394
2975sub new { 3395sub new {
2976 my $class = shift; 3396 my $class = shift;
2977 3397
2978 my $self = $class->SUPER::new ( 3398 my $self = $class->SUPER::new (
… …
2992 3412
2993 $self->{current} = $self->{children}[0] 3413 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3414 if @{ $self->{children} };
2995} 3415}
2996 3416
3417sub get_current_page {
3418 my ($self) = @_;
3419
3420 $self->{current}
3421}
3422
2997sub set_current_page { 3423sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3424 my ($self, $page_or_widget) = @_;
2999 3425
3000 my $widget = ref $page_or_widget 3426 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3427 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3428 : $self->{children}[$page_or_widget];
3003 3429
3004 $self->{current} = $widget; 3430 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3431 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3432
3007 $self->_emit (page_changed => $self->{current}); 3433 $self->emit (page_changed => $self->{current});
3008 3434
3009 $self->realloc; 3435 $self->realloc;
3010} 3436}
3011 3437
3012sub visible_children { 3438sub visible_children {
… …
3017 my ($self) = @_; 3443 my ($self) = @_;
3018 3444
3019 $self->{current}->size_request 3445 $self->{current}->size_request
3020} 3446}
3021 3447
3022sub size_allocate { 3448sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3449 my ($self, $w, $h) = @_;
3024 3450
3025 $self->{current}->configure (0, 0, $w, $h); 3451 $self->{current}->configure (0, 0, $w, $h);
3452
3453 1
3026} 3454}
3027 3455
3028sub _draw { 3456sub _draw {
3029 my ($self) = @_; 3457 my ($self) = @_;
3030 3458
3031 $self->{current}->draw; 3459 $self->{current}->draw;
3032} 3460}
3033 3461
3034############################################################################# 3462#############################################################################
3035 3463
3036package CFClient::UI::Notebook; 3464package CFPlus::UI::Notebook;
3037 3465
3038our @ISA = CFClient::UI::VBox::; 3466our @ISA = CFPlus::UI::VBox::;
3039 3467
3040sub new { 3468sub new {
3041 my $class = shift; 3469 my $class = shift;
3042 3470
3043 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar), 3472 buttonbar => (new CFPlus::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3473 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self 3474 # filter => # will be put between multiplexer and $self
3047 @_, 3475 @_,
3048 ); 3476 );
3049 3477
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3478 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3056sub add { 3484sub add {
3057 my ($self, $title, $widget, $tooltip) = @_; 3485 my ($self, $title, $widget, $tooltip) = @_;
3058 3486
3059 Scalar::Util::weaken $self; 3487 Scalar::Util::weaken $self;
3060 3488
3061 $self->{buttonbar}->add (new CFClient::UI::Button 3489 $self->{buttonbar}->add (new CFPlus::UI::Button
3062 markup => $title, 3490 markup => $title,
3063 tooltip => $tooltip, 3491 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) }, 3492 on_activate => sub { $self->set_current_page ($widget) },
3065 ); 3493 );
3066 3494
3067 $self->{multiplexer}->add ($widget); 3495 $self->{multiplexer}->add ($widget);
3068} 3496}
3069 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{multiplexer}->get_current_page
3502}
3503
3070sub set_current_page { 3504sub set_current_page {
3071 my ($self, $page) = @_; 3505 my ($self, $page) = @_;
3072 3506
3073 $self->{multiplexer}->set_current_page ($page); 3507 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3508 $self->emit (page_changed => $self->{multiplexer}{current});
3075} 3509}
3076 3510
3077############################################################################# 3511#############################################################################
3078 3512
3513package CFPlus::UI::Selector;
3514
3515use utf8;
3516
3517our @ISA = CFPlus::UI::Button::;
3518
3519sub new {
3520 my $class = shift;
3521
3522 my $self = $class->SUPER::new (
3523 options => [], # [value, title, longdesc], ...
3524 value => undef,
3525 @_,
3526 );
3527
3528 $self->_set_value ($self->{value});
3529
3530 $self
3531}
3532
3533sub invoke_button_down {
3534 my ($self, $ev) = @_;
3535
3536 my @menu_items;
3537
3538 for (@{ $self->{options} }) {
3539 my ($value, $title, $tooltip) = @$_;
3540
3541 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3542 }
3543
3544 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3545}
3546
3547sub _set_value {
3548 my ($self, $value) = @_;
3549
3550 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3551 or return;
3552
3553 $self->{value} = $item->[0];
3554 $self->set_markup ("$item->[1] ⇓");
3555 $self->set_tooltip ($item->[2]);
3556}
3557
3558sub set_value {
3559 my ($self, $value) = @_;
3560
3561 return unless $self->{value} ne $value;
3562
3563 $self->_set_value ($value);
3564 $self->emit (changed => $value);
3565}
3566
3567#############################################################################
3568
3079package CFClient::UI::Statusbox; 3569package CFPlus::UI::Statusbox;
3080 3570
3081our @ISA = CFClient::UI::VBox::; 3571our @ISA = CFPlus::UI::VBox::;
3082 3572
3083sub new { 3573sub new {
3084 my $class = shift; 3574 my $class = shift;
3085 3575
3086 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
… …
3098sub reorder { 3588sub reorder {
3099 my ($self) = @_; 3589 my ($self) = @_;
3100 my $NOW = Time::HiRes::time; 3590 my $NOW = Time::HiRes::time;
3101 3591
3102 # freeze display when hovering over any label 3592 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner} 3593 return if $CFPlus::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3594 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} }; 3595 values %{ $self->{item} };
3106 3596
3107 while (my ($k, $v) = each %{ $self->{item} }) { 3597 while (my ($k, $v) = each %{ $self->{item} }) {
3108 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3598 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109 } 3599 }
… …
3130 for ($short) { 3620 for ($short) {
3131 s/^\s+//; 3621 s/^\s+//;
3132 s/\s+/ /g; 3622 s/\s+/ /g;
3133 } 3623 }
3134 3624
3135 new CFClient::UI::Label 3625 new CFPlus::UI::Label
3136 markup => $short, 3626 markup => $short,
3137 tooltip => $item->{tooltip}, 3627 tooltip => $item->{tooltip},
3138 tooltip_font => $::FONT_PROP, 3628 tooltip_font => $::FONT_PROP,
3139 tooltip_width => 0.67, 3629 tooltip_width => 0.67,
3140 fontsize => $item->{fontsize} || $self->{fontsize}, 3630 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3178 $item->{count}++; 3668 $item->{count}++;
3179 } else { 3669 } else {
3180 $item->{count} = 1; 3670 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3671 $item->{text} = $item->{tooltip} = $text;
3182 } 3672 }
3183 $item->{id} = ++$self->{id}; 3673 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3674 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3675 delete $item->{label};
3186 } else { 3676 } else {
3187 $self->{item}{$group} = { 3677 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3678 id => ++$self->{id},
… …
3194 count => 1, 3684 count => 1,
3195 %arg, 3685 %arg,
3196 }; 3686 };
3197 } 3687 }
3198 3688
3689 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3690 $self->reorder;
3691 });
3200} 3692}
3201 3693
3202sub reconfigure { 3694sub reconfigure {
3203 my ($self) = @_; 3695 my ($self) = @_;
3204 3696
… …
3207 3699
3208 $self->reorder; 3700 $self->reorder;
3209 $self->SUPER::reconfigure; 3701 $self->SUPER::reconfigure;
3210} 3702}
3211 3703
3212sub DESTROY { 3704sub destroy {
3213 my ($self) = @_; 3705 my ($self) = @_;
3214 3706
3215 $self->{timer}->cancel; 3707 $self->{timer}->cancel;
3216 3708
3217 $self->SUPER::DESTROY; 3709 $self->SUPER::destroy;
3218} 3710}
3219 3711
3220############################################################################# 3712#############################################################################
3221 3713
3222package CFClient::UI::Inventory; 3714package CFPlus::UI::Inventory;
3223 3715
3224our @ISA = CFClient::UI::ScrolledWindow::; 3716our @ISA = CFPlus::UI::Table::;
3225 3717
3226sub new { 3718sub new {
3227 my $class = shift; 3719 my $class = shift;
3228 3720
3229 my $self = $class->SUPER::new ( 3721 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3722 col_expand => [0, 1, 0],
3723 items => [],
3231 @_, 3724 @_,
3232 ); 3725 );
3233 3726
3727 $self->set_sort_order (undef);
3728
3234 $self 3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3235} 3765}
3236 3766
3237sub set_items { 3767sub set_items {
3238 my ($self, $items) = @_; 3768 my ($self, $items) = @_;
3239 3769
3240 $self->{child}->clear; 3770 $self->{items} = [$items ? values %$items : ()];
3241 return unless $items; 3771 $self->update_items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260} 3772}
3261 3773
3262############################################################################# 3774#############################################################################
3263 3775
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList; 3776package CFPlus::UI::SpellList;
3462 3777
3463our @ISA = CFClient::UI::Table::; 3778our @ISA = CFPlus::UI::Table::;
3464 3779
3465sub new { 3780sub new {
3466 my $class = shift; 3781 my $class = shift;
3467 3782
3468 my $self = $class->SUPER::new ( 3783 my $self = $class->SUPER::new (
… …
3470 commands => [], 3785 commands => [],
3471 @_, 3786 @_,
3472 ) 3787 )
3473} 3788}
3474 3789
3475# XXX: Do sorting? Argl... 3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3833 (new CFPlus::UI::Menu
3834 items => [
3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3837 ],
3838 )->popup ($ev);
3839 } else {
3840 return 0;
3841 }
3842
3843 1
3844 };
3845
3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3847
3848 #TODO: add path info to tooltip
3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3850
3851 $self->add (0, $row, new CFPlus::UI::Face
3852 face => $spell->{face},
3853 can_hover => 1,
3854 can_events => 1,
3855 tooltip => $tooltip,
3856 on_button_down => $spell_cb,
3857 );
3858
3859 $self->add (1, $row, new CFPlus::UI::Label
3860 expand => 1,
3861 text => $spell->{name},
3862 can_hover => 1,
3863 can_events => 1,
3864 tooltip => $tooltip,
3865 on_button_down => $spell_cb,
3866 );
3867
3868 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3869 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3870 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3871 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3872 }
3873 });
3874}
3875
3476sub add_spell { 3876sub add_spell {
3477 my ($self, $spell) = @_; 3877 my ($self, $spell) = @_;
3878
3478 $self->{spells}->{$spell->{name}} = $spell; 3879 $self->{spell}->{$spell->{name}} = $spell;
3479 3880 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3881}
3508 3882
3509sub remove_spell { 3883sub remove_spell {
3510 my ($self, $spell) = @_; 3884 my ($self, $spell) = @_;
3885
3511 delete $self->{spells}->{$spell->{name}}; 3886 delete $self->{spell}->{$spell->{name}};
3512 $self->rebuild_spell_list; 3887 $self->rebuild_spell_list;
3513} 3888}
3514 3889
3890sub clear_spells {
3891 my ($self) = @_;
3892
3893 $self->{spell} = {};
3894 $self->rebuild_spell_list;
3895}
3896
3515############################################################################# 3897#############################################################################
3516 3898
3517package CFClient::UI::Root; 3899package CFPlus::UI::Root;
3518 3900
3519our @ISA = CFClient::UI::Container::; 3901our @ISA = CFPlus::UI::Container::;
3520 3902
3521use List::Util qw(min max); 3903use List::Util qw(min max);
3522 3904
3523use CFClient::OpenGL; 3905use CFPlus::OpenGL;
3524 3906
3525sub new { 3907sub new {
3526 my $class = shift; 3908 my $class = shift;
3527 3909
3528 my $self = $class->SUPER::new ( 3910 my $self = $class->SUPER::new (
… …
3553 $coord = $max - $size if $coord > $max - $size; 3935 $coord = $max - $size if $coord > $max - $size;
3554 3936
3555 int $coord + 0.5 3937 int $coord + 0.5
3556} 3938}
3557 3939
3558sub size_allocate { 3940sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3941 my ($self, $w, $h) = @_;
3560 3942
3561 for my $child ($self->children) { 3943 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3944 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3945
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 3949 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3950 $Y = _to_pixel $Y, $H, $self->{h};
3569 3951
3570 $child->configure ($X, $Y, $W, $H); 3952 $child->configure ($X, $Y, $W, $H);
3571 } 3953 }
3954
3955 1
3572} 3956}
3573 3957
3574sub coord2local { 3958sub coord2local {
3575 my ($self, $x, $y) = @_; 3959 my ($self, $x, $y) = @_;
3576 3960
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4086 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 4087
3704 $w = 0 if $w < 0; 4088 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 4089 $h = 0 if $h < 0;
3706 4090
4091 $w = max $widget->{min_w}, $w;
4092 $h = max $widget->{min_h}, $h;
4093
4094# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4095# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4096
4097 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4098 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4099
3707 $w = int $w + 0.5; 4100 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 4101 $h = int $h + 0.5;
3709 4102
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4103 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w}; 4104 $widget->{old_w} = $widget->{w};
… …
3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4127 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735 glMatrixMode GL_MODELVIEW; 4128 glMatrixMode GL_MODELVIEW;
3736 glLoadIdentity; 4129 glLoadIdentity;
3737 4130
3738 { 4131 {
3739 package CFClient::UI::Base; 4132 package CFPlus::UI::Base;
3740 4133
3741 ($draw_x, $draw_y, $draw_w, $draw_h) = 4134 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h}); 4135 (0, 0, $self->{w}, $self->{h});
3743 }
3744 4136
3745 $self->_draw; 4137 $self->_draw;
4138 }
3746} 4139}
3747 4140
3748############################################################################# 4141#############################################################################
3749 4142
3750package CFClient::UI; 4143package CFPlus::UI;
3751 4144
3752$ROOT = new CFClient::UI::Root; 4145$ROOT = new CFPlus::UI::Root;
3753$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4146$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754 4147
37551 41481
3756 4149

Diff Legend

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