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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 2006 UTC

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

Diff Legend

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