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.280 by root, Mon Jun 5 01:22:08 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} 373}
307 374
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
316} 381}
317 382
318sub set_max_size { 383sub set_max_size {
319 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
320 385
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
323} 390}
324 391
325sub set_tooltip { 392sub set_tooltip {
326 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
327 394
… …
379 446
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS; 448 unless $FOCUS;
382} 449}
383 450
384sub mouse_motion { } 451sub mouse_motion { 0 }
385sub button_up { } 452sub button_up { 0 }
386sub key_down { } 453sub key_down { 0 }
387sub key_up { } 454sub key_up { 0 }
388 455
389sub button_down { 456sub button_down {
390 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
391 458
392 $self->focus_in; 459 $self->focus_in;
393}
394 460
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
400 537
401sub draw { 538sub draw {
402 my ($self) = @_; 539 my ($self) = @_;
403 540
404 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
405 552
406 glPushMatrix; 553 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 555
411 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 558 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 560 glBegin GL_QUADS;
418 glVertex $x , $y; 561 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
422 glEnd; 565 glEnd;
423 glDisable GL_BLEND; 566 glDisable GL_BLEND;
424 } 567 }
425 568
426 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 570 glPushMatrix;
428 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 574 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
435 glEnd; 578 glEnd;
436 glPopMatrix; 579 glPopMatrix;
437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
438 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
439} 585}
440 586
441sub _draw { 587sub _draw {
442 my ($self) = @_; 588 my ($self) = @_;
443 589
444 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
445}
446
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} 591}
506 592
507sub DESTROY { 593sub DESTROY {
508 my ($self) = @_; 594 my ($self) = @_;
509 595
… …
541 627
542 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
544 630
545 glEnable GL_BLEND; 631 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 633 glColor_premultiply @$color;
548 634
549 glBegin GL_QUADS; 635 glBegin GL_QUADS;
550 glVertex 0 , 0; 636 glVertex 0 , 0;
551 glVertex 0 , $h; 637 glVertex 0 , $h;
552 glVertex $w, $h; 638 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
569} 655}
570 656
571sub size_request { 657sub size_request {
572 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
573} 661}
574 662
575sub draw { } 663sub draw { }
576 664
577############################################################################# 665#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
582 670
583sub new { 671sub new {
584 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
585 673
586 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
587 675
588 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
589 children => [], 677 children => [],
590 can_events => 0, 678 can_events => 0,
591 %arg, 679 %arg,
592 ); 680 );
681
593 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
594 684
595 $self 685 $self
596} 686}
597 687
598sub add { 688sub add {
… …
606 $self->{children} = [ 696 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
609 ]; 699 ];
610 700
611 $self->check_size (1); 701 $self->realloc;
612 $self->update;
613} 702}
614 703
615sub children { 704sub children {
616 @{ $_[0]{children} } 705 @{ $_[0]{children} }
617} 706}
… …
622 delete $child->{parent}; 711 delete $child->{parent};
623 $child->hide; 712 $child->hide;
624 713
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 715
627 $self->check_size (1); 716 $self->realloc;
628 $self->update;
629} 717}
630 718
631sub clear { 719sub clear {
632 my ($self) = @_; 720 my ($self) = @_;
633 721
… …
637 for (@$children) { 725 for (@$children) {
638 delete $_->{parent}; 726 delete $_->{parent};
639 $_->hide; 727 $_->hide;
640 } 728 }
641 729
642 $self->check_size; 730 $self->realloc;
643 $self->update;
644} 731}
645 732
646sub find_widget { 733sub find_widget {
647 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
648 735
649 $x -= $self->{x}; 736 $x -= $self->{x};
650 $y -= $self->{y}; 737 $y -= $self->{y};
651 738
652 my $res; 739 my $res;
653 740
654 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
656 and return $res; 743 and return $res;
657 } 744 }
658 745
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
708 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
709} 796}
710 797
711############################################################################# 798#############################################################################
712 799
800# back-buffered drawing area
801
713package CFClient::UI::Window; 802package CFClient::UI::Window;
714 803
715our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
716 805
717use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
735 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 825 $self->update;
737} 826}
738 827
739sub _render { 828sub _render {
829 my ($self) = @_;
830
740 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
741} 832}
742 833
743sub render_child { 834sub render_child {
744 my ($self) = @_; 835 my ($self) = @_;
745 836
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
749 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
750 $self->_render; 848 $self->_render;
751 }; 849 };
752} 850}
753 851
754sub _draw { 852sub _draw {
755 my ($self) = @_; 853 my ($self) = @_;
756 854
757 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
758 856
759 my $tex = $self->{texture} 857 my $tex = $self->{texture}
760 or return; 858 or return;
761 859
762 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
765 863
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 865
768 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
769} 867}
… …
785} 883}
786 884
787sub size_request { 885sub size_request {
788 my ($self) = @_; 886 my ($self) = @_;
789 887
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 889
792 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
793} 894}
794 895
795sub size_allocate { 896sub size_allocate {
796 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
797 898
899 my $child = $self->child;
900
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 903
801 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
802 $self->update; 905 $self->update;
803} 906}
804 907
… …
840} 943}
841 944
842sub _render { 945sub _render {
843 my ($self) = @_; 946 my ($self) = @_;
844 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 952
847 $self->SUPER::_render; 953 $self->SUPER::_render;
848} 954}
849 955
… …
852package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
853 959
854our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
855 961
856sub new { 962sub new {
857 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
858 966
859 my $self; 967 my $self;
860 968
861 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
862 vertical => 1, 970 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 972 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
866 }, 974 },
867 ; 975 ;
868 976
869 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 979 slider => $slider,
872 @_, 980 %arg,
873 ); 981 );
874 982
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
878 985
879 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
880} 993}
881 994
882sub update { 995sub update {
883 my ($self) = @_; 996 my ($self) = @_;
884 997
… …
923 1036
924 if ($self->{bg}) { 1037 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
926 1039
927 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
930 1043
931 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
932 glVertex 0 , 0; 1045 glVertex 0 , 0;
933 glVertex 0 , $h; 1046 glVertex 0 , $h;
934 glVertex $w, $h; 1047 glVertex $w, $h;
… …
947 1060
948our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
949 1062
950use CFClient::OpenGL; 1063use CFClient::OpenGL;
951 1064
952my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 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); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1072
956sub new { 1073sub new {
957 my $class = shift; 1074 my ($class, %arg) = @_;
958 1075
959 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
960 1077
961 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1081 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1082 can_events => 1,
967 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
968 ); 1086 );
969 1087
970 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
971 align => 0, 1089 align => 0,
972 valign => 1, 1090 valign => 1,
973 text => $self->{title}, 1091 text => $title,
974 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
975 1094
976 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
977} 1103}
978 1104
979sub border { 1105sub border {
980 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
981} 1107}
982 1108
983sub size_request { 1109sub size_request {
984 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
985 1114
986 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
987 1116
988 ( 1117 (
989 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
992} 1121}
993 1122
994sub size_allocate { 1123sub size_allocate {
995 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
996 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
997 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
999 1136
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); 1137 $self->child->configure ($border, $border, $w, $h);
1004} 1138}
1005 1139
1006sub button_down { 1140sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1008 1142
… …
1024 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1025 1159
1026 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1028 1162
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1167 $self->realloc;
1033 }; 1168 };
1034 1169
1035 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1174 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1041 1176
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1178
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1047 } 1187 1
1048} 1188}
1049 1189
1050sub button_up { 1190sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1052 1192
1053 delete $self->{motion}; 1193 !!delete $self->{motion}
1054} 1194}
1055 1195
1056sub mouse_motion { 1196sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1058 1198
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1060} 1202}
1061 1203
1062sub _draw { 1204sub _draw {
1063 my ($self) = @_; 1205 my ($self) = @_;
1064 1206
1207 my $child = $self->{children}[0];
1208
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1211
1068 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1214
1071 my $border = $self->border; 1215 my $border = $self->border;
1072 1216
1073 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1222
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1081 1225
1082 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1229 $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); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1231 }
1093 1232
1094 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1095 1234
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1099} 1241}
1100 1242
1101############################################################################# 1243#############################################################################
1102 1244
1103package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1126 1268
1127 $child->set_parent ($self); 1269 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1129 1271
1130 $self->check_size (1); 1272 $self->realloc;
1131} 1273}
1132 1274
1133# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1276sub clear {
1135 my ($self) = @_; 1277 my ($self) = @_;
… …
1140 for (@children) { 1282 for (@children) {
1141 delete $_->{parent}; 1283 delete $_->{parent};
1142 $_->hide; 1284 $_->hide;
1143 } 1285 }
1144 1286
1145 $self->check_size (1); 1287 $self->realloc;
1146 $self->update;
1147} 1288}
1148 1289
1149sub get_wh { 1290sub get_wh {
1150 my ($self) = @_; 1291 my ($self) = @_;
1151 1292
… …
1247 } 1388 }
1248} 1389}
1249 1390
1250############################################################################# 1391#############################################################################
1251 1392
1252package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1394
1256our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1257 1396
1258sub size_request { 1397sub size_request {
1259 my ($self) = @_; 1398 my ($self) = @_;
1260 1399
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1262 1401 ? (
1263 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1404 )
1266 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1267} 1409}
1268 1410
1269sub size_allocate { 1411sub size_allocate {
1270 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1271 1413
1272 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1415 my $children = $self->{children};
1275 1416
1276 my @h = map $_->{req_w}, @$children; 1417 my @req;
1277 1418
1278 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1279 1420 @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 { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1434 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 } 1435 }
1294 } 1436 }
1295 1437
1296 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1297 1439
1298 my $y = 0; 1440 my $pos = 0;
1299 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1444
1304 $y += $h; 1445 $pos += $alloc;
1305 } 1446 }
1306 1447
1307 1 1448 1
1308} 1449}
1309 1450
1310############################################################################# 1451#############################################################################
1311 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1312package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1313 1469
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1317 1471
1318sub size_request { 1472sub new {
1319 my ($self) = @_; 1473 my $class = shift;
1320 1474
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1322 1476 vertical => 1,
1323 ( 1477 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1478 )
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} 1479}
1367 1480
1368############################################################################# 1481#############################################################################
1369 1482
1370package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1500 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1389 fontsize => 1, 1502 fontsize => 1,
1390 align => -1, 1503 align => -1,
1391 valign => -1, 1504 valign => -1,
1392 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1393 can_events => 0, 1507 can_events => 0,
1394 %arg 1508 %arg
1395 ); 1509 );
1396 1510
1397 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1433 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1434 1548
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1437 1551
1552 $self->realloc;
1438 $self->update; 1553 $self->update;
1439 $self->check_size;
1440} 1554}
1441 1555
1442sub set_markup { 1556sub set_markup {
1443 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1444 1558
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1563
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1452 1566
1567 $self->realloc;
1453 $self->update; 1568 $self->update;
1454 $self->check_size;
1455} 1569}
1456 1570
1457sub size_request { 1571sub size_request {
1458 my ($self) = @_; 1572 my ($self) = @_;
1459 1573
… …
1473 1587
1474 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1476 } 1590 }
1477 1591
1478 ( 1592 ($w, $h)
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1593}
1483 1594
1484sub size_allocate { 1595sub size_allocate {
1485 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1486 1597
1598 delete $self->{ox};
1599
1487 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1602}
1489 1603
1490sub set_fontsize { 1604sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1492 1606
1493 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1608 delete $self->{texture};
1495 1609
1496 $self->update; 1610 $self->realloc;
1497 $self->check_size;
1498} 1611}
1499 1612
1500sub _draw { 1613sub _draw {
1501 my ($self) = @_; 1614 my ($self) = @_;
1502 1615
… …
1508 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1625
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1514 1628
1629 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1518 1633
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1637 };
1525 1638
1526 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 1641
1642 glColor_premultiply @{$self->{fg}}
1529 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1530 glColor @{$self->{fg}}; 1644
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 }
1535 1646
1536 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1537} 1648}
1538 1649
1539############################################################################# 1650#############################################################################
… …
1566 1677
1567 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1568 1679
1569 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1570 1681
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1683 $self->{text} = $text;
1575 1684
1576 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1578 1687
1579 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1580} 1690}
1581 1691
1582sub set_text { 1692sub set_text {
1583 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1584 1694
1585 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1696 $self->_set_text ($text);
1587 $self->update; 1697
1588 $self->check_size; 1698 $self->realloc;
1589} 1699}
1590 1700
1591sub get_text { 1701sub get_text {
1592 $_[0]{text} 1702 $_[0]{text}
1593} 1703}
… …
1623 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1626 } elsif ($uni) { 1736 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1628 } 1740 }
1629 1741
1630 $self->_set_text ($text); 1742 $self->_set_text ($text);
1631 $self->update; 1743
1632 $self->check_size; 1744 $self->realloc;
1745
1746 1
1633} 1747}
1634 1748
1635sub focus_in { 1749sub focus_in {
1636 my ($self) = @_; 1750 my ($self) = @_;
1637 1751
… …
1652 utf8::encode $text; 1766 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1654 1768
1655 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1656 $self->update; 1770 $self->update;
1771
1772 1
1657} 1773}
1658 1774
1659sub mouse_motion { 1775sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1662} 1780}
1663 1781
1664sub _draw { 1782sub _draw {
1665 my ($self) = @_; 1783 my ($self) = @_;
1666 1784
1667 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1668 1786
1669 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1672 } else { 1790 } else {
1673 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1674 } 1792 }
1675 1793
1676 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1797 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1743 } else { 1861 } else {
1744 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1745 } 1863 }
1746 1864
1747 } else { 1865 } else {
1748 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1749 } 1869 1
1750
1751} 1870}
1752 1871
1753############################################################################# 1872#############################################################################
1754 1873
1755package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1764 1883
1765sub new { 1884sub new {
1766 my $class = shift; 1885 my $class = shift;
1767 1886
1768 $class->SUPER::new ( 1887 $class->SUPER::new (
1769 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1770 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1772 can_hover => 1, 1892 can_hover => 1,
1773 align => 0, 1893 align => 0,
1774 valign => 0, 1894 valign => 0,
… …
1783 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1784 1904
1785 $self->emit ("activate") 1905 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1788} 1910}
1789 1911
1790sub _draw { 1912sub _draw {
1791 my ($self) = @_; 1913 my ($self) = @_;
1792 1914
1793 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1916
1799 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1802 1920
… …
1821 1939
1822sub new { 1940sub new {
1823 my $class = shift; 1941 my $class = shift;
1824 1942
1825 $class->SUPER::new ( 1943 $class->SUPER::new (
1826 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1827 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1950 state => 0,
… …
1835} 1954}
1836 1955
1837sub size_request { 1956sub size_request {
1838 my ($self) = @_; 1957 my ($self) = @_;
1839 1958
1840 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1841} 1960}
1842 1961
1843sub button_down { 1962sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1845 1964
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1850 } 1973 1
1851} 1974}
1852 1975
1853sub _draw { 1976sub _draw {
1854 my ($self) = @_; 1977 my ($self) = @_;
1855 1978
1856 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1857 1980
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1982
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 1986
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 1988
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 1990
… …
2020 2145
2021 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2023 2148
2024 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2025 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2026 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2154
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2130 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2137 vertical => 0, 2263 vertical => 0,
2138 can_hover => 1, 2264 can_hover => 1,
2139 inner_pad => 0.02, 2265 inner_pad => 0.02,
2140 @_ 2266 @_
2141 ); 2267 );
… …
2144 $self->update; 2270 $self->update;
2145 2271
2146 $self 2272 $self
2147} 2273}
2148 2274
2275sub changed { }
2276
2149sub set_range { 2277sub set_range {
2150 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2151 2279
2152 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2153 2281
… …
2179} 2307}
2180 2308
2181sub size_request { 2309sub size_request {
2182 my ($self) = @_; 2310 my ($self) = @_;
2183 2311
2184 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2313}
2189 2314
2190sub button_down { 2315sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2192 2317
2193 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2194 2319
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2321
2197 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2198} 2323}
2199 2324
2200sub mouse_motion { 2325sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2202 2327
… …
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2332
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2334
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2211 } 2340 1
2212} 2341}
2213 2342
2214sub update { 2343sub update {
2215 my ($self) = @_; 2344 my ($self) = @_;
2216 2345
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2218 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2219 2355
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2222 2358
… …
2228 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2230 2366
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2233 }); 2369 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2370
2241 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2242 2372
2243 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2244 2374
… …
2438 2568
2439 delete $self->{texture}; 2569 delete $self->{texture};
2440 } 2570 }
2441 2571
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2445 2575
2446 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2447 2577
2448 my $y0 = $top; 2578 my $y0 = $top;
… …
2483sub _draw { 2613sub _draw {
2484 my ($self) = @_; 2614 my ($self) = @_;
2485 2615
2486 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2490 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2491 2621
2492 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2493 2623
2494} 2624}
… …
2543 2673
2544sub new { 2674sub new {
2545 my $class = shift; 2675 my $class = shift;
2546 2676
2547 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2548 state => 0, 2678 state => 0,
2549 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2550 @_ 2680 @_
2551 ); 2681 );
2552 2682
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2683 $self
2559} 2684}
2560 2685
2561sub toggle_flopper { 2686sub toggle_flopper {
2562 my ($self) = @_; 2687 my ($self) = @_;
2563 2688
2564 # TODO: use animation 2689 $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} 2690}
2576 2691
2577############################################################################# 2692#############################################################################
2578 2693
2579package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2592} 2707}
2593 2708
2594sub set_tooltip_from { 2709sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2596 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2597 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2724 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2726 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2738
2615sub size_allocate { 2739sub size_allocate {
2616 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2617 2741
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2619} 2761}
2620 2762
2621sub _draw { 2763sub _draw {
2622 my ($self) = @_; 2764 my ($self) = @_;
2623 2765
… …
2640 glVertex $w, $h; 2782 glVertex $w, $h;
2641 glVertex $w, 0; 2783 glVertex $w, 0;
2642 glEnd; 2784 glEnd;
2643 2785
2644 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2645 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2646} 2789}
2647 2790
2648############################################################################# 2791#############################################################################
2649 2792
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 2852
2710 if ($tex) { 2853 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2716 } 2859 }
2717} 2860}
2718 2861
… …
2725 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2726} 2869}
2727 2870
2728############################################################################# 2871#############################################################################
2729 2872
2730package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2731 2874
2732our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2733 2876
2734sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
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 2878
2775############################################################################# 2879#############################################################################
2776 2880
2777package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2778 2882
… …
2819 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2924 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2822 2926
2823 $self->show; 2927 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2929}
2826 2930
2827sub mouse_motion { 2931sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2829 2933
2830 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2833} 2939}
2834 2940
2835sub button_up { 2941sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2837 2943
… …
2839 undef $GRAB; 2945 undef $GRAB;
2840 $self->hide; 2946 $self->hide;
2841 2947
2842 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2844 } 2954 1
2845} 2955}
2846 2956
2847############################################################################# 2957#############################################################################
2848 2958
2849package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2850 2960
2851our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2852 2962
2853sub new { 2963sub new {
2854 my $class = shift; 2964 my $class = shift;
2855 2965
2856 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2857 fontsize => 0.8, 3075 fontsize => 0.8,
2858 @_, 3076 @_,
2859 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2860} 3087}
2861 3088
2862sub reorder { 3089sub reorder {
2863 my ($self) = @_; 3090 my ($self) = @_;
2864 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2865 3092
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3095 }
2869 3096
… …
2871 3098
2872 my @items = sort { 3099 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2876 3105
2877 my $count = 10 + 1; 3106 my $count = 10 + 1;
2878 for my $item (@items) { 3107 for my $item (@items) {
2879 last unless --$count; 3108 last unless --$count;
2880 3109
… …
2895 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2900 can_events => 1, 3130 can_events => 1,
2901 can_hover => 1 3131 can_hover => 1
2902 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2903 } 3143 }
2904 3144
2905 $self->clear; 3145 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2907} 3147}
… …
2912 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2914 3154
2915 return unless $text; 3155 return unless $text;
2916 3156
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3158
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3160
2921 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2952 3192
2953 $self->reorder; 3193 $self->reorder;
2954 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2955} 3195}
2956 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2957############################################################################# 3205#############################################################################
2958 3206
2959package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2960 3208
2961our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3210
2965sub new { 3211sub new {
2966 my $class = shift; 3212 my $class = shift;
2967 3213
2968 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
2969 @_, 3456 @_,
2970 ) 3457 )
2971} 3458}
2972 3459
2973sub configure { 3460# XXX: Do sorting? Argl...
2974 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2980sub check_size {
2981 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
2982 3464
2983 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2984 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2985} 3521}
2986 3522
2987sub size_request { 3523sub size_request {
2988 my ($self) = @_; 3524 my ($self) = @_;
2989 3525
2990 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
2991} 3541}
2992 3542
2993sub size_allocate { 3543sub size_allocate {
2994 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2995 3545
2996 for my $child ($self->children) { 3546 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3548
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3001 3551
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3553 $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 3554
3008 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3009 } 3556 }
3010} 3557}
3011 3558
… …
3022} 3569}
3023 3570
3024sub update { 3571sub update {
3025 my ($self) = @_; 3572 my ($self) = @_;
3026 3573
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3029} 3575}
3030 3576
3031sub add { 3577sub add {
3032 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3033 3579
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; 3580 $_->{is_toplevel} = 1
3042 3581 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3582
3048 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3049} 3584}
3050 3585
3051sub remove { 3586sub remove {
3052 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3053 3588
3054 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3055 3593
3056 while (@children) { 3594 while (@children) {
3057 my $w = pop @children; 3595 my $w = pop @children;
3058 push @children, $w->children; 3596 push @children, $w->children;
3059 $w->set_invisible; 3597 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3079 $_->() 3617 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3081 } 3619 }
3082 3620
3083 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3084 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3085 3625
3086 for (;;) { 3626 outer:
3087 if ($self->{check_size}) { 3627 while () {
3088 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3091 } 3636 }
3092 3637
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3094 3640
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3642 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 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3105 3664
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3107 3666
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3110 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3111 } 3677 }
3112 } 3678 }
3113 3679
3114 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3688
3118 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3120 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3121 $widget->{w} = $w; 3699 $widget->{w} = $w;
3122 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3123 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3124 } 3704 }
3125 } 3705 }
3126 3706
3127 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3128 $_->() 3708 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3130 } 3710 }
3711
3131 3712
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3135 3716
… …
3137 glLoadIdentity; 3718 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3721 glLoadIdentity;
3141 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3142 $self->_draw; 3730 $self->_draw;
3143} 3731}
3144 3732
3145############################################################################# 3733#############################################################################
3146 3734

Diff Legend

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