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

Diff Legend

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