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.373 by root, Sun Jul 15 22:39: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
878our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
879 950
880sub new { 951sub new {
881 my $class = shift; 952 my $class = shift;
882 953
883 $class->SUPER::new ( 954 $class->SUPER::new (
… …
896 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
897 968
898 ($w, $h) 969 ($w, $h)
899} 970}
900 971
901sub size_allocate { 972sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
903 974
904 my $child = $self->child; 975 my $child = $self->child;
905 976
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 979
909 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
910 $self->update; 981 $self->update;
982
983 1
911} 984}
912 985
913sub set_offset { 986sub set_offset {
914 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
915 988
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1016 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1018 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1020 }
948} 1021}
949 1022
950sub _render { 1023sub _render {
951 my ($self) = @_; 1024 my ($self) = @_;
952 1025
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1028
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1030
958 $self->SUPER::_render; 1031 $self->SUPER::_render;
959} 1032}
960 1033
961############################################################################# 1034#############################################################################
962 1035
963package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
964 1037
965our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
966 1039
967sub new { 1040sub new {
968 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
969 1042
970 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
971 1044
972 my $self; 1045 my $self;
973 1046
974 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
975 vertical => 1, 1057 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1059 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
979 }, 1062 },
980 ; 1063 ;
981 1064
982 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
984 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
985 %arg, 1073 %arg,
986 ); 1074 );
987 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
989 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
990 1087
991 $self 1088 $self
992} 1089}
1090
1091#TODO# update range on size_allocate depending on child
993 1092
994sub add { 1093sub add {
995 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
996 1095
997 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
998} 1097}
999 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
1000sub update { 1123sub update {
1001 my ($self) = @_; 1124 my ($self) = @_;
1002 1125
1003 $self->SUPER::update; 1126 $self->SUPER::update;
1004 1127 $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} 1128}
1009 1129
1010sub size_allocate { 1130sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1012 1132
1133 $self->update_slider;
1013 $self->SUPER::size_allocate ($w, $h); 1134 $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} 1135}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1136
1022############################################################################# 1137#############################################################################
1023 1138
1024package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1025 1140
1026our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1027 1142
1028use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1029 1144
1030sub new { 1145sub new {
1031 my $class = shift; 1146 my $class = shift;
1032 1147
1033 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1060} 1175}
1061 1176
1062############################################################################# 1177#############################################################################
1063 1178
1064package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1065 1180
1066our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1067 1182
1068use CFClient::OpenGL; 1183use 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 1184
1078sub new { 1185sub new {
1079 my ($class, %arg) = @_; 1186 my ($class, %arg) = @_;
1080 1187
1081 my $title = delete $arg{title}; 1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1082 1295
1083 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1299 border => 0.6,
1087 can_events => 1, 1300 can_events => 1,
1088 min_w => 16, 1301 min_w => 64,
1089 min_h => 16, 1302 min_h => 32,
1090 %arg, 1303 %arg,
1091 ); 1304 );
1092 1305
1093 $self->{title} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1307 align => 0,
1095 valign => 1, 1308 valign => 1,
1096 text => $title, 1309 text => $self->{title},
1097 fontsize => $self->{border} 1310 fontsize => $self->{border},
1098 if defined $title; 1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1099 1321
1100 $self 1322 $self
1101} 1323}
1102 1324
1103sub add { 1325sub add {
1104 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1105 1327
1106 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1331}
1109 1332
1110sub border { 1333sub border {
1111 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1112} 1335}
1113 1336
1114sub size_request { 1337sub size_request {
1115 my ($self) = @_; 1338 my ($self) = @_;
1116 1339
1117 $self->{title}->size_request 1340 $self->{title_widget}->size_request
1118 if $self->{title}; 1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1119 1345
1120 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1121 1347
1122 ( 1348 (
1123 $w + $self->border * 2, 1349 $w + $self->border * 2,
1124 $h + $self->border * 2, 1350 $h + $self->border * 2,
1125 ) 1351 )
1126} 1352}
1127 1353
1128sub size_allocate { 1354sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1130 1356
1131 if ($self->{title}) { 1357 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1361 }
1136 1362
1137 my $border = $self->border; 1363 my $border = $self->border;
1138 1364
1139 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1367
1368 $self->child->configure ($border, $border, $w, $h);
1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1141 1380
1142 $self->child->configure ($border, $border, $w, $h); 1381 1
1143} 1382}
1144 1383
1145sub button_down { 1384sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1147 1386
1148 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1388 my $border = $self->border;
1150 1389
… …
1181 1420
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1422
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1426 };
1188 } else { 1427 } else {
1189 return 0; 1428 return 0;
1190 } 1429 }
1191 1430
1192 1 1431 1
1193} 1432}
1194 1433
1195sub button_up { 1434sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1197 1436
1198 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1199} 1438}
1200 1439
1201sub mouse_motion { 1440sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1203 1442
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1444
1206 !!$self->{motion} 1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1207} 1454}
1208 1455
1209sub _draw { 1456sub _draw {
1210 my ($self) = @_; 1457 my ($self) = @_;
1211 1458
… …
1237 1484
1238 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1239 1486
1240 $child->draw; 1487 $child->draw;
1241 1488
1242 if ($self->{title}) { 1489 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1245 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1246} 1498}
1247 1499
1248############################################################################# 1500#############################################################################
1249 1501
1250package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1251 1503
1252our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1253 1505
1254use List::Util qw(max sum); 1506use List::Util qw(max sum);
1255 1507
1256use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1257 1509
1258sub new { 1510sub new {
1259 my $class = shift; 1511 my $class = shift;
1260 1512
1261 $class->SUPER::new ( 1513 $class->SUPER::new (
1262 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1263 @_, 1516 @_,
1264 ) 1517 )
1265} 1518}
1266 1519
1267sub children { 1520sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1522}
1270 1523
1271sub add { 1524sub add {
1272 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1273 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1529 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1276 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1278} 1542}
1279 1543
1280# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1545sub clear {
1282 my ($self) = @_; 1546 my ($self) = @_;
… …
1323 (sum @$ws), 1587 (sum @$ws),
1324 (sum @$hs), 1588 (sum @$hs),
1325 ) 1589 )
1326} 1590}
1327 1591
1328sub size_allocate { 1592sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1330 1594
1331 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1332 1596
1333 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1334 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1335 1599
1336 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1337 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1338 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1339 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1340 1604
1341 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1606
1345 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1346 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1347 1616
1348 my $y; 1617 my $y;
1349 1618
1350 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1365 } 1634 }
1366 1635
1367 $y += $row_h; 1636 $y += $row_h;
1368 } 1637 }
1369 1638
1639 1
1370} 1640}
1371 1641
1372sub find_widget { 1642sub find_widget {
1373 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1374 1644
… …
1393 } 1663 }
1394} 1664}
1395 1665
1396############################################################################# 1666#############################################################################
1397 1667
1398package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1399 1669
1400our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1401 1671
1402sub size_request { 1672sub size_request {
1403 my ($self) = @_; 1673 my ($self) = @_;
1404 1674
1405 $self->{vertical} 1675 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1683 )
1414} 1684}
1415 1685
1416sub size_allocate { 1686sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1418 1688
1419 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1421 1691
1422 my @req; 1692 my @req;
1423 1693
1424 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1426 } else { 1696 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1429 1699
1430 if ($req > $space) { 1700 if ($req > $space) {
1431 # ah well, not enough space 1701 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1433 } else { 1703 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1705
1436 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1437 1707
1438 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1709 for 0 .. $#children;
1440 } 1710 }
1441 } 1711 }
1442 1712
1443 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1444 1714
1445 my $pos = 0; 1715 my $pos = 0;
1446 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1719
1450 $pos += $alloc; 1720 $pos += $alloc;
1451 } 1721 }
1452 1722
1453 1 1723 1
1454} 1724}
1455 1725
1456############################################################################# 1726#############################################################################
1457 1727
1458package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1459 1729
1460our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1461 1731
1462sub new { 1732sub new {
1463 my $class = shift; 1733 my $class = shift;
1464 1734
1465 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1468 ) 1738 )
1469} 1739}
1470 1740
1471############################################################################# 1741#############################################################################
1472 1742
1473package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1474 1744
1475our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1476 1746
1477sub new { 1747sub new {
1478 my $class = shift; 1748 my $class = shift;
1479 1749
1480 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1483 ) 1753 )
1484} 1754}
1485 1755
1486############################################################################# 1756#############################################################################
1487 1757
1488package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1489 1759
1490our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1491 1761
1492use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1493 1763
1494sub new { 1764sub new {
1495 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1496 1766
1497 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1770 #active_bg => none
1501 #font => default_font 1771 #font => default_font
1502 #text => initial text 1772 #text => initial text
1503 #markup => initial narkup 1773 #markup => initial narkup
1504 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1505 ellipsise => 3, # end 1776 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1778 fontsize => 1,
1508 align => -1, 1779 align => -1,
1509 valign => -1, 1780 valign => -1,
1510 padding_x => 2, 1781 padding_x => 2,
1511 padding_y => 2, 1782 padding_y => 2,
1512 can_events => 0, 1783 can_events => 0,
1513 %arg 1784 %arg
1514 ); 1785 );
1515 1786
1516 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1790 $self->{template} = $layout;
1520 } 1791 }
1521 1792
1522 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1526 } 1797 }
1527 1798
1528 $self 1799 $self
1529} 1800}
1530 1801
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1802sub update {
1542 my ($self) = @_; 1803 my ($self) = @_;
1543 1804
1544 delete $self->{texture}; 1805 delete $self->{texture};
1545 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1557 1818
1558 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1560 1821
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1563 1823
1564 delete $self->{req_h}; 1824 delete $self->{size_req};
1565 $self->realloc; 1825 $self->realloc;
1566 $self->update; 1826 $self->update;
1567} 1827}
1568 1828
1569sub set_markup { 1829sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1574 1834
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1836
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1579 1838
1580 delete $self->{req_h}; 1839 delete $self->{size_req};
1581 $self->realloc; 1840 $self->realloc;
1582 $self->update; 1841 $self->update;
1583} 1842}
1584 1843
1585sub size_request { 1844sub size_request {
1586 my ($self) = @_; 1845 my ($self) = @_;
1587 1846
1588 if (exists $self->{req_h}) { 1847 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1853
1597 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1598 1855
1599 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1860
1603 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1604 1862
1605 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1607 } 1865 }
1608 1866
1609 ($w, $h) 1867 [$w, $h]
1610 } 1868 };
1611}
1612 1869
1870 @{ $self->{size_req} }
1871}
1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1613sub size_allocate { 1877sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1615 1879
1616 delete $self->{ox}; 1880 delete $self->{ox};
1617 1881
1618 delete $self->{texture} 1882 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1620} 1886}
1621 1887
1622sub set_fontsize { 1888sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1624 1890
1625 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1626 delete $self->{texture}; 1893 delete $self->{texture};
1627 1894
1628 $self->realloc; 1895 $self->realloc;
1629} 1896}
1630 1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1905}
1906
1631sub _draw { 1907sub _draw {
1632 my ($self) = @_; 1908 my ($self) = @_;
1633 1909
1634 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1635 1911
1636 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1919
1644 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1645 }; 1921 };
1646 1922
1647 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1651 1927
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1931 };
1656 1932
1657 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1935
1659 if ($tex->{format} == GL_ALPHA) { 1936 $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} 1937}
1670 1938
1671############################################################################# 1939#############################################################################
1672 1940
1673package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1674 1942
1675our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1676 1944
1677use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1678 1946
1679sub new { 1947sub new {
1680 my $class = shift; 1948 my $class = shift;
1681 1949
1682 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1687 can_hover => 1, 1955 can_hover => 1,
1688 can_focus => 1, 1956 can_focus => 1,
1689 valign => 0, 1957 valign => 0,
1690 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1691 #text => ... 1960 #text => ...
1961 #hidden => "*",
1692 @_ 1962 @_
1693 ) 1963 )
1694} 1964}
1695 1965
1696sub _set_text { 1966sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1974 $self->{text} = $text;
1705 1975
1706 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1978 delete $self->{size_req};
1709 1979
1710 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1711 1981
1712 $self->realloc; 1982 $self->realloc;
1713 $self->update; 1983 $self->update;
1714} 1984}
1715 1985
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1731 2001
1732 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1733} 2003}
1734 2004
1735sub key_down { 2005sub invoke_key_down {
1736 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1737 2007
1738 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1741 2011
1742 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2015
1744 if ($uni == 8) { 2016 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1753 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2040 $self->emit ('escape');
1758 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2045 } else {
1761 return 0; 2046 return 0;
1762 } 2047 }
1763 2048
1764 $self->_set_text ($text); 2049 $self->_set_text ($text);
1765 2050
1766 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1767 2053
1768 1 2054 1
1769} 2055}
1770 2056
1771sub focus_in { 2057sub invoke_focus_in {
1772 my ($self) = @_; 2058 my ($self) = @_;
1773 2059
1774 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1775 2061
1776 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1777} 2063}
1778 2064
1779sub button_down { 2065sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1781 2067
1782 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2069
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2071
1786 # byte-index to char-index 2072 # byte-index to char-index
1787 my $text = $self->{text}; 2073 my $text = $self->{text};
1788 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1790 2076
1791 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1792 $self->update; 2078 $self->update;
1793 2079
1794 1 2080 1
1795} 2081}
1796 2082
1797sub mouse_motion { 2083sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2086
1801 0 2087 1
1802} 2088}
1803 2089
1804sub _draw { 2090sub _draw {
1805 my ($self) = @_; 2091 my ($self) = @_;
1806 2092
… …
1833 utf8::encode $text; 2119 utf8::encode $text;
1834 2120
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2122 }
1837 2123
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2124 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 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}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2127 glEnd;
1843 } 2128 }
1844} 2129}
1845 2130
2131#############################################################################
2132
1846package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1847 2134
1848our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1849 2136
1850use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1851 2138
1852sub key_down { 2139sub invoke_key_down {
1853 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1854 2141
1855 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1856 2143
1857 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1860 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1863 $self->update; 2151 $self->update;
1864 2152
1865 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1868 } 2156 }
1869 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2161 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2163 }
1876 2164
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2168
1881 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2171 } else {
1884 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1885 } 2173 }
1886 2174
1887 } else { 2175 } else {
1888 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1889 } 2177 }
1890 2178
1891 1 2179 1
1892} 2180}
1893 2181
1894############################################################################# 2182#############################################################################
1895 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1896package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1897 2224
1898our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1899 2226
1900use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1901 2228
1902my @tex = 2229my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1905 2232
1906sub new { 2233sub new {
1907 my $class = shift; 2234 my $class = shift;
1908 2235
… …
1917 can_events => 1, 2244 can_events => 1,
1918 @_ 2245 @_
1919 ) 2246 )
1920} 2247}
1921 2248
1922sub activate { }
1923
1924sub button_up { 2249sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1926 2251
1927 $self->emit ("activate") 2252 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1948} 2273}
1949 2274
1950############################################################################# 2275#############################################################################
1951 2276
1952package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1953 2278
1954our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1955 2280
1956my @tex = 2281my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2284
1960use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1961 2286
1962sub new { 2287sub new {
1963 my $class = shift; 2288 my $class = shift;
1964 2289
1965 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1979 my ($self) = @_; 2304 my ($self) = @_;
1980 2305
1981 (6) x 2 2306 (6) x 2
1982} 2307}
1983 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1984sub button_down { 2317sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1986 2319
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2322 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2323 } else {
1992 return 0 2324 return 0
1993 } 2325 }
1994 2326
1995 1 2327 1
… …
2015 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
2016} 2348}
2017 2349
2018############################################################################# 2350#############################################################################
2019 2351
2020package CFClient::UI::Image; 2352package CFPlus::UI::Image;
2021 2353
2022our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2023 2355
2024use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2357
2027our %loaded_images; 2358our %texture_cache;
2028 2359
2029sub new { 2360sub new {
2030 my $class = shift; 2361 my $class = shift;
2031 2362
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2033 2367
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2035 2370
2036 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2373
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2040 2375
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2377
2045 $self 2378 $self
2046} 2379}
2047 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2048sub size_request { 2396sub size_request {
2049 my ($self) = @_; 2397 my ($self) = @_;
2050 2398
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2052} 2400}
2053 2401
2054sub _draw { 2402sub _draw {
2055 my ($self) = @_; 2403 my ($self) = @_;
2056 2404
… …
2066 } 2414 }
2067 2415
2068 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2418
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2072 2420
2073 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2074} 2422}
2075 2423
2076############################################################################# 2424#############################################################################
2077 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
2078package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2079 2463
2080our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2081 2465
2082use List::Util qw(min max); 2466use List::Util qw(min max);
2083 2467
2084use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2085 2469
2086my %tex = ( 2470my %tex = (
2087 food => [ 2471 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2474 ],
2091 grace => [ 2475 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 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/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2478 ],
2095 hp => [ 2479 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2482 ],
2099 mana => [ 2483 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 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/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2486 ],
2103); 2487);
2104 2488
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2551
2168 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2557
2171 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2193 2580
2194 if ($t3) { 2581 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2588 glEnd;
2202 } 2589 }
2203 2590
2204 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2206} 2593}
2207 2594
2208############################################################################# 2595#############################################################################
2209 2596
2210package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2211 2598
2212our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2213 2600
2214sub new { 2601sub new {
2215 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2216 2603
2217 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2606 can_hover => 1,
2220 can_events => 1, 2607 can_events => 1,
2221 %arg, 2608 %arg,
2222 ); 2609 );
2223 2610
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $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); 2612 $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"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2614
2228 $self 2615 $self
2229} 2616}
2230 2617
2231sub set_fontsize { 2618sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2253} 2640}
2254 2641
2255############################################################################# 2642#############################################################################
2256 2643
2257package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2258 2645
2259use strict; 2646use strict;
2260 2647
2261use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2262 2649
2263our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2264 2651
2265my @tex = 2652my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2268 2655
2269sub new { 2656sub new {
2270 my $class = shift; 2657 my $class = shift;
2271 2658
… …
2292 $self->update; 2679 $self->update;
2293 2680
2294 $self 2681 $self
2295} 2682}
2296 2683
2297sub changed { }
2298
2299sub set_range { 2684sub set_range {
2300 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2301 2686
2302 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2303 2688
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2306} 2693}
2307 2694
2308sub set_value { 2695sub set_value {
2309 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2310 2697
… …
2321 if $unit; 2708 if $unit;
2322 2709
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2711
2325 if ($value != $old_value) { 2712 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2327 $self->update; 2714 $self->update;
2328 } 2715 }
2329} 2716}
2330 2717
2331sub size_request { 2718sub size_request {
2332 my ($self) = @_; 2719 my ($self) = @_;
2333 2720
2334 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2335} 2722}
2336 2723
2337sub button_down { 2724sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2339 2726
2340 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2728
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2730
2344 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2732}
2346 2733
2347sub mouse_motion { 2734sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2349 2736
2350 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2739
… …
2358 } else { 2745 } else {
2359 return 0; 2746 return 0;
2360 } 2747 }
2361 2748
2362 1 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2363} 2762}
2364 2763
2365sub update { 2764sub update {
2366 my ($self) = @_; 2765 my ($self) = @_;
2367 2766
… …
2416 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2417} 2816}
2418 2817
2419############################################################################# 2818#############################################################################
2420 2819
2421package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2422 2821
2423our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2424 2823
2425sub new { 2824sub new {
2426 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2427 2826
2428 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2429 2828
2430 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2832 to_value => sub { shift },
2434 from_value => sub { shift }, 2833 from_value => sub { shift },
2435 %arg, 2834 %arg,
2436 ); 2835 );
2437 2836
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2459 2858
2460############################################################################# 2859#############################################################################
2461 2860
2462package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2463 2862
2464our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2465 2864
2466use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2467 2866
2468sub new { 2867sub new {
2469 my $class = shift; 2868 my $class = shift;
2470 2869
2471 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2472 fontsize => 1, 2871 fontsize => 1,
2473 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2474 #font => default_font 2874 #font => default_font
2475 @_, 2875 @_,
2476 2876
2477 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2478 par => [], 2878 par => [],
2879 max_par => 0,
2479 height => 0, 2880 height => 0,
2480 children => [ 2881 children => [
2481 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2483 ], 2884 ],
2484 ); 2885 );
2485 2886
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2487 2888
… …
2493 2894
2494 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2896 $self->reflow;
2496} 2897}
2497 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2498sub size_allocate { 2908sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2500 2910
2501 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2913
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 2918
2507 $self->reflow; 2919 $self->reflow;
2508}
2509 2920
2510sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2512 2937
2513 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2514 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2518 2951 );
2952
2519 $layout->size 2953 $layout
2520} 2954}
2521 2955
2522sub reflow { 2956sub reflow {
2523 my ($self) = @_; 2957 my ($self) = @_;
2524 2958
… …
2531 2965
2532 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2534} 2968}
2535 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2536sub clear { 2985sub clear {
2537 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2538 2990
2539 $self->{par} = []; 2991 $self->{par} = [];
2540 $self->{height} = 0; 2992 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2994}
2543 2995
2544sub add_paragraph { 2996sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2546 2998
2547 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2549 $self->{height} += $h; 3051 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3053
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2554} 3060}
2555 3061
2556sub update { 3062sub update {
2557 my ($self) = @_; 3063 my ($self) = @_;
2558 3064
… …
2560 3066
2561 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2562 3068
2563 delete $self->{texture}; 3069 delete $self->{texture};
2564 3070
2565 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3075
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 { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2597 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2599 3089
2600 my $y0 = $top; 3090 my $y0 = $top;
2601 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2602 3092
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}}) { 3093 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2615 3096
2616 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3099
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2622 3101
2623 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2625 } 3114 }
2626 3115
2627 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3118 }
2629 3119
2630 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2631 }; 3121 };
2632 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2633} 3132}
2634 3133
2635sub _draw { 3134sub _draw {
2636 my ($self) = @_; 3135 my ($self) = @_;
2637 3136
… …
2640 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2643 3142
2644 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2645
2646} 3144}
2647 3145
2648############################################################################# 3146#############################################################################
2649 3147
2650package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2651 3149
2652use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2653 3151
2654our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2655 3153
2656sub moveto { 3154sub moveto {
2657 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2658 3156
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3185 glPopMatrix;
2688} 3186}
2689 3187
2690############################################################################# 3188#############################################################################
2691 3189
2692package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2693 3191
2694our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2695 3193
2696sub new { 3194sub new {
2697 my $class = shift; 3195 my $class = shift;
2698 3196
2699 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2712} 3210}
2713 3211
2714############################################################################# 3212#############################################################################
2715 3213
2716package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2717 3215
2718our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2719 3217
2720use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2721 3219
2722sub new { 3220sub new {
2723 my $class = shift; 3221 my $class = shift;
2724 3222
2725 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2728 ) 3226 )
2729} 3227}
2730 3228
2731sub set_tooltip_from { 3229sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3234
2734 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2735 3236
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2741 } 3242 }
2742 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2743 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3248 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3250 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3252 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3254 );
2751} 3255}
2752 3256
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3261
2758 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2759} 3263}
2760 3264
2761sub size_allocate { 3265sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2763 3267
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3269}
2766 3270
2767sub visibility_change { 3271sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2769 3273
2770 return unless $visible; 3274 return unless $visible;
2771 3275
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2774 or return; 3278 or return;
2775 3279
3280 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3282
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2780 3285
2781 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2782 }); 3290 });
2783} 3291}
2784 3292
2785sub _draw { 3293sub _draw {
2786 my ($self) = @_; 3294 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2811} 3319}
2812 3320
2813############################################################################# 3321#############################################################################
2814 3322
2815package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2816 3324
2817our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2818 3326
2819use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2820 3328
2821sub new { 3329sub new {
2822 my $class = shift; 3330 my $class = shift;
2823 3331
2824 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
2825 aspect => 1, 3335 aspect => 1,
2826 can_events => 0, 3336 can_events => 0,
2827 @_, 3337 @_,
2828 ); 3338 );
2829 3339
2830 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
2832 3342
2833 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3345 hard => 1,
2836 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
2837 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
2838 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
2839 $widget->update; 3352 $self->update;
2840 }, 3353 },
2841 ); 3354 );
3355
3356 $self->update_face;
2842 } 3357 }
2843 3358
2844 $self 3359 $self
2845} 3360}
2846 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
2847sub size_request { 3375sub size_request {
2848 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3391}
2850 3392
2851sub update { 3393sub update {
2852 my ($self) = @_; 3394 my ($self) = @_;
2853 3395
… …
2859sub _draw { 3401sub _draw {
2860 my ($self) = @_; 3402 my ($self) = @_;
2861 3403
2862 return unless $::CONN; 3404 return unless $::CONN;
2863 3405
2864 my $face; 3406 $self->SUPER::_draw;
2865 3407
2866 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
2868 3409 or return;
2869 $face = $anim->[ $self->{frame} % @$anim ]
2870 if $anim && @$anim;
2871 }
2872 3410
2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
2874 3412
2875 if ($tex) { 3413 if ($tex) {
2876 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2878 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3418 glDisable GL_TEXTURE_2D;
2881 } 3419 }
2882} 3420}
2883 3421
2884sub DESTROY { 3422sub destroy {
2885 my ($self) = @_; 3423 my ($self) = @_;
2886 3424
2887 $self->{timer}->cancel 3425 $self->{timer}->cancel
2888 if $self->{timer}; 3426 if $self->{timer};
2889 3427
2890 $self->SUPER::DESTROY; 3428 $self->SUPER::destroy;
2891} 3429}
2892 3430
2893############################################################################# 3431#############################################################################
2894 3432
2895package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
2896 3434
2897our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
2898 3436
2899# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
2900 3438
2901############################################################################# 3439#############################################################################
2902 3440
2903package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
2904 3442
2905our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
2906 3444
2907use CFClient::OpenGL; 3445use CFPlus::OpenGL;
2908 3446
2909sub new { 3447sub new {
2910 my $class = shift; 3448 my $class = shift;
2911 3449
2912 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
2913 items => [], 3451 items => [],
2914 z => 100, 3452 z => 100,
2915 @_, 3453 @_,
2916 ); 3454 );
2917 3455
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3457
2920 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
2922 3460
2923 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
2924 if (!ref $widget) { 3462 if (!ref $widget) {
3463 if ($widget =~ /\t/) {
3464 my ($left, $right) = split /\t/, $widget, 2;
3465
2925 $widget = new CFClient::UI::Label 3466 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3467 can_hover => 1,
2927 can_events => 1, 3468 can_events => 1,
3469 tooltip => $tooltip,
3470 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ],
3474 ;
3475
3476 } else {
3477 $widget = new CFPlus::UI::Label
3478 can_hover => 1,
3479 can_events => 1,
2928 text => $widget; 3480 markup => $widget,
3481 tooltip => $tooltip;
3482 }
2929 } 3483 }
2930 3484
2931 $self->{item}{$widget} = $item; 3485 $self->{item}{$widget} = $item;
2932 3486
2933 $self->{vbox}->add ($widget); 3487 $self->{vbox}->add ($widget);
… …
2938 3492
2939# popup given the event (must be a mouse button down event currently) 3493# popup given the event (must be a mouse button down event currently)
2940sub popup { 3494sub popup {
2941 my ($self, $ev) = @_; 3495 my ($self, $ev) = @_;
2942 3496
2943 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2944 3498
2945 # maybe save $GRAB? must be careful about events... 3499 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3500 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3501 $self->{button} = $ev->{button};
2948 3502
2949 $self->show; 3503 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3504 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3505}
2952 3506
2953sub mouse_motion { 3507sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3508 my ($self, $ev, $x, $y) = @_;
2955 3509
2956 # TODO: should use vbox->find_widget or so 3510 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3511 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3512 $self->{hover} = $self->{item}{$HOVER};
2959 3513
2960 0 3514 0
2961} 3515}
2962 3516
2963sub button_up { 3517sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3518 my ($self, $ev, $x, $y) = @_;
2965 3519
2966 if ($ev->{button} == $self->{button}) { 3520 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3521 undef $GRAB;
2968 $self->hide; 3522 $self->hide;
2969 3523
2970 $self->_emit ("popdown"); 3524 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3525 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3526 } else {
2973 return 0 3527 return 0
2974 } 3528 }
2975 3529
2976 1 3530 1
2977} 3531}
2978 3532
2979############################################################################# 3533#############################################################################
2980 3534
2981package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
2982 3536
2983our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
2984 3538
2985sub new { 3539sub new {
2986 my $class = shift; 3540 my $class = shift;
2987 3541
2988 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
3002 3556
3003 $self->{current} = $self->{children}[0] 3557 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3558 if @{ $self->{children} };
3005} 3559}
3006 3560
3561sub get_current_page {
3562 my ($self) = @_;
3563
3564 $self->{current}
3565}
3566
3007sub set_current_page { 3567sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3568 my ($self, $page_or_widget) = @_;
3009 3569
3010 my $widget = ref $page_or_widget 3570 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3571 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3572 : $self->{children}[$page_or_widget];
3013 3573
3014 $self->{current} = $widget; 3574 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3575 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3576
3017 $self->_emit (page_changed => $self->{current}); 3577 $self->emit (page_changed => $self->{current});
3018 3578
3019 $self->realloc; 3579 $self->realloc;
3020} 3580}
3021 3581
3022sub visible_children { 3582sub visible_children {
… …
3027 my ($self) = @_; 3587 my ($self) = @_;
3028 3588
3029 $self->{current}->size_request 3589 $self->{current}->size_request
3030} 3590}
3031 3591
3032sub size_allocate { 3592sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3593 my ($self, $w, $h) = @_;
3034 3594
3035 $self->{current}->configure (0, 0, $w, $h); 3595 $self->{current}->configure (0, 0, $w, $h);
3596
3597 1
3036} 3598}
3037 3599
3038sub _draw { 3600sub _draw {
3039 my ($self) = @_; 3601 my ($self) = @_;
3040 3602
3041 $self->{current}->draw; 3603 $self->{current}->draw;
3042} 3604}
3043 3605
3044############################################################################# 3606#############################################################################
3045 3607
3046package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3047 3609
3048our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3049 3611
3050sub new { 3612sub new {
3051 my $class = shift; 3613 my $class = shift;
3052 3614
3053 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3057 @_, 3619 @_,
3058 ); 3620 );
3059 3621
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3064} 3626}
3065 3627
3066sub add { 3628sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3068 3630
3069 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3070 3632
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3634 markup => $title,
3073 tooltip => $tooltip, 3635 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3637 );
3076 3638
3077 $self->{multiplexer}->add ($widget); 3639 $self->{multiplexer}->add ($widget);
3078} 3640}
3079 3641
3642sub get_current_page {
3643 my ($self) = @_;
3644
3645 $self->{multiplexer}->get_current_page
3646}
3647
3080sub set_current_page { 3648sub set_current_page {
3081 my ($self, $page) = @_; 3649 my ($self, $page) = @_;
3082 3650
3083 $self->{multiplexer}->set_current_page ($page); 3651 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3653}
3086 3654
3087############################################################################# 3655#############################################################################
3088 3656
3657package CFPlus::UI::Selector;
3658
3659use utf8;
3660
3661our @ISA = CFPlus::UI::Button::;
3662
3663sub new {
3664 my $class = shift;
3665
3666 my $self = $class->SUPER::new (
3667 options => [], # [value, title, longdesc], ...
3668 value => undef,
3669 @_,
3670 );
3671
3672 $self->_set_value ($self->{value});
3673
3674 $self
3675}
3676
3677sub invoke_button_down {
3678 my ($self, $ev) = @_;
3679
3680 my @menu_items;
3681
3682 for (@{ $self->{options} }) {
3683 my ($value, $title, $tooltip) = @$_;
3684
3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3686 }
3687
3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3689}
3690
3691sub _set_value {
3692 my ($self, $value) = @_;
3693
3694 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3695 or return;
3696
3697 $self->{value} = $item->[0];
3698 $self->set_markup ("$item->[1] ⇓");
3699 $self->set_tooltip ($item->[2]);
3700}
3701
3702sub set_value {
3703 my ($self, $value) = @_;
3704
3705 return unless $self->{value} ne $value;
3706
3707 $self->_set_value ($value);
3708 $self->emit (changed => $value);
3709}
3710
3711#############################################################################
3712
3089package CFClient::UI::Statusbox; 3713package CFPlus::UI::Statusbox;
3090 3714
3091our @ISA = CFClient::UI::VBox::; 3715our @ISA = CFPlus::UI::VBox::;
3092 3716
3093sub new { 3717sub new {
3094 my $class = shift; 3718 my $class = shift;
3095 3719
3096 my $self = $class->SUPER::new ( 3720 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 3721 fontsize => 0.8,
3098 @_, 3722 @_,
3099 ); 3723 );
3100 3724
3101 Scalar::Util::weaken (my $this = $self); 3725 CFPlus::weaken (my $this = $self);
3102 3726
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104 3728
3105 $self 3729 $self
3106} 3730}
… …
3108sub reorder { 3732sub reorder {
3109 my ($self) = @_; 3733 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3734 my $NOW = Time::HiRes::time;
3111 3735
3112 # freeze display when hovering over any label 3736 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3737 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3739 values %{ $self->{item} };
3116 3740
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3743 }
… …
3140 for ($short) { 3764 for ($short) {
3141 s/^\s+//; 3765 s/^\s+//;
3142 s/\s+/ /g; 3766 s/\s+/ /g;
3143 } 3767 }
3144 3768
3145 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3146 markup => $short, 3770 markup => $short,
3147 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3812 $item->{count}++;
3189 } else { 3813 } else {
3190 $item->{count} = 1; 3814 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3815 $item->{text} = $item->{tooltip} = $text;
3192 } 3816 }
3193 $item->{id} = ++$self->{id}; 3817 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3818 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3819 delete $item->{label};
3196 } else { 3820 } else {
3197 $self->{item}{$group} = { 3821 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3822 id => ++$self->{id},
… …
3204 count => 1, 3828 count => 1,
3205 %arg, 3829 %arg,
3206 }; 3830 };
3207 } 3831 }
3208 3832
3833 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3834 $self->reorder;
3835 });
3210} 3836}
3211 3837
3212sub reconfigure { 3838sub reconfigure {
3213 my ($self) = @_; 3839 my ($self) = @_;
3214 3840
… …
3217 3843
3218 $self->reorder; 3844 $self->reorder;
3219 $self->SUPER::reconfigure; 3845 $self->SUPER::reconfigure;
3220} 3846}
3221 3847
3222sub DESTROY { 3848sub destroy {
3223 my ($self) = @_; 3849 my ($self) = @_;
3224 3850
3225 $self->{timer}->cancel; 3851 $self->{timer}->cancel;
3226 3852
3227 $self->SUPER::DESTROY; 3853 $self->SUPER::destroy;
3228} 3854}
3229 3855
3230############################################################################# 3856#############################################################################
3231 3857
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; 3858package CFPlus::UI::Root;
3528 3859
3529our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3530 3861
3531use List::Util qw(min max); 3862use List::Util qw(min max);
3532 3863
3533use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3534 3865
3535sub new { 3866sub new {
3536 my $class = shift; 3867 my $class = shift;
3537 3868
3538 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3539 visible => 1, 3870 visible => 1,
3540 @_, 3871 @_,
3541 ); 3872 );
3542 3873
3543 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3544 3875
3545 $self 3876 $self
3546} 3877}
3547 3878
3548sub size_request { 3879sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 3894 $coord = $max - $size if $coord > $max - $size;
3564 3895
3565 int $coord + 0.5 3896 int $coord + 0.5
3566} 3897}
3567 3898
3568sub size_allocate { 3899sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3900 my ($self, $w, $h) = @_;
3570 3901
3571 for my $child ($self->children) { 3902 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 3904
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3908 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3909 $Y = _to_pixel $Y, $H, $self->{h};
3579 3910
3580 $child->configure ($X, $Y, $W, $H); 3911 $child->configure ($X, $Y, $W, $H);
3581 } 3912 }
3913
3914 1
3582} 3915}
3583 3916
3584sub coord2local { 3917sub coord2local {
3585 my ($self, $x, $y) = @_; 3918 my ($self, $x, $y) = @_;
3586 3919
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4046
3714 $w = 0 if $w < 0; 4047 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3716 4049
4050 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h;
4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4058
3717 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
3719 4061
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4063 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4088 glLoadIdentity;
3747 4089
3748 { 4090 {
3749 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3750 4092
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4095
3755 $self->_draw; 4096 $self->_draw;
4097 }
3756} 4098}
3757 4099
3758############################################################################# 4100#############################################################################
3759 4101
3760package CFClient::UI; 4102package CFPlus::UI;
3761 4103
3762$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4106
37651 41071
3766 4108

Diff Legend

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