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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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