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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 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 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $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;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $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;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 388}
323 389
324sub set_tooltip { 390sub set_tooltip {
325 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
326 397
327 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
328 399
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
373 444
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS; 446 unless $FOCUS;
376} 447}
377 448
378sub mouse_motion { } 449sub mouse_motion { 0 }
379sub button_up { } 450sub button_up { 0 }
380sub key_down { } 451sub key_down { 0 }
381sub key_up { } 452sub key_up { 0 }
382 453
383sub button_down { 454sub button_down {
384 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
385 456
386 $self->focus_in; 457 $self->focus_in;
387}
388 458
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
394 535
395sub draw { 536sub draw {
396 my ($self) = @_; 537 my ($self) = @_;
397 538
398 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
399 550
400 glPushMatrix; 551 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw;
403 glPopMatrix;
404 553
405 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
406 my ($x, $y) = @$self{qw(x y)};
407
408 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
409 glEnable GL_BLEND; 556 glEnable GL_BLEND;
410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
411 glBegin GL_QUADS; 558 glBegin GL_QUADS;
412 glVertex $x , $y;
413 glVertex $x + $self->{w}, $y;
414 glVertex $x + $self->{w}, $y + $self->{h};
415 glVertex $x , $y + $self->{h};
416 glEnd;
417 glDisable GL_BLEND;
418 }
419
420 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix;
422 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 559 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
427 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
428 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
429 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
430 glPopMatrix; 577 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
433} 583}
434 584
435sub _draw { 585sub _draw {
436 my ($self) = @_; 586 my ($self) = @_;
437 587
438 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 589}
497 590
498sub DESTROY { 591sub DESTROY {
499 my ($self) = @_; 592 my ($self) = @_;
500 593
… …
532 625
533 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
534 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
535 628
536 glEnable GL_BLEND; 629 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glColor @$color; 631 glColor_premultiply @$color;
539 632
540 glBegin GL_QUADS; 633 glBegin GL_QUADS;
541 glVertex 0 , 0; 634 glVertex 0 , 0;
542 glVertex 0 , $h; 635 glVertex 0 , $h;
543 glVertex $w, $h; 636 glVertex $w, $h;
… …
558 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
560} 653}
561 654
562sub size_request { 655sub size_request {
563 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
564} 659}
565 660
566sub draw { } 661sub draw { }
567 662
568############################################################################# 663#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
573 668
574sub new { 669sub new {
575 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
576 671
577 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
578 673
579 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
580 children => [], 675 children => [],
581 can_events => 0, 676 can_events => 0,
582 %arg, 677 %arg,
583 ); 678 );
679
584 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
585 682
586 $self 683 $self
587} 684}
588 685
589sub add { 686sub add {
… …
597 $self->{children} = [ 694 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
600 ]; 697 ];
601 698
602 $self->check_size (1); 699 $self->realloc;
603 $self->update;
604} 700}
605 701
606sub children { 702sub children {
607 @{ $_[0]{children} } 703 @{ $_[0]{children} }
608} 704}
… …
613 delete $child->{parent}; 709 delete $child->{parent};
614 $child->hide; 710 $child->hide;
615 711
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 713
618 $self->check_size; 714 $self->realloc;
619 $self->update;
620} 715}
621 716
622sub clear { 717sub clear {
623 my ($self) = @_; 718 my ($self) = @_;
624 719
… …
628 for (@$children) { 723 for (@$children) {
629 delete $_->{parent}; 724 delete $_->{parent};
630 $_->hide; 725 $_->hide;
631 } 726 }
632 727
633 $self->check_size; 728 $self->realloc;
634 $self->update;
635} 729}
636 730
637sub find_widget { 731sub find_widget {
638 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
639 733
640 $x -= $self->{x}; 734 $x -= $self->{x};
641 $y -= $self->{y}; 735 $y -= $self->{y};
642 736
643 my $res; 737 my $res;
644 738
645 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
647 and return $res; 741 and return $res;
648 } 742 }
649 743
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
699 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
700} 794}
701 795
702############################################################################# 796#############################################################################
703 797
798# back-buffered drawing area
799
704package CFClient::UI::Window; 800package CFClient::UI::Window;
705 801
706our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
707 803
708use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
726 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 823 $self->update;
728} 824}
729 825
730sub _render { 826sub _render {
827 my ($self) = @_;
828
731 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
732} 830}
733 831
734sub render_child { 832sub render_child {
735 my ($self) = @_; 833 my ($self) = @_;
736 834
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
740 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
741 $self->_render; 846 $self->_render;
742 }; 847 };
743} 848}
744 849
745sub _draw { 850sub _draw {
746 my ($self) = @_; 851 my ($self) = @_;
747 852
748 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
749 854
750 my $tex = $self->{texture} 855 my $tex = $self->{texture}
751 or return; 856 or return;
752 857
753 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
755 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
756 863
757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
758 865
866 glDisable GL_BLEND;
759 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
760} 868}
761 869
762############################################################################# 870#############################################################################
763 871
764package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
765 873
766our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
767 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
768sub size_request { 886sub size_request {
769 my ($self) = @_; 887 my ($self) = @_;
770 888
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 890
773 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
774} 895}
775 896
776sub size_allocate { 897sub size_allocate {
777 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
778 899
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
780# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
781 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
782 $self->update; 906 $self->update;
783} 907}
784 908
785sub set_offset { 909sub set_offset {
786 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
820} 944}
821 945
822sub _render { 946sub _render {
823 my ($self) = @_; 947 my ($self) = @_;
824 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 953
827 $self->SUPER::_render; 954 $self->SUPER::_render;
828} 955}
829 956
… …
832package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
833 960
834our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
835 962
836sub new { 963sub new {
837 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
838 967
839 my $self; 968 my $self;
840 969
841 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
842 vertical => 1, 971 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 973 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
846 }, 975 },
847 ; 976 ;
848 977
849 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 980 slider => $slider,
852 @_, 981 %arg,
853 ); 982 );
854 983
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
858 986
859 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 1004}
861 1005
862sub size_allocate { 1006sub size_allocate {
863 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
864 1008
… …
893 1037
894 if ($self->{bg}) { 1038 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
896 1040
897 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
899 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
900 1044
901 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
902 glVertex 0 , 0; 1046 glVertex 0 , 0;
903 glVertex 0 , $h; 1047 glVertex 0 , $h;
904 glVertex $w, $h; 1048 glVertex $w, $h;
… …
917 1061
918our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
919 1063
920use CFClient::OpenGL; 1064use CFClient::OpenGL;
921 1065
922my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1073
926sub new { 1074sub new {
927 my $class = shift; 1075 my ($class, %arg) = @_;
928 1076
929 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
930 1078
931 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1082 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1083 can_events => 1,
937 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
938 ); 1087 );
939 1088
940 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
941 align => 0, 1090 align => 0,
942 valign => 1, 1091 valign => 1,
943 text => $self->{title}, 1092 text => $title,
944 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
945 1095
946 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
947} 1104}
948 1105
949sub border { 1106sub border {
950 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
951} 1108}
952 1109
953sub size_request { 1110sub size_request {
954 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
955 1115
956 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
957 1117
958 ( 1118 (
959 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
962} 1122}
963 1123
964sub size_allocate { 1124sub size_allocate {
965 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
966 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
967 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
969 1137
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
974} 1139}
975 1140
976sub button_down { 1141sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
978 1143
… …
994 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
995 1160
996 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
998 1163
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1168 $self->realloc;
1003 }; 1169 };
1004 1170
1005 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1175 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1011 1177
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1179
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1017 } 1188 1
1018} 1189}
1019 1190
1020sub button_up { 1191sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1022 1193
1023 delete $self->{motion}; 1194 !!delete $self->{motion}
1024} 1195}
1025 1196
1026sub mouse_motion { 1197sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1028 1199
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1030} 1203}
1031 1204
1032sub _draw { 1205sub _draw {
1033 my ($self) = @_; 1206 my ($self) = @_;
1034 1207
1208 my $child = $self->{children}[0];
1209
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1212
1038 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1215
1041 my $border = $self->border; 1216 my $border = $self->border;
1042 1217
1043 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1223
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1051 1226
1052 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1232 }
1063 1233
1064 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1065 1235
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1069} 1242}
1070 1243
1071############################################################################# 1244#############################################################################
1072 1245
1073package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1081sub new { 1254sub new {
1082 my $class = shift; 1255 my $class = shift;
1083 1256
1084 $class->SUPER::new ( 1257 $class->SUPER::new (
1085 col_expand => [], 1258 col_expand => [],
1086 @_ 1259 @_,
1087 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1265}
1089 1266
1090sub add { 1267sub add {
1091 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1092 1269
1093 $child->set_parent ($self); 1270 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1095 1272
1096 $child->check_size; 1273 $self->realloc;
1097} 1274}
1098 1275
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1277sub clear {
1105 my ($self) = @_; 1278 my ($self) = @_;
1106 1279
1107 my @children = $self->children; 1280 my @children = $self->children;
1108 delete $self->{children}; 1281 delete $self->{children};
… …
1110 for (@children) { 1283 for (@children) {
1111 delete $_->{parent}; 1284 delete $_->{parent};
1112 $_->hide; 1285 $_->hide;
1113 } 1286 }
1114 1287
1115 $self->update; 1288 $self->realloc;
1116} 1289}
1117 1290
1118sub get_wh { 1291sub get_wh {
1119 my ($self) = @_; 1292 my ($self) = @_;
1120 1293
… …
1151sub size_allocate { 1324sub size_allocate {
1152 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1153 1326
1154 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1155 1328
1156 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1158 1331
1159 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1389 }
1217} 1390}
1218 1391
1219############################################################################# 1392#############################################################################
1220 1393
1221package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1395
1225our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1226 1397
1227sub size_request { 1398sub size_request {
1228 my ($self) = @_; 1399 my ($self) = @_;
1229 1400
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1231 1402 ? (
1232 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1405 )
1235 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1236} 1410}
1237 1411
1238sub size_allocate { 1412sub size_allocate {
1239 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1240 1414
1241 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1416 my $children = $self->{children};
1244 1417
1245 my @h = map $_->{req_w}, @$children; 1418 my @req;
1246 1419
1247 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1248 1421 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1436 }
1263 } 1437 }
1264 1438
1265 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1266 1440
1267 my $y = 0; 1441 my $pos = 0;
1268 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1445
1273 $y += $h; 1446 $pos += $alloc;
1274 } 1447 }
1275 1448
1276 1 1449 1
1277} 1450}
1278 1451
1279############################################################################# 1452#############################################################################
1280 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1281package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1282 1470
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1286 1472
1287sub size_request { 1473sub new {
1288 my ($self) = @_; 1474 my $class = shift;
1289 1475
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1291 1477 vertical => 1,
1292 ( 1478 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1479 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1480}
1336 1481
1337############################################################################# 1482#############################################################################
1338 1483
1339package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1501 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1358 fontsize => 1, 1503 fontsize => 1,
1359 align => -1, 1504 align => -1,
1360 valign => -1, 1505 valign => -1,
1361 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1362 can_events => 0, 1508 can_events => 0,
1363 %arg 1509 %arg
1364 ); 1510 );
1365 1511
1366 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1403 1549
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1406 1552
1553 $self->realloc;
1407 $self->update; 1554 $self->update;
1408 $self->check_size;
1409} 1555}
1410 1556
1411sub set_markup { 1557sub set_markup {
1412 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1413 1559
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1564
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1421 1567
1568 $self->realloc;
1422 $self->update; 1569 $self->update;
1423 $self->check_size;
1424} 1570}
1425 1571
1426sub size_request { 1572sub size_request {
1427 my ($self) = @_; 1573 my ($self) = @_;
1428 1574
… …
1442 1588
1443 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1445 } 1591 }
1446 1592
1447 ( 1593 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1594}
1452 1595
1453sub size_allocate { 1596sub size_allocate {
1454 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1455 1598
1599 delete $self->{ox};
1600
1456 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1603}
1458 1604
1459sub set_fontsize { 1605sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1461 1607
1462 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1609 delete $self->{texture};
1464 1610
1465 $self->update; 1611 $self->realloc;
1466 $self->check_size;
1467} 1612}
1468 1613
1469sub _draw { 1614sub _draw {
1470 my ($self) = @_; 1615 my ($self) = @_;
1471 1616
… …
1477 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1626
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1483 1629
1630 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1487 1634
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1638 };
1494 1639
1495 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1642
… …
1535 1680
1536 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1537 1682
1538 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1539 1684
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1686 $self->{text} = $text;
1544 1687
1545 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1547 1690
1548 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1549} 1693}
1550 1694
1551sub set_text { 1695sub set_text {
1552 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1553 1697
1554 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1699 $self->_set_text ($text);
1556 $self->update; 1700
1557 $self->check_size; 1701 $self->realloc;
1558} 1702}
1559 1703
1560sub get_text { 1704sub get_text {
1561 $_[0]{text} 1705 $_[0]{text}
1562} 1706}
… …
1592 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1595 } elsif ($uni) { 1739 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1597 } 1743 }
1598 1744
1599 $self->_set_text ($text); 1745 $self->_set_text ($text);
1600 $self->update; 1746
1601 $self->check_size; 1747 $self->realloc;
1748
1749 1
1602} 1750}
1603 1751
1604sub focus_in { 1752sub focus_in {
1605 my ($self) = @_; 1753 my ($self) = @_;
1606 1754
… …
1621 utf8::encode $text; 1769 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1623 1771
1624 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1625 $self->update; 1773 $self->update;
1774
1775 1
1626} 1776}
1627 1777
1628sub mouse_motion { 1778sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1631} 1783}
1632 1784
1633sub _draw { 1785sub _draw {
1634 my ($self) = @_; 1786 my ($self) = @_;
1635 1787
1636 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1637 1789
1638 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1639 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1640 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1641 } else { 1793 } else {
1642 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1643 } 1795 }
1644 1796
1645 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1647 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1648 glVertex 0 , 0; 1800 glVertex 0 , 0;
1649 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1650 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1651 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1712 } else { 1864 } else {
1713 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1714 } 1866 }
1715 1867
1716 } else { 1868 } else {
1717 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1718 } 1872 1
1719
1720} 1873}
1721 1874
1722############################################################################# 1875#############################################################################
1723 1876
1724package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1733 1886
1734sub new { 1887sub new {
1735 my $class = shift; 1888 my $class = shift;
1736 1889
1737 $class->SUPER::new ( 1890 $class->SUPER::new (
1738 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1739 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1741 can_hover => 1, 1895 can_hover => 1,
1742 align => 0, 1896 align => 0,
1743 valign => 0, 1897 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1753 1907
1754 $self->emit ("activate") 1908 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1757} 1913}
1758 1914
1759sub _draw { 1915sub _draw {
1760 my ($self) = @_; 1916 my ($self) = @_;
1761 1917
… …
1790 1946
1791sub new { 1947sub new {
1792 my $class = shift; 1948 my $class = shift;
1793 1949
1794 $class->SUPER::new ( 1950 $class->SUPER::new (
1795 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1796 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1957 state => 0,
… …
1804} 1961}
1805 1962
1806sub size_request { 1963sub size_request {
1807 my ($self) = @_; 1964 my ($self) = @_;
1808 1965
1809 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1810} 1967}
1811 1968
1812sub button_down { 1969sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1814 1971
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1819 } 1980 1
1820} 1981}
1821 1982
1822sub _draw { 1983sub _draw {
1823 my ($self) = @_; 1984 my ($self) = @_;
1824 1985
1825 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1826 1987
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1989
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1993
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1995
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1997
… …
1989 2152
1990 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1991 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1992 2155
1993 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 2161
1998 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1999 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2099 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2106 vertical => 0, 2270 vertical => 0,
2107 can_hover => 1, 2271 can_hover => 1,
2108 inner_pad => 0.02, 2272 inner_pad => 0.02,
2109 @_ 2273 @_
2110 ); 2274 );
… …
2113 $self->update; 2277 $self->update;
2114 2278
2115 $self 2279 $self
2116} 2280}
2117 2281
2282sub changed { }
2283
2118sub set_range { 2284sub set_range {
2119 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2120 2286
2121 $self->{range} = $range; 2287 ($range, $self->{range}) = ($self->{range}, $range);
2122 2288
2123 $self->update; 2289 $self->update
2290 if "@$range" ne "@{$self->{range}}";
2124} 2291}
2125 2292
2126sub set_value { 2293sub set_value {
2127 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2128 2295
… …
2147} 2314}
2148 2315
2149sub size_request { 2316sub size_request {
2150 my ($self) = @_; 2317 my ($self) = @_;
2151 2318
2152 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2320}
2157 2321
2158sub button_down { 2322sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2160 2324
2161 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2162 2326
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2328
2165 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2166} 2330}
2167 2331
2168sub mouse_motion { 2332sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2170 2334
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2339
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2341
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2179 } 2347 1
2180} 2348}
2181 2349
2182sub update { 2350sub update {
2183 my ($self) = @_; 2351 my ($self) = @_;
2184 2352
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2186 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2187 2362
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2190 2365
… …
2196 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2198 2373
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2201 }); 2376 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2377
2209 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2210 2379
2211 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2212 2381
… …
2511 2680
2512sub new { 2681sub new {
2513 my $class = shift; 2682 my $class = shift;
2514 2683
2515 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2516 state => 0, 2685 state => 0,
2517 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2518 @_ 2687 @_
2519 ); 2688 );
2520 2689
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2690 $self
2527} 2691}
2528 2692
2529sub toggle_flopper { 2693sub toggle_flopper {
2530 my ($self) = @_; 2694 my ($self) = @_;
2531 2695
2532 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2697}
2544 2698
2545############################################################################# 2699#############################################################################
2546 2700
2547package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2560} 2714}
2561 2715
2562sub set_tooltip_from { 2716sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2564 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2565 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2731 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2733 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2745
2583sub size_allocate { 2746sub size_allocate {
2584 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2585 2748
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2587} 2768}
2588 2769
2589sub _draw { 2770sub _draw {
2590 my ($self) = @_; 2771 my ($self) = @_;
2591 2772
… …
2608 glVertex $w, $h; 2789 glVertex $w, $h;
2609 glVertex $w, 0; 2790 glVertex $w, 0;
2610 glEnd; 2791 glEnd;
2611 2792
2612 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2613 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2614} 2796}
2615 2797
2616############################################################################# 2798#############################################################################
2617 2799
… …
2623 2805
2624sub new { 2806sub new {
2625 my $class = shift; 2807 my $class = shift;
2626 2808
2627 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2628 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2629 @_, 2812 @_,
2630 ); 2813 );
2631 2814
2632 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2693} 2876}
2694 2877
2695############################################################################# 2878#############################################################################
2696 2879
2697package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2698 2881
2699our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2700 2883
2701sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 2885
2858############################################################################# 2886#############################################################################
2859 2887
2860package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2861 2889
… …
2902 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2931 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2905 2933
2906 $self->show; 2934 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2936}
2909 2937
2910sub mouse_motion { 2938sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2912 2940
2913 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2916} 2946}
2917 2947
2918sub button_up { 2948sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2920 2950
… …
2922 undef $GRAB; 2952 undef $GRAB;
2923 $self->hide; 2953 $self->hide;
2924 2954
2925 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2927 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2928} 3070}
2929 3071
2930############################################################################# 3072#############################################################################
2931 3073
2932package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2992sub add { 3134sub add {
2993 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2994 3136
2995 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2997 3141
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 3143
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3145
… …
3035 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
3036} 3180}
3037 3181
3038############################################################################# 3182#############################################################################
3039 3183
3040package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
3041 3185
3042our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3187
3046sub new { 3188sub new {
3047 my $class = shift; 3189 my $class = shift;
3048 3190
3049 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3050 @_, 3433 @_,
3051 ) 3434 )
3052} 3435}
3053 3436
3054sub configure { 3437# XXX: Do sorting? Argl...
3055 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
3061sub check_size {
3062 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3063 3441
3064 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3065 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
3066} 3496}
3067 3497
3068sub size_request { 3498sub size_request {
3069 my ($self) = @_; 3499 my ($self) = @_;
3070 3500
3071 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
3072} 3516}
3073 3517
3074sub size_allocate { 3518sub size_allocate {
3075 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3076 3520
3077 for my $child ($self->children) { 3521 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3523
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3082 3526
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3529
3089 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3090 } 3531 }
3091} 3532}
3092 3533
… …
3103} 3544}
3104 3545
3105sub update { 3546sub update {
3106 my ($self) = @_; 3547 my ($self) = @_;
3107 3548
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3110} 3550}
3111 3551
3112sub add { 3552sub add {
3113 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3114 3554
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3123 3556 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3557
3129 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3130} 3559}
3131 3560
3132sub remove { 3561sub remove {
3133 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3134 3563
3135 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3136 3568
3137 while (@children) { 3569 while (@children) {
3138 my $w = pop @children; 3570 my $w = pop @children;
3139 push @children, $w->children; 3571 push @children, $w->children;
3140 $w->set_invisible; 3572 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3160 $_->() 3592 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3162 } 3594 }
3163 3595
3164 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3165 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3166 3600
3167 for (;;) { 3601 outer:
3168 if ($self->{check_size}) { 3602 while () {
3169 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3172 } 3611 }
3173 3612
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3175 3615
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3617 and last;
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3186 3636
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3188 3638
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3191 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3192 } 3649 }
3193 } 3650 }
3194 3651
3195 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3660
3199 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3201 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3202 $widget->{w} = $w; 3671 $widget->{w} = $w;
3203 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3204 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3205 } 3676 }
3206 } 3677 }
3207 3678
3208 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3209 $_->() 3680 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3211 } 3682 }
3683
3212 3684
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3216 3688
… …
3218 glLoadIdentity; 3690 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3693 glLoadIdentity;
3222 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3223 $self->_draw; 3702 $self->_draw;
3224} 3703}
3225 3704
3226############################################################################# 3705#############################################################################
3227 3706

Diff Legend

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