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

Diff Legend

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