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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 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};
273
274 $_->set_invisible for $self->children;
233 275
234 delete $self->{root}; 276 delete $self->{root};
235 delete $self->{visible}; 277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
240 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
242 284
243 $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;
244} 305}
245 306
246sub hide { 307sub hide {
247 my ($self) = @_; 308 my ($self) = @_;
248 309
… …
250 311
251 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
252 if $self->{parent}; 313 if $self->{parent};
253} 314}
254 315
255sub move { 316sub move_abs {
256 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
257 318
258 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
259 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
260 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
261 322
262 $self->update; 323 $self->update;
263} 324}
264 325
265sub set_size { 326sub set_size {
266 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
267 328
268 $self->{user_w} = $w; 329 $self->{force_w} = $w;
269 $self->{user_h} = $h; 330 $self->{force_h} = $h;
270 331
271 $self->check_size; 332 $self->realloc;
272} 333}
273 334
274sub size_request { 335sub size_request {
275 require Carp; 336 require Carp;
276 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
278 339
279sub configure { 340sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
281 342
282 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
285 348
286 # use alignment to adjust x, y 349 # use alignment to adjust x, y
287 350
288 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 353 }
293 354
294 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 356 $self->{x} = $x;
296 $self->{y} = $y; 357 $self->{y} = $y;
297 $self->update; 358 $self->update;
298 } 359 }
299 360
300 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $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;
302 } 368 }
303} 369}
304 370
305sub size_allocate { 371sub size_allocate {
306 # nothing to be done 372 # nothing to be done
307} 373}
308 374
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
317} 381}
318 382
319sub set_max_size { 383sub set_max_size {
320 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
321 385
322 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
323 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
324} 390}
325 391
326sub set_tooltip { 392sub set_tooltip {
327 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
328 394
… …
380 446
381 $::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
382 unless $FOCUS; 448 unless $FOCUS;
383} 449}
384 450
385sub mouse_motion { } 451sub mouse_motion { 0 }
386sub button_up { } 452sub button_up { 0 }
387sub key_down { } 453sub key_down { 0 }
388sub key_up { } 454sub key_up { 0 }
389 455
390sub button_down { 456sub button_down {
391 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
392 458
393 $self->focus_in; 459 $self->focus_in;
394}
395 460
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
400sub 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
401 537
402sub draw { 538sub draw {
403 my ($self) = @_; 539 my ($self) = @_;
404 540
405 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);
406 552
407 glPushMatrix; 553 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 555
412 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 558 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 560 glBegin GL_QUADS;
419 glVertex $x , $y; 561 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
423 glEnd; 565 glEnd;
424 glDisable GL_BLEND; 566 glDisable GL_BLEND;
425 } 567 }
426 568
427 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 570 glPushMatrix;
429 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 574 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
436 glEnd; 578 glEnd;
437 glPopMatrix; 579 glPopMatrix;
438 #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;
439 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
440} 585}
441 586
442sub _draw { 587sub _draw {
443 my ($self) = @_; 588 my ($self) = @_;
444 589
445 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
446}
447
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506} 591}
507 592
508sub DESTROY { 593sub DESTROY {
509 my ($self) = @_; 594 my ($self) = @_;
510 595
… …
542 627
543 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
545 630
546 glEnable GL_BLEND; 631 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 633 glColor_premultiply @$color;
549 634
550 glBegin GL_QUADS; 635 glBegin GL_QUADS;
551 glVertex 0 , 0; 636 glVertex 0 , 0;
552 glVertex 0 , $h; 637 glVertex 0 , $h;
553 glVertex $w, $h; 638 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
570} 655}
571 656
572sub size_request { 657sub size_request {
573 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
574} 661}
575 662
576sub draw { } 663sub draw { }
577 664
578############################################################################# 665#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
583 670
584sub new { 671sub new {
585 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
586 673
587 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
588 675
589 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
590 children => [], 677 children => [],
591 can_events => 0, 678 can_events => 0,
592 %arg, 679 %arg,
593 ); 680 );
681
594 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
595 684
596 $self 685 $self
597} 686}
598 687
599sub add { 688sub add {
… …
607 $self->{children} = [ 696 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
610 ]; 699 ];
611 700
612 $self->check_size (1); 701 $self->realloc;
613 $self->update;
614} 702}
615 703
616sub children { 704sub children {
617 @{ $_[0]{children} } 705 @{ $_[0]{children} }
618} 706}
… …
623 delete $child->{parent}; 711 delete $child->{parent};
624 $child->hide; 712 $child->hide;
625 713
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 715
628 $self->check_size (1); 716 $self->realloc;
629 $self->update;
630} 717}
631 718
632sub clear { 719sub clear {
633 my ($self) = @_; 720 my ($self) = @_;
634 721
… …
638 for (@$children) { 725 for (@$children) {
639 delete $_->{parent}; 726 delete $_->{parent};
640 $_->hide; 727 $_->hide;
641 } 728 }
642 729
643 $self->check_size; 730 $self->realloc;
644 $self->update;
645} 731}
646 732
647sub find_widget { 733sub find_widget {
648 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
649 735
650 $x -= $self->{x}; 736 $x -= $self->{x};
651 $y -= $self->{y}; 737 $y -= $self->{y};
652 738
653 my $res; 739 my $res;
654 740
655 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
657 and return $res; 743 and return $res;
658 } 744 }
659 745
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
709 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
710} 796}
711 797
712############################################################################# 798#############################################################################
713 799
800# back-buffered drawing area
801
714package CFClient::UI::Window; 802package CFClient::UI::Window;
715 803
716our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
717 805
718use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
736 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 825 $self->update;
738} 826}
739 827
740sub _render { 828sub _render {
829 my ($self) = @_;
830
741 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
742} 832}
743 833
744sub render_child { 834sub render_child {
745 my ($self) = @_; 835 my ($self) = @_;
746 836
747 $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 {
748 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
750 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
751 $self->_render; 848 $self->_render;
752 }; 849 };
753} 850}
754 851
755sub _draw { 852sub _draw {
756 my ($self) = @_; 853 my ($self) = @_;
757 854
758 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
759 856
760 my $tex = $self->{texture} 857 my $tex = $self->{texture}
761 or return; 858 or return;
762 859
763 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
766 863
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 865
769 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
770} 867}
… …
786} 883}
787 884
788sub size_request { 885sub size_request {
789 my ($self) = @_; 886 my ($self) = @_;
790 887
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 889
793 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
794} 894}
795 895
796sub size_allocate { 896sub size_allocate {
797 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
798 898
899 my $child = $self->child;
900
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 903
802 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
803 $self->update; 905 $self->update;
804} 906}
805 907
… …
841} 943}
842 944
843sub _render { 945sub _render {
844 my ($self) = @_; 946 my ($self) = @_;
845 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
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 952
848 $self->SUPER::_render; 953 $self->SUPER::_render;
849} 954}
850 955
… …
853package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
854 959
855our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
856 961
857sub new { 962sub new {
858 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
859 966
860 my $self; 967 my $self;
861 968
862 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
863 vertical => 1, 970 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 972 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
867 }, 974 },
868 ; 975 ;
869 976
870 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 979 slider => $slider,
873 @_, 980 %arg,
874 ); 981 );
875 982
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
879 985
880 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
881} 993}
882 994
883sub update { 995sub update {
884 my ($self) = @_; 996 my ($self) = @_;
885 997
… …
924 1036
925 if ($self->{bg}) { 1037 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
927 1039
928 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
931 1043
932 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
933 glVertex 0 , 0; 1045 glVertex 0 , 0;
934 glVertex 0 , $h; 1046 glVertex 0 , $h;
935 glVertex $w, $h; 1047 glVertex $w, $h;
… …
948 1060
949our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
950 1062
951use CFClient::OpenGL; 1063use CFClient::OpenGL;
952 1064
953my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 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);
956 1072
957sub new { 1073sub new {
958 my $class = shift; 1074 my ($class, %arg) = @_;
959 1075
960 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
961 1077
962 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1081 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1082 can_events => 1,
968 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
969 ); 1086 );
970 1087
971 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
972 align => 0, 1089 align => 0,
973 valign => 1, 1090 valign => 1,
974 text => $self->{title}, 1091 text => $title,
975 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
976 1094
977 $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};
978} 1103}
979 1104
980sub border { 1105sub border {
981 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
982} 1107}
983 1108
984sub size_request { 1109sub size_request {
985 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
986 1114
987 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
988 1116
989 ( 1117 (
990 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
993} 1121}
994 1122
995sub size_allocate { 1123sub size_allocate {
996 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
997 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
998 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1000 1136
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1005} 1138}
1006 1139
1007sub button_down { 1140sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1009 1142
… …
1025 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1026 1159
1027 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1029 1162
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1167 $self->realloc;
1034 }; 1168 };
1035 1169
1036 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1174 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1042 1176
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1178
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1048 } 1187 1
1049} 1188}
1050 1189
1051sub button_up { 1190sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1053 1192
1054 delete $self->{motion}; 1193 !!delete $self->{motion}
1055} 1194}
1056 1195
1057sub mouse_motion { 1196sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1059 1198
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1061} 1202}
1062 1203
1063sub _draw { 1204sub _draw {
1064 my ($self) = @_; 1205 my ($self) = @_;
1065 1206
1207 my $child = $self->{children}[0];
1208
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1211
1069 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1214
1072 my $border = $self->border; 1215 my $border = $self->border;
1073 1216
1074 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1222
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1082 1225
1083 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1231 }
1094 1232
1095 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1096 1234
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1100} 1241}
1101 1242
1102############################################################################# 1243#############################################################################
1103 1244
1104package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1127 1268
1128 $child->set_parent ($self); 1269 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1130 1271
1131 $self->check_size (1); 1272 $self->realloc;
1132} 1273}
1133 1274
1134# 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?
1135sub clear { 1276sub clear {
1136 my ($self) = @_; 1277 my ($self) = @_;
… …
1141 for (@children) { 1282 for (@children) {
1142 delete $_->{parent}; 1283 delete $_->{parent};
1143 $_->hide; 1284 $_->hide;
1144 } 1285 }
1145 1286
1146 $self->check_size (1); 1287 $self->realloc;
1147 $self->update;
1148} 1288}
1149 1289
1150sub get_wh { 1290sub get_wh {
1151 my ($self) = @_; 1291 my ($self) = @_;
1152 1292
… …
1248 } 1388 }
1249} 1389}
1250 1390
1251############################################################################# 1391#############################################################################
1252 1392
1253package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1394
1257our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1258 1396
1259sub size_request { 1397sub size_request {
1260 my ($self) = @_; 1398 my ($self) = @_;
1261 1399
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1263 1401 ? (
1264 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1404 )
1267 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1268} 1409}
1269 1410
1270sub size_allocate { 1411sub size_allocate {
1271 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1272 1413
1273 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1415 my $children = $self->{children};
1276 1416
1277 my @h = map $_->{req_w}, @$children; 1417 my @req;
1278 1418
1279 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1280 1420 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } 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 {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1435 }
1295 } 1436 }
1296 1437
1297 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1298 1439
1299 my $y = 0; 1440 my $pos = 0;
1300 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1444
1305 $y += $h; 1445 $pos += $alloc;
1306 } 1446 }
1307 1447
1308 1 1448 1
1309} 1449}
1310 1450
1311############################################################################# 1451#############################################################################
1312 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
1313package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1314 1469
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1318 1471
1319sub size_request { 1472sub new {
1320 my ($self) = @_; 1473 my $class = shift;
1321 1474
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1323 1476 vertical => 1,
1324 ( 1477 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1478 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1479}
1368 1480
1369############################################################################# 1481#############################################################################
1370 1482
1371package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1500 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1390 fontsize => 1, 1502 fontsize => 1,
1391 align => -1, 1503 align => -1,
1392 valign => -1, 1504 valign => -1,
1393 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1394 can_events => 0, 1507 can_events => 0,
1395 %arg 1508 %arg
1396 ); 1509 );
1397 1510
1398 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1425 1538
1426 delete $self->{texture}; 1539 delete $self->{texture};
1427 $self->SUPER::update; 1540 $self->SUPER::update;
1428} 1541}
1429 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1430sub set_text { 1550sub set_text {
1431 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1432 1552
1433 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1435 1555
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1438 1559
1560 $self->realloc;
1439 $self->update; 1561 $self->update;
1440 $self->check_size;
1441} 1562}
1442 1563
1443sub set_markup { 1564sub set_markup {
1444 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1445 1566
… …
1448 1569
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1571
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1453 1575
1576 $self->realloc;
1454 $self->update; 1577 $self->update;
1455 $self->check_size;
1456} 1578}
1457 1579
1458sub size_request { 1580sub size_request {
1459 my ($self) = @_; 1581 my ($self) = @_;
1460 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 1591
1467 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1468 1593
1469 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 1597
1473 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1474 1599
1475 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1477 } 1602 }
1478 1603
1604 ($w, $h)
1479 ( 1605 }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1606}
1484 1607
1485sub size_allocate { 1608sub size_allocate {
1486 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1487 1610
1611 delete $self->{ox};
1612
1488 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1615}
1490 1616
1491sub set_fontsize { 1617sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1493 1619
1494 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1621 delete $self->{texture};
1496 1622
1497 $self->update; 1623 $self->realloc;
1498 $self->check_size;
1499} 1624}
1500 1625
1501sub _draw { 1626sub _draw {
1502 my ($self) = @_; 1627 my ($self) = @_;
1503 1628
… …
1509 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1638
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1515 1641
1642 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1519 1646
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1650 };
1526 1651
1527 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1529 1654
1655 glColor_premultiply @{$self->{fg}}
1530 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1531 glColor @{$self->{fg}}; 1657
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1533 } else {
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 }
1536 1659
1537 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1538} 1661}
1539 1662
1540############################################################################# 1663#############################################################################
… …
1567 1690
1568 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1569 1692
1570 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1571 1694
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1696 $self->{text} = $text;
1576 1697
1577 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1579 1701
1580 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1581} 1706}
1582 1707
1583sub set_text { 1708sub set_text {
1584 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1585 1710
1586 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1712 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 1713}
1591 1714
1592sub get_text { 1715sub get_text {
1593 $_[0]{text} 1716 $_[0]{text}
1594} 1717}
… …
1624 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1627 } elsif ($uni) { 1750 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1629 } 1754 }
1630 1755
1631 $self->_set_text ($text); 1756 $self->_set_text ($text);
1632 $self->update; 1757
1633 $self->check_size; 1758 $self->realloc;
1759
1760 1
1634} 1761}
1635 1762
1636sub focus_in { 1763sub focus_in {
1637 my ($self) = @_; 1764 my ($self) = @_;
1638 1765
… …
1653 utf8::encode $text; 1780 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1655 1782
1656 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1657 $self->update; 1784 $self->update;
1785
1786 1
1658} 1787}
1659 1788
1660sub mouse_motion { 1789sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1662# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1663} 1794}
1664 1795
1665sub _draw { 1796sub _draw {
1666 my ($self) = @_; 1797 my ($self) = @_;
1667 1798
1668 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1669 1800
1670 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1673 } else { 1804 } else {
1674 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1675 } 1806 }
1676 1807
1677 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1811 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1744 } else { 1875 } else {
1745 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1746 } 1877 }
1747 1878
1748 } else { 1879 } else {
1749 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1750 } 1883 1
1751
1752} 1884}
1753 1885
1754############################################################################# 1886#############################################################################
1755 1887
1756package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1765 1897
1766sub new { 1898sub new {
1767 my $class = shift; 1899 my $class = shift;
1768 1900
1769 $class->SUPER::new ( 1901 $class->SUPER::new (
1770 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1771 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1773 can_hover => 1, 1906 can_hover => 1,
1774 align => 0, 1907 align => 0,
1775 valign => 0, 1908 valign => 0,
… …
1784 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1785 1918
1786 $self->emit ("activate") 1919 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1789} 1924}
1790 1925
1791sub _draw { 1926sub _draw {
1792 my ($self) = @_; 1927 my ($self) = @_;
1793 1928
1794 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1930
1800 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1803 1934
… …
1822 1953
1823sub new { 1954sub new {
1824 my $class = shift; 1955 my $class = shift;
1825 1956
1826 $class->SUPER::new ( 1957 $class->SUPER::new (
1827 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1828 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 1964 state => 0,
… …
1836} 1968}
1837 1969
1838sub size_request { 1970sub size_request {
1839 my ($self) = @_; 1971 my ($self) = @_;
1840 1972
1841 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1842} 1974}
1843 1975
1844sub button_down { 1976sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1846 1978
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1851 } 1987 1
1852} 1988}
1853 1989
1854sub _draw { 1990sub _draw {
1855 my ($self) = @_; 1991 my ($self) = @_;
1856 1992
1857 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1858 1994
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 1996
1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1862 2000
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2002
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2004
… …
2021 2159
2022 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2024 2162
2025 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2026 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2027 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2168
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2274 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2138 vertical => 0, 2277 vertical => 0,
2139 can_hover => 1, 2278 can_hover => 1,
2140 inner_pad => 0.02, 2279 inner_pad => 0.02,
2141 @_ 2280 @_
2142 ); 2281 );
… …
2145 $self->update; 2284 $self->update;
2146 2285
2147 $self 2286 $self
2148} 2287}
2149 2288
2289sub changed { }
2290
2150sub set_range { 2291sub set_range {
2151 my ($self, $range) = @_; 2292 my ($self, $range) = @_;
2152 2293
2153 ($range, $self->{range}) = ($self->{range}, $range); 2294 ($range, $self->{range}) = ($self->{range}, $range);
2154 2295
… …
2180} 2321}
2181 2322
2182sub size_request { 2323sub size_request {
2183 my ($self) = @_; 2324 my ($self) = @_;
2184 2325
2185 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2327}
2190 2328
2191sub button_down { 2329sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2193 2331
2194 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2195 2333
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2335
2198 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2199} 2337}
2200 2338
2201sub mouse_motion { 2339sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2203 2341
… …
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2346
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2348
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2212 } 2354 1
2213} 2355}
2214 2356
2215sub update { 2357sub update {
2216 my ($self) = @_; 2358 my ($self) = @_;
2217 2359
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2219 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2220 2369
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2223 2372
… …
2229 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2231 2380
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2234 }); 2383 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2384
2242 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2243 2386
2244 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2245 2388
… …
2439 2582
2440 delete $self->{texture}; 2583 delete $self->{texture};
2441 } 2584 }
2442 2585
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2446 2589
2447 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2448 2591
2449 my $y0 = $top; 2592 my $y0 = $top;
… …
2484sub _draw { 2627sub _draw {
2485 my ($self) = @_; 2628 my ($self) = @_;
2486 2629
2487 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2491 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2492 2635
2493 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2494 2637
2495} 2638}
… …
2544 2687
2545sub new { 2688sub new {
2546 my $class = shift; 2689 my $class = shift;
2547 2690
2548 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2549 state => 0, 2692 state => 0,
2550 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2551 @_ 2694 @_
2552 ); 2695 );
2553 2696
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2697 $self
2560} 2698}
2561 2699
2562sub toggle_flopper { 2700sub toggle_flopper {
2563 my ($self) = @_; 2701 my ($self) = @_;
2564 2702
2565 # TODO: use animation 2703 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2704}
2577 2705
2578############################################################################# 2706#############################################################################
2579 2707
2580package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2593} 2721}
2594 2722
2595sub set_tooltip_from { 2723sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2597 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2598 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2738 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2740 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2615 2752
2616sub size_allocate { 2753sub size_allocate {
2617 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2618 2755
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2620} 2775}
2621 2776
2622sub _draw { 2777sub _draw {
2623 my ($self) = @_; 2778 my ($self) = @_;
2624 2779
… …
2641 glVertex $w, $h; 2796 glVertex $w, $h;
2642 glVertex $w, 0; 2797 glVertex $w, 0;
2643 glEnd; 2798 glEnd;
2644 2799
2645 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2646 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2647} 2803}
2648 2804
2649############################################################################# 2805#############################################################################
2650 2806
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 2866
2711 if ($tex) { 2867 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2717 } 2873 }
2718} 2874}
2719 2875
… …
2726 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2727} 2883}
2728 2884
2729############################################################################# 2885#############################################################################
2730 2886
2731package CFClient::UI::Inventory; 2887package CFClient::UI::Buttonbar;
2732 2888
2733our @ISA = CFClient::UI::ScrolledWindow::; 2889our @ISA = CFClient::UI::HBox::;
2734 2890
2735sub new { 2891# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2892
2776############################################################################# 2893#############################################################################
2777 2894
2778package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2779 2896
… …
2820 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 2938 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2823 2940
2824 $self->show; 2941 $self->show;
2825 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2826} 2943}
2827 2944
2828sub mouse_motion { 2945sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2830 2947
2831 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2834} 2953}
2835 2954
2836sub button_up { 2955sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2838 2957
… …
2840 undef $GRAB; 2959 undef $GRAB;
2841 $self->hide; 2960 $self->hide;
2842 2961
2843 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2845 } 2968 1
2846} 2969}
2847 2970
2848############################################################################# 2971#############################################################################
2849 2972
2850package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2851 2974
2852our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2853 2976
2854sub new { 2977sub new {
2855 my $class = shift; 2978 my $class = shift;
2856 2979
2857 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2858 fontsize => 0.8, 3089 fontsize => 0.8,
2859 @_, 3090 @_,
2860 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2861} 3098}
2862 3099
2863sub reorder { 3100sub reorder {
2864 my ($self) = @_; 3101 my ($self) = @_;
2865 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2866 3108
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3111 }
2870 3112
… …
2873 my @items = sort { 3115 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2877 3119
3120 $self->{timer}->interval (1);
3121
2878 my $count = 10 + 1; 3122 my $count = 10 + 1;
2879 for my $item (@items) { 3123 for my $item (@items) {
2880 last unless --$count; 3124 last unless --$count;
2881 3125
2882 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3130 : $item->{text};
2887 3131
… …
2895 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3145 can_events => 1,
2902 can_hover => 1 3146 can_hover => 1
2903 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2904 } 3160 }
2905 3161
2906 $self->clear; 3162 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2908} 3164}
… …
2913 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2915 3171
2916 return unless $text; 3172 return unless $text;
2917 3173
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3175
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3177
2922 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2953 3209
2954 $self->reorder; 3210 $self->reorder;
2955 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2956} 3212}
2957 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2958############################################################################# 3222#############################################################################
2959 3223
2960package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2961 3225
2962our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3227
2966sub new { 3228sub new {
2967 my $class = shift; 3229 my $class = shift;
2968 3230
2969 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
2970 visible => 1, 3531 visible => 1,
2971 @_, 3532 @_,
2972 ) 3533 );
2973}
2974 3534
2975sub configure { 3535 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3536
2978 $self->{w} = $w; 3537 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3538}
2988 3539
2989sub size_request { 3540sub size_request {
2990 my ($self) = @_; 3541 my ($self) = @_;
2991 3542
2992 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2993} 3558}
2994 3559
2995sub size_allocate { 3560sub size_allocate {
2996 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2997 3562
2998 for my $child ($self->children) { 3563 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3565
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3003 3568
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3570 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3571
3010 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
3011 } 3573 }
3012} 3574}
3013 3575
… …
3024} 3586}
3025 3587
3026sub update { 3588sub update {
3027 my ($self) = @_; 3589 my ($self) = @_;
3028 3590
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3031} 3592}
3032 3593
3033sub add { 3594sub add {
3034 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3035 3596
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3597 $_->{is_toplevel} = 1
3044 3598 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3599
3050 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3051} 3601}
3052 3602
3053sub remove { 3603sub remove {
3054 my ($self, @children) = @_; 3604 my ($self, @children) = @_;
3055 3605
3056 $self->SUPER::remove (@children); 3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3057 3610
3058 while (@children) { 3611 while (@children) {
3059 my $w = pop @children; 3612 my $w = pop @children;
3060 push @children, $w->children; 3613 push @children, $w->children;
3061 $w->set_invisible; 3614 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3081 $_->() 3634 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3083 } 3636 }
3084 3637
3085 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3086 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
3087 3642
3088 for (;;) { 3643 outer:
3089 if ($self->{check_size}) { 3644 while () {
3090 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3093 } 3653 }
3094 3654
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
3096 3657
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3659 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3107 3681
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3109 3683
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3112 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3113 } 3694 }
3114 } 3695 }
3115 3696
3116 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 3705
3120 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3122 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3123 $widget->{w} = $w; 3716 $widget->{w} = $w;
3124 $widget->{h} = $h; 3717 $widget->{h} = $h;
3718
3125 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3126 } 3721 }
3127 } 3722 }
3128 3723
3129 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3130 $_->() 3725 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3132 } 3727 }
3728
3133 3729
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3137 3733
… …
3139 glLoadIdentity; 3735 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3738 glLoadIdentity;
3143 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
3144 $self->_draw; 3747 $self->_draw;
3145} 3748}
3146 3749
3147############################################################################# 3750#############################################################################
3148 3751

Diff Legend

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