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

Diff Legend

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