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

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

Diff Legend

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