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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
233 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
234 delete $self->{visible}; 277 delete $self->{visible};
235 278
236 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
238 281
239 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
241 284
242 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
243} 305}
244 306
245sub hide { 307sub hide {
246 my ($self) = @_; 308 my ($self) = @_;
247 309
249 311
250 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
251 if $self->{parent}; 313 if $self->{parent};
252} 314}
253 315
254sub move { 316sub move_abs {
255 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
256 318
257 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
260 322
261 $self->update; 323 $self->update;
262} 324}
263 325
264sub set_size { 326sub set_size {
265 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
266 328
267 $self->{user_w} = $w; 329 $self->{force_w} = $w;
268 $self->{user_h} = $h; 330 $self->{force_h} = $h;
269 331
270 $self->check_size; 332 $self->realloc;
271} 333}
272 334
273sub size_request { 335sub size_request {
274 require Carp; 336 require Carp;
275 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
277 339
278sub configure { 340sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
280 342
281 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
284 348
285 # use alignment to adjust x, y 349 # use alignment to adjust x, y
286 350
287 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 353 }
292 354
293 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 356 $self->{x} = $x;
295 $self->{y} = $y; 357 $self->{y} = $y;
296 $self->update; 358 $self->update;
297 } 359 }
298 360
299 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
301 } 368 }
302} 369}
303 370
304sub size_allocate { 371sub size_allocate {
305 # nothing to be done 372 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313} 373}
314 374
315sub children { 375sub children {
316} 376}
317 377
379 439
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS; 441 unless $FOCUS;
382} 442}
383 443
384sub mouse_motion { } 444sub mouse_motion { 0 }
385sub button_up { } 445sub button_up { 0 }
386sub key_down { } 446sub key_down { 0 }
387sub key_up { } 447sub key_up { 0 }
388 448
389sub button_down { 449sub button_down {
390 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
391 451
392 $self->focus_in; 452 $self->focus_in;
393}
394 453
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
400 530
401sub draw { 531sub draw {
402 my ($self) = @_; 532 my ($self) = @_;
403 533
404 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
405 545
406 glPushMatrix; 546 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw; 548 $self->_draw;
409 glPopMatrix; 549 glPopMatrix;
421 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
422 glEnd; 562 glEnd;
423 glDisable GL_BLEND; 563 glDisable GL_BLEND;
424 } 564 }
425 565
426 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 567 glPushMatrix;
428 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 571 glVertex 0 , 0;
442 my ($self) = @_; 582 my ($self) = @_;
443 583
444 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
445} 585}
446 586
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 587sub DESTROY {
508 my ($self) = @_; 588 my ($self) = @_;
509 589
510 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
511 #$self->deactivate; 591 #$self->deactivate;
567 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
569} 649}
570 650
571sub size_request { 651sub size_request {
572 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
573} 655}
574 656
575sub draw { } 657sub draw { }
576 658
577############################################################################# 659#############################################################################
606 $self->{children} = [ 688 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
609 ]; 691 ];
610 692
611 $self->check_size (1); 693 $self->realloc;
612 $self->update;
613} 694}
614 695
615sub children { 696sub children {
616 @{ $_[0]{children} } 697 @{ $_[0]{children} }
617} 698}
622 delete $child->{parent}; 703 delete $child->{parent};
623 $child->hide; 704 $child->hide;
624 705
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 707
627 $self->check_size (1); 708 $self->realloc;
628 $self->update;
629} 709}
630 710
631sub clear { 711sub clear {
632 my ($self) = @_; 712 my ($self) = @_;
633 713
637 for (@$children) { 717 for (@$children) {
638 delete $_->{parent}; 718 delete $_->{parent};
639 $_->hide; 719 $_->hide;
640 } 720 }
641 721
642 $self->check_size; 722 $self->realloc;
643 $self->update;
644} 723}
645 724
646sub find_widget { 725sub find_widget {
647 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
648 727
735 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 815 $self->update;
737} 816}
738 817
739sub _render { 818sub _render {
819 my ($self) = @_;
820
740 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
741} 822}
742 823
743sub render_child { 824sub render_child {
744 my ($self) = @_; 825 my ($self) = @_;
745 826
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
749 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
750 $self->_render; 838 $self->_render;
751 }; 839 };
752} 840}
753 841
754sub _draw { 842sub _draw {
755 my ($self) = @_; 843 my ($self) = @_;
756 844
757 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
758 846
759 my $tex = $self->{texture} 847 my $tex = $self->{texture}
760 or return; 848 or return;
761 849
762 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
785} 873}
786 874
787sub size_request { 875sub size_request {
788 my ($self) = @_; 876 my ($self) = @_;
789 877
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 879
792 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
793} 884}
794 885
795sub size_allocate { 886sub size_allocate {
796 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
797 888
889 my $child = $self->child;
890
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 893
801 $self->child->configure (0, 0, $w, $h); 894 $self->child->configure (0, 0, $w, $h);
802 $self->update; 895 $self->update;
803} 896}
804 897
840} 933}
841 934
842sub _render { 935sub _render {
843 my ($self) = @_; 936 my ($self) = @_;
844 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 942
847 $self->SUPER::_render; 943 $self->SUPER::_render;
848} 944}
849 945
857 my $class = shift; 953 my $class = shift;
858 954
859 my $self; 955 my $self;
860 956
861 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
862 vertical => 1, 958 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 960 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 961 $self->{vp}->set_offset (0, $_[1]);
866 }, 962 },
867 ; 963 ;
868 964
869 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
947 1043
948our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
949 1045
950use CFClient::OpenGL; 1046use CFClient::OpenGL;
951 1047
952my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1055
956sub new { 1056sub new {
957 my $class = shift; 1057 my ($class, %arg) = @_;
958 1058
959 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
960 1060
961 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1064 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1065 can_events => 1,
967 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
968 ); 1069 );
969 1070
970 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
971 align => 0, 1072 align => 0,
972 valign => 1, 1073 valign => 1,
973 text => $self->{title}, 1074 text => $title,
974 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
975 1077
976 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
977} 1086}
978 1087
979sub border { 1088sub border {
980 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
981} 1090}
982 1091
983sub size_request { 1092sub size_request {
984 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
985 1097
986 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
987 1099
988 ( 1100 (
989 $w + $self->border * 2, 1101 $w + $self->border * 2,
992} 1104}
993 1105
994sub size_allocate { 1106sub size_allocate {
995 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
996 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
997 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
999 1119
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
1004} 1121}
1005 1122
1006sub button_down { 1123sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
1008 1125
1024 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
1025 1142
1026 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
1028 1145
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size;
1033 }; 1151 };
1034 1152
1035 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
1039 $self->{motion} = sub { 1157 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1041 1159
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1161
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update;
1046 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
1047 } 1168 1
1048} 1169}
1049 1170
1050sub button_up { 1171sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1052 1173
1053 delete $self->{motion}; 1174 !!delete $self->{motion}
1054} 1175}
1055 1176
1056sub mouse_motion { 1177sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
1058 1179
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
1060} 1183}
1061 1184
1062sub _draw { 1185sub _draw {
1063 my ($self) = @_; 1186 my ($self) = @_;
1064 1187
1188 my $child = $self->{children}[0];
1189
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1192
1068 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1195
1071 my $border = $self->border; 1196 my $border = $self->border;
1072 1197
1073 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1203
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1081 1206
1082 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1212 }
1093 1213
1094 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1095 1215
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1099} 1222}
1100 1223
1101############################################################################# 1224#############################################################################
1102 1225
1103package CFClient::UI::Table; 1226package CFClient::UI::Table;
1125 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1126 1249
1127 $child->set_parent ($self); 1250 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1129 1252
1130 $self->check_size (1); 1253 $self->realloc;
1131} 1254}
1132 1255
1133# TODO: move to container class maybe? send children a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1257sub clear {
1135 my ($self) = @_; 1258 my ($self) = @_;
1140 for (@children) { 1263 for (@children) {
1141 delete $_->{parent}; 1264 delete $_->{parent};
1142 $_->hide; 1265 $_->hide;
1143 } 1266 }
1144 1267
1145 $self->check_size (1); 1268 $self->realloc;
1146 $self->update;
1147} 1269}
1148 1270
1149sub get_wh { 1271sub get_wh {
1150 my ($self) = @_; 1272 my ($self) = @_;
1151 1273
1247 } 1369 }
1248} 1370}
1249 1371
1250############################################################################# 1372#############################################################################
1251 1373
1252package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1375
1256our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1257 1377
1258sub size_request { 1378sub size_request {
1259 my ($self) = @_; 1379 my ($self) = @_;
1260 1380
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1262 1382 ? (
1263 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1385 )
1266 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1267} 1390}
1268 1391
1269sub size_allocate { 1392sub size_allocate {
1270 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1271 1394
1272 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1396 my $children = $self->{children};
1275 1397
1276 my @h = map $_->{req_w}, @$children; 1398 my @req;
1277 1399
1278 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1279 1401 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1416 }
1294 } 1417 }
1295 1418
1296 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1297 1420
1298 my $y = 0; 1421 my $pos = 0;
1299 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1425
1304 $y += $h; 1426 $pos += $alloc;
1305 } 1427 }
1306 1428
1307 1 1429 1
1308} 1430}
1309 1431
1310############################################################################# 1432#############################################################################
1311 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1312package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1313 1450
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1317 1452
1318sub size_request { 1453sub new {
1319 my ($self) = @_; 1454 my $class = shift;
1320 1455
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1322 1457 vertical => 1,
1323 ( 1458 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1459 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1460}
1367 1461
1368############################################################################# 1462#############################################################################
1369 1463
1370package CFClient::UI::Label; 1464package CFClient::UI::Label;
1387 ellipsise => 3, # end 1481 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1389 fontsize => 1, 1483 fontsize => 1,
1390 align => -1, 1484 align => -1,
1391 valign => -1, 1485 valign => -1,
1392 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1393 can_events => 0, 1488 can_events => 0,
1394 %arg 1489 %arg
1395 ); 1490 );
1396 1491
1397 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
1433 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1434 1529
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1437 1532
1533 $self->realloc;
1438 $self->update; 1534 $self->update;
1439 $self->check_size;
1440} 1535}
1441 1536
1442sub set_markup { 1537sub set_markup {
1443 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1444 1539
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1544
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1452 1547
1548 $self->realloc;
1453 $self->update; 1549 $self->update;
1454 $self->check_size;
1455} 1550}
1456 1551
1457sub size_request { 1552sub size_request {
1458 my ($self) = @_; 1553 my ($self) = @_;
1459 1554
1473 1568
1474 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1476 } 1571 }
1477 1572
1478 ( 1573 ($w, $h)
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1574}
1483 1575
1484sub size_allocate { 1576sub size_allocate {
1485 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1486 1578
1579 delete $self->{ox};
1580
1487 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1583}
1489 1584
1490sub set_fontsize { 1585sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1492 1587
1493 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1589 delete $self->{texture};
1495 1590
1496 $self->update; 1591 $self->realloc;
1497 $self->check_size;
1498} 1592}
1499 1593
1500sub _draw { 1594sub _draw {
1501 my ($self) = @_; 1595 my ($self) = @_;
1502 1596
1508 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1606
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1514 1609
1610 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1518 1614
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1618 };
1525 1619
1526 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 1622
1582sub set_text { 1676sub set_text {
1583 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1584 1678
1585 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1680 $self->_set_text ($text);
1587 $self->update; 1681
1588 $self->check_size; 1682 $self->realloc;
1589} 1683}
1590 1684
1591sub get_text { 1685sub get_text {
1592 $_[0]{text} 1686 $_[0]{text}
1593} 1687}
1623 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1719 $self->_emit ('escape');
1626 } elsif ($uni) { 1720 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1628 } 1724 }
1629 1725
1630 $self->_set_text ($text); 1726 $self->_set_text ($text);
1631 $self->update; 1727
1632 $self->check_size; 1728 $self->realloc;
1729
1730 1
1633} 1731}
1634 1732
1635sub focus_in { 1733sub focus_in {
1636 my ($self) = @_; 1734 my ($self) = @_;
1637 1735
1652 utf8::encode $text; 1750 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1654 1752
1655 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1656 $self->update; 1754 $self->update;
1755
1756 1
1657} 1757}
1658 1758
1659sub mouse_motion { 1759sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1662} 1764}
1663 1765
1664sub _draw { 1766sub _draw {
1665 my ($self) = @_; 1767 my ($self) = @_;
1666 1768
1743 } else { 1845 } else {
1744 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1745 } 1847 }
1746 1848
1747 } else { 1849 } else {
1748 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1749 } 1853 1
1750
1751} 1854}
1752 1855
1753############################################################################# 1856#############################################################################
1754 1857
1755package CFClient::UI::Button; 1858package CFClient::UI::Button;
1764 1867
1765sub new { 1868sub new {
1766 my $class = shift; 1869 my $class = shift;
1767 1870
1768 $class->SUPER::new ( 1871 $class->SUPER::new (
1769 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1770 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1772 can_hover => 1, 1876 can_hover => 1,
1773 align => 0, 1877 align => 0,
1774 valign => 0, 1878 valign => 0,
1783 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1784 1888
1785 $self->emit ("activate") 1889 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1891 && $y >= 0 && $y < $self->{h};
1892
1893 1
1788} 1894}
1789 1895
1790sub _draw { 1896sub _draw {
1791 my ($self) = @_; 1897 my ($self) = @_;
1792 1898
1821 1927
1822sub new { 1928sub new {
1823 my $class = shift; 1929 my $class = shift;
1824 1930
1825 $class->SUPER::new ( 1931 $class->SUPER::new (
1826 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1827 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1938 state => 0,
1835} 1942}
1836 1943
1837sub size_request { 1944sub size_request {
1838 my ($self) = @_; 1945 my ($self) = @_;
1839 1946
1840 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1841} 1948}
1842 1949
1843sub button_down { 1950sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1845 1952
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1850 } 1961 1
1851} 1962}
1852 1963
1853sub _draw { 1964sub _draw {
1854 my ($self) = @_; 1965 my ($self) = @_;
1855 1966
1856 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1857 1968
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1970
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 1974
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 1976
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 1978
2130 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2247 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2137 vertical => 0, 2250 vertical => 0,
2138 can_hover => 1, 2251 can_hover => 1,
2139 inner_pad => 0.02, 2252 inner_pad => 0.02,
2140 @_ 2253 @_
2141 ); 2254 );
2144 $self->update; 2257 $self->update;
2145 2258
2146 $self 2259 $self
2147} 2260}
2148 2261
2262sub changed { }
2263
2149sub set_range { 2264sub set_range {
2150 my ($self, $range) = @_; 2265 my ($self, $range) = @_;
2151 2266
2152 ($range, $self->{range}) = ($self->{range}, $range); 2267 ($range, $self->{range}) = ($self->{range}, $range);
2153 2268
2179} 2294}
2180 2295
2181sub size_request { 2296sub size_request {
2182 my ($self) = @_; 2297 my ($self) = @_;
2183 2298
2184 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2300}
2189 2301
2190sub button_down { 2302sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2192 2304
2193 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2194 2306
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2308
2197 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2198} 2310}
2199 2311
2200sub mouse_motion { 2312sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2202 2314
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2319
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2321
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2211 } 2327 1
2212} 2328}
2213 2329
2214sub update { 2330sub update {
2215 my ($self) = @_; 2331 my ($self) = @_;
2216 2332
2543 2659
2544sub new { 2660sub new {
2545 my $class = shift; 2661 my $class = shift;
2546 2662
2547 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2548 state => 0, 2664 state => 0,
2549 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2550 @_ 2666 @_
2551 ); 2667 );
2552 2668
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2669 $self
2559} 2670}
2560 2671
2561sub toggle_flopper { 2672sub toggle_flopper {
2562 my ($self) = @_; 2673 my ($self) = @_;
2563 2674
2564 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2676}
2576 2677
2577############################################################################# 2678#############################################################################
2578 2679
2579package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
2592} 2693}
2593 2694
2594sub set_tooltip_from { 2695sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2596 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2597 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2710 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2712 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2614 2724
2615sub size_allocate { 2725sub size_allocate {
2616 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2617 2727
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2619} 2747}
2620 2748
2621sub _draw { 2749sub _draw {
2622 my ($self) = @_; 2750 my ($self) = @_;
2623 2751
2640 glVertex $w, $h; 2768 glVertex $w, $h;
2641 glVertex $w, 0; 2769 glVertex $w, 0;
2642 glEnd; 2770 glEnd;
2643 2771
2644 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2645 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2646} 2775}
2647 2776
2648############################################################################# 2777#############################################################################
2649 2778
2725 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2726} 2855}
2727 2856
2728############################################################################# 2857#############################################################################
2729 2858
2730package CFClient::UI::Inventory;
2731
2732our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734sub new {
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774
2775#############################################################################
2776
2777package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
2778 2860
2779our @ISA = CFClient::UI::FancyFrame::; 2861our @ISA = CFClient::UI::FancyFrame::;
2780 2862
2781use CFClient::OpenGL; 2863use CFClient::OpenGL;
2819 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2902 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2822 2904
2823 $self->show; 2905 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2907}
2826 2908
2827sub mouse_motion { 2909sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2829 2911
2830 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2833} 2917}
2834 2918
2835sub button_up { 2919sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2837 2921
2839 undef $GRAB; 2923 undef $GRAB;
2840 $self->hide; 2924 $self->hide;
2841 2925
2842 $self->_emit ("popdown"); 2926 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2844 } 2932 1
2845} 2933}
2846 2934
2847############################################################################# 2935#############################################################################
2848 2936
2849package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2954 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2955} 3043}
2956 3044
2957############################################################################# 3045#############################################################################
2958 3046
2959package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2960 3048
2961our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3050
2965sub new { 3051sub new {
2966 my $class = shift; 3052 my $class = shift;
2967 3053
2968 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2969 @_, 3056 @_,
2970 ) 3057 );
2971}
2972 3058
2973sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2974 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2975 3213
2976 $self->{w} = $w; 3214 $self->clear_command_list;
2977 $self->{h} = $h; 3215 $self->{recording} = 0;
2978} 3216 $self->{rec_btn}->set_text ("start recording");
2979 3217
2980sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2981 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2982 3236
2983 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2984 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2985} 3360}
2986 3361
2987sub size_request { 3362sub size_request {
2988 my ($self) = @_; 3363 my ($self) = @_;
2989 3364
2990 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2991} 3380}
2992 3381
2993sub size_allocate { 3382sub size_allocate {
2994 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2995 3384
2996 for my $child ($self->children) { 3385 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3387
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3001 3390
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3393
3008 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
3009 } 3395 }
3010} 3396}
3011 3397
3022} 3408}
3023 3409
3024sub update { 3410sub update {
3025 my ($self) = @_; 3411 my ($self) = @_;
3026 3412
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
3029} 3414}
3030 3415
3031sub add { 3416sub add {
3032 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
3033 3418
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3419 $_->{is_toplevel} = 1
3042 3420 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3421
3048 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3049} 3423}
3050 3424
3051sub remove { 3425sub remove {
3052 my ($self, @children) = @_; 3426 my ($self, @children) = @_;
3053 3427
3054 $self->SUPER::remove (@children); 3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3055 3432
3056 while (@children) { 3433 while (@children) {
3057 my $w = pop @children; 3434 my $w = pop @children;
3058 push @children, $w->children; 3435 push @children, $w->children;
3059 $w->set_invisible; 3436 $w->set_invisible;
3078 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3079 $_->() 3456 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3081 } 3458 }
3082 3459
3083 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3084 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3085 3464
3086 for (;;) { 3465 outer:
3087 if ($self->{check_size}) { 3466 while () {
3088 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3091 } 3475 }
3092 3476
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3094 3479
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3481 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3105 3500
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3107 3502
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3110 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3111 } 3513 }
3112 } 3514 }
3113 3515
3114 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3524
3118 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3120 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3121 $widget->{w} = $w; 3535 $widget->{w} = $w;
3122 $widget->{h} = $h; 3536 $widget->{h} = $h;
3537
3123 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3124 } 3540 }
3125 } 3541 }
3126 3542
3127 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3128 $_->() 3544 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3130 } 3546 }
3547
3131 3548
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3135 3552
3137 glLoadIdentity; 3554 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3557 glLoadIdentity;
3141 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3142 $self->_draw; 3566 $self->_draw;
3143} 3567}
3144 3568
3145############################################################################# 3569#############################################################################
3146 3570

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines