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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
321 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;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
326 399
327 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
328 401
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
373 446
374 $::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
375 unless $FOCUS; 448 unless $FOCUS;
376} 449}
377 450
378sub mouse_motion { } 451sub mouse_motion { 0 }
379sub button_up { } 452sub button_up { 0 }
380sub key_down { } 453sub key_down { 0 }
381sub key_up { } 454sub key_up { 0 }
382 455
383sub button_down { 456sub button_down {
384 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
385 458
386 $self->focus_in; 459 $self->focus_in;
387}
388 460
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
393sub 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
394 537
395sub draw { 538sub draw {
396 my ($self) = @_; 539 my ($self) = @_;
397 540
398 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);
399 552
400 glPushMatrix; 553 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw;
403 glPopMatrix;
404 555
405 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
406 my ($x, $y) = @$self{qw(x y)};
407
408 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
409 glEnable GL_BLEND; 558 glEnable GL_BLEND;
410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
411 glBegin GL_QUADS; 560 glBegin GL_QUADS;
412 glVertex $x , $y;
413 glVertex $x + $self->{w}, $y;
414 glVertex $x + $self->{w}, $y + $self->{h};
415 glVertex $x , $y + $self->{h};
416 glEnd;
417 glDisable GL_BLEND;
418 }
419
420 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix;
422 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 561 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
427 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
428 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
429 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
430 glPopMatrix; 579 glPopMatrix;
431 #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;
432 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
433} 585}
434 586
435sub _draw { 587sub _draw {
436 my ($self) = @_; 588 my ($self) = @_;
437 589
438 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 591}
497 592
498sub DESTROY { 593sub DESTROY {
499 my ($self) = @_; 594 my ($self) = @_;
500 595
… …
532 627
533 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
534 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
535 630
536 glEnable GL_BLEND; 631 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glColor @$color; 633 glColor_premultiply @$color;
539 634
540 glBegin GL_QUADS; 635 glBegin GL_QUADS;
541 glVertex 0 , 0; 636 glVertex 0 , 0;
542 glVertex 0 , $h; 637 glVertex 0 , $h;
543 glVertex $w, $h; 638 glVertex $w, $h;
… …
558 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
560} 655}
561 656
562sub size_request { 657sub size_request {
563 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
564} 661}
565 662
566sub draw { } 663sub draw { }
567 664
568############################################################################# 665#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
573 670
574sub new { 671sub new {
575 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
576 673
577 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
578 675
579 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
580 children => [], 677 children => [],
581 can_events => 0, 678 can_events => 0,
582 %arg, 679 %arg,
583 ); 680 );
681
584 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
585 684
586 $self 685 $self
587} 686}
588 687
589sub add { 688sub add {
… …
597 $self->{children} = [ 696 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
600 ]; 699 ];
601 700
602 $self->check_size (1); 701 $self->realloc;
603 $self->update;
604} 702}
605 703
606sub children { 704sub children {
607 @{ $_[0]{children} } 705 @{ $_[0]{children} }
608} 706}
… …
613 delete $child->{parent}; 711 delete $child->{parent};
614 $child->hide; 712 $child->hide;
615 713
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 715
618 $self->check_size; 716 $self->realloc;
619 $self->update;
620} 717}
621 718
622sub clear { 719sub clear {
623 my ($self) = @_; 720 my ($self) = @_;
624 721
… …
628 for (@$children) { 725 for (@$children) {
629 delete $_->{parent}; 726 delete $_->{parent};
630 $_->hide; 727 $_->hide;
631 } 728 }
632 729
633 $self->check_size; 730 $self->realloc;
634 $self->update;
635} 731}
636 732
637sub find_widget { 733sub find_widget {
638 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
639 735
640 $x -= $self->{x}; 736 $x -= $self->{x};
641 $y -= $self->{y}; 737 $y -= $self->{y};
642 738
643 my $res; 739 my $res;
644 740
645 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
647 and return $res; 743 and return $res;
648 } 744 }
649 745
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
699 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
700} 796}
701 797
702############################################################################# 798#############################################################################
703 799
800# back-buffered drawing area
801
704package CFClient::UI::Window; 802package CFClient::UI::Window;
705 803
706our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
707 805
708use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
726 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 825 $self->update;
728} 826}
729 827
730sub _render { 828sub _render {
829 my ($self) = @_;
830
731 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
732} 832}
733 833
734sub render_child { 834sub render_child {
735 my ($self) = @_; 835 my ($self) = @_;
736 836
737 $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 {
738 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
740 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
741 $self->_render; 848 $self->_render;
742 }; 849 };
743} 850}
744 851
745sub _draw { 852sub _draw {
746 my ($self) = @_; 853 my ($self) = @_;
747 854
748 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
749 856
750 my $tex = $self->{texture} 857 my $tex = $self->{texture}
751 or return; 858 or return;
752 859
753 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
755 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
756 863
757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
758 865
759 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
760} 867}
… …
763 870
764package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
765 872
766our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
767 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
768sub size_request { 885sub size_request {
769 my ($self) = @_; 886 my ($self) = @_;
770 887
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 889
773 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
774} 894}
775 895
776sub size_allocate { 896sub size_allocate {
777 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
778 898
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
780# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
781 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
782 $self->update; 905 $self->update;
783} 906}
784 907
785sub set_offset { 908sub set_offset {
786 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
820} 943}
821 944
822sub _render { 945sub _render {
823 my ($self) = @_; 946 my ($self) = @_;
824 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
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 952
827 $self->SUPER::_render; 953 $self->SUPER::_render;
828} 954}
829 955
… …
832package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
833 959
834our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
835 961
836sub new { 962sub new {
837 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
838 966
839 my $self; 967 my $self;
840 968
841 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
842 vertical => 1, 970 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 972 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
846 }, 974 },
847 ; 975 ;
848 976
849 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 979 slider => $slider,
852 @_, 980 %arg,
853 ); 981 );
854 982
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
858 985
859 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 1003}
861 1004
862sub size_allocate { 1005sub size_allocate {
863 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
864 1007
… …
893 1036
894 if ($self->{bg}) { 1037 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
896 1039
897 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
899 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
900 1043
901 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
902 glVertex 0 , 0; 1045 glVertex 0 , 0;
903 glVertex 0 , $h; 1046 glVertex 0 , $h;
904 glVertex $w, $h; 1047 glVertex $w, $h;
… …
917 1060
918our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
919 1062
920use CFClient::OpenGL; 1063use CFClient::OpenGL;
921 1064
922my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1072
926sub new { 1073sub new {
927 my $class = shift; 1074 my ($class, %arg) = @_;
928 1075
929 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
930 1077
931 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1081 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1082 can_events => 1,
937 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
938 ); 1086 );
939 1087
940 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
941 align => 0, 1089 align => 0,
942 valign => 1, 1090 valign => 1,
943 text => $self->{title}, 1091 text => $title,
944 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
945 1094
946 $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};
947} 1103}
948 1104
949sub border { 1105sub border {
950 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
951} 1107}
952 1108
953sub size_request { 1109sub size_request {
954 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
955 1114
956 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
957 1116
958 ( 1117 (
959 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
962} 1121}
963 1122
964sub size_allocate { 1123sub size_allocate {
965 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
966 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
967 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
969 1136
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
974} 1138}
975 1139
976sub button_down { 1140sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
978 1142
… …
994 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
995 1159
996 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
998 1162
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1167 $self->realloc;
1003 }; 1168 };
1004 1169
1005 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1174 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1011 1176
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1178
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1017 } 1187 1
1018} 1188}
1019 1189
1020sub button_up { 1190sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1022 1192
1023 delete $self->{motion}; 1193 !!delete $self->{motion}
1024} 1194}
1025 1195
1026sub mouse_motion { 1196sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1028 1198
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1030} 1202}
1031 1203
1032sub _draw { 1204sub _draw {
1033 my ($self) = @_; 1205 my ($self) = @_;
1034 1206
1207 my $child = $self->{children}[0];
1208
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1211
1038 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1214
1041 my $border = $self->border; 1215 my $border = $self->border;
1042 1216
1043 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1222
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1051 1225
1052 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1231 }
1063 1232
1064 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1065 1234
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1069} 1241}
1070 1242
1071############################################################################# 1243#############################################################################
1072 1244
1073package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1081sub new { 1253sub new {
1082 my $class = shift; 1254 my $class = shift;
1083 1255
1084 $class->SUPER::new ( 1256 $class->SUPER::new (
1085 col_expand => [], 1257 col_expand => [],
1086 @_ 1258 @_,
1087 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1264}
1089 1265
1090sub add { 1266sub add {
1091 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1092 1268
1093 $child->set_parent ($self); 1269 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1095 1271
1096 $child->check_size; 1272 $self->realloc;
1097} 1273}
1098 1274
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1276sub clear {
1105 my ($self) = @_; 1277 my ($self) = @_;
1106 1278
1107 my @children = $self->children; 1279 my @children = $self->children;
1108 delete $self->{children}; 1280 delete $self->{children};
… …
1110 for (@children) { 1282 for (@children) {
1111 delete $_->{parent}; 1283 delete $_->{parent};
1112 $_->hide; 1284 $_->hide;
1113 } 1285 }
1114 1286
1115 $self->update; 1287 $self->realloc;
1116} 1288}
1117 1289
1118sub get_wh { 1290sub get_wh {
1119 my ($self) = @_; 1291 my ($self) = @_;
1120 1292
… …
1151sub size_allocate { 1323sub size_allocate {
1152 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1153 1325
1154 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1155 1327
1156 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1158 1330
1159 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1388 }
1217} 1389}
1218 1390
1219############################################################################# 1391#############################################################################
1220 1392
1221package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1394
1225our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1226 1396
1227sub size_request { 1397sub size_request {
1228 my ($self) = @_; 1398 my ($self) = @_;
1229 1399
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1231 1401 ? (
1232 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1404 )
1235 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1236} 1409}
1237 1410
1238sub size_allocate { 1411sub size_allocate {
1239 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1240 1413
1241 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1415 my $children = $self->{children};
1244 1416
1245 my @h = map $_->{req_w}, @$children; 1417 my @req;
1246 1418
1247 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1248 1420 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else { 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 {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1435 }
1263 } 1436 }
1264 1437
1265 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1266 1439
1267 my $y = 0; 1440 my $pos = 0;
1268 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1444
1273 $y += $h; 1445 $pos += $alloc;
1274 } 1446 }
1275 1447
1276 1 1448 1
1277} 1449}
1278 1450
1279############################################################################# 1451#############################################################################
1280 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
1281package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1282 1469
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1286 1471
1287sub size_request { 1472sub new {
1288 my ($self) = @_; 1473 my $class = shift;
1289 1474
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1291 1476 vertical => 1,
1292 ( 1477 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1478 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1479}
1336 1480
1337############################################################################# 1481#############################################################################
1338 1482
1339package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1500 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1358 fontsize => 1, 1502 fontsize => 1,
1359 align => -1, 1503 align => -1,
1360 valign => -1, 1504 valign => -1,
1361 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1362 can_events => 0, 1507 can_events => 0,
1363 %arg 1508 %arg
1364 ); 1509 );
1365 1510
1366 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1403 1548
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1406 1551
1552 $self->realloc;
1407 $self->update; 1553 $self->update;
1408 $self->check_size;
1409} 1554}
1410 1555
1411sub set_markup { 1556sub set_markup {
1412 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1413 1558
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1563
1419 $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;
1420 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1421 1566
1567 $self->realloc;
1422 $self->update; 1568 $self->update;
1423 $self->check_size;
1424} 1569}
1425 1570
1426sub size_request { 1571sub size_request {
1427 my ($self) = @_; 1572 my ($self) = @_;
1428 1573
… …
1442 1587
1443 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1445 } 1590 }
1446 1591
1447 ( 1592 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1593}
1452 1594
1453sub size_allocate { 1595sub size_allocate {
1454 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1455 1597
1598 delete $self->{ox};
1599
1456 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1602}
1458 1603
1459sub set_fontsize { 1604sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1461 1606
1462 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1608 delete $self->{texture};
1464 1609
1465 $self->update; 1610 $self->realloc;
1466 $self->check_size;
1467} 1611}
1468 1612
1469sub _draw { 1613sub _draw {
1470 my ($self) = @_; 1614 my ($self) = @_;
1471 1615
… …
1477 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1625
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1483 1628
1629 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1487 1633
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1637 };
1494 1638
1495 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1641
1642 glColor_premultiply @{$self->{fg}}
1498 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1499 glColor @{$self->{fg}}; 1644
1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1504 1646
1505 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1506} 1648}
1507 1649
1508############################################################################# 1650#############################################################################
… …
1535 1677
1536 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1537 1679
1538 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1539 1681
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1683 $self->{text} = $text;
1544 1684
1545 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1547 1687
1548 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1549} 1690}
1550 1691
1551sub set_text { 1692sub set_text {
1552 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1553 1694
1554 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1696 $self->_set_text ($text);
1556 $self->update; 1697
1557 $self->check_size; 1698 $self->realloc;
1558} 1699}
1559 1700
1560sub get_text { 1701sub get_text {
1561 $_[0]{text} 1702 $_[0]{text}
1562} 1703}
… …
1592 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1595 } elsif ($uni) { 1736 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1597 } 1740 }
1598 1741
1599 $self->_set_text ($text); 1742 $self->_set_text ($text);
1600 $self->update; 1743
1601 $self->check_size; 1744 $self->realloc;
1745
1746 1
1602} 1747}
1603 1748
1604sub focus_in { 1749sub focus_in {
1605 my ($self) = @_; 1750 my ($self) = @_;
1606 1751
… …
1621 utf8::encode $text; 1766 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1623 1768
1624 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1625 $self->update; 1770 $self->update;
1771
1772 1
1626} 1773}
1627 1774
1628sub mouse_motion { 1775sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1630# 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
1631} 1780}
1632 1781
1633sub _draw { 1782sub _draw {
1634 my ($self) = @_; 1783 my ($self) = @_;
1635 1784
1636 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1637 1786
1638 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1639 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1640 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1641 } else { 1790 } else {
1642 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1643 } 1792 }
1644 1793
1645 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1647 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1648 glVertex 0 , 0; 1797 glVertex 0 , 0;
1649 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1650 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1651 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1712 } else { 1861 } else {
1713 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1714 } 1863 }
1715 1864
1716 } else { 1865 } else {
1717 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1718 } 1869 1
1719
1720} 1870}
1721 1871
1722############################################################################# 1872#############################################################################
1723 1873
1724package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1733 1883
1734sub new { 1884sub new {
1735 my $class = shift; 1885 my $class = shift;
1736 1886
1737 $class->SUPER::new ( 1887 $class->SUPER::new (
1738 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1739 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1741 can_hover => 1, 1892 can_hover => 1,
1742 align => 0, 1893 align => 0,
1743 valign => 0, 1894 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1753 1904
1754 $self->emit ("activate") 1905 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1757} 1910}
1758 1911
1759sub _draw { 1912sub _draw {
1760 my ($self) = @_; 1913 my ($self) = @_;
1761 1914
1762 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1763
1764 if ($GRAB == $self) {
1765 $self->{fg} = $self->{active_fg};
1766 }
1767 1916
1768 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1771 1920
… …
1790 1939
1791sub new { 1940sub new {
1792 my $class = shift; 1941 my $class = shift;
1793 1942
1794 $class->SUPER::new ( 1943 $class->SUPER::new (
1795 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1796 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1950 state => 0,
… …
1804} 1954}
1805 1955
1806sub size_request { 1956sub size_request {
1807 my ($self) = @_; 1957 my ($self) = @_;
1808 1958
1809 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1810} 1960}
1811 1961
1812sub button_down { 1962sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1814 1964
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1819 } 1973 1
1820} 1974}
1821 1975
1822sub _draw { 1976sub _draw {
1823 my ($self) = @_; 1977 my ($self) = @_;
1824 1978
1825 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1826 1980
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1982
1829 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;
1830 1986
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1988
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1990
… …
1989 2145
1990 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1991 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1992 2148
1993 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1994 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;
1995 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 2154
1998 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1999 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2099 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2106 vertical => 0, 2263 vertical => 0,
2107 can_hover => 1, 2264 can_hover => 1,
2108 inner_pad => 0.02, 2265 inner_pad => 0.02,
2109 @_ 2266 @_
2110 ); 2267 );
… …
2113 $self->update; 2270 $self->update;
2114 2271
2115 $self 2272 $self
2116} 2273}
2117 2274
2275sub changed { }
2276
2118sub set_range { 2277sub set_range {
2119 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2120 2279
2121 $self->{range} = $range; 2280 ($range, $self->{range}) = ($self->{range}, $range);
2122 2281
2123 $self->update; 2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2124} 2284}
2125 2285
2126sub set_value { 2286sub set_value {
2127 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2128 2288
… …
2147} 2307}
2148 2308
2149sub size_request { 2309sub size_request {
2150 my ($self) = @_; 2310 my ($self) = @_;
2151 2311
2152 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2313}
2157 2314
2158sub button_down { 2315sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2160 2317
2161 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2162 2319
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2321
2165 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2166} 2323}
2167 2324
2168sub mouse_motion { 2325sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2170 2327
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2332
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2334
2178 $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
2179 } 2340 1
2180} 2341}
2181 2342
2182sub update { 2343sub update {
2183 my ($self) = @_; 2344 my ($self) = @_;
2184 2345
2185 $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}) {
2186 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2187 2355
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2190 2358
… …
2196 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2198 2366
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2201 }); 2369 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2370
2209 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2210 2372
2211 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2212 2374
… …
2406 2568
2407 delete $self->{texture}; 2569 delete $self->{texture};
2408 } 2570 }
2409 2571
2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2411 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2412 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2413 2575
2414 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2415 2577
2416 my $y0 = $top; 2578 my $y0 = $top;
… …
2451sub _draw { 2613sub _draw {
2452 my ($self) = @_; 2614 my ($self) = @_;
2453 2615
2454 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2457 $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});
2458 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2459 2621
2460 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2461 2623
2462} 2624}
… …
2511 2673
2512sub new { 2674sub new {
2513 my $class = shift; 2675 my $class = shift;
2514 2676
2515 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2516 state => 0, 2678 state => 0,
2517 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2518 @_ 2680 @_
2519 ); 2681 );
2520 2682
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2683 $self
2527} 2684}
2528 2685
2529sub toggle_flopper { 2686sub toggle_flopper {
2530 my ($self) = @_; 2687 my ($self) = @_;
2531 2688
2532 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2690}
2544 2691
2545############################################################################# 2692#############################################################################
2546 2693
2547package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2560} 2707}
2561 2708
2562sub set_tooltip_from { 2709sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2564 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
2565 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2724 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2726 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2738
2583sub size_allocate { 2739sub size_allocate {
2584 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2585 2741
2586 $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 });
2587} 2761}
2588 2762
2589sub _draw { 2763sub _draw {
2590 my ($self) = @_; 2764 my ($self) = @_;
2591 2765
… …
2608 glVertex $w, $h; 2782 glVertex $w, $h;
2609 glVertex $w, 0; 2783 glVertex $w, 0;
2610 glEnd; 2784 glEnd;
2611 2785
2612 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2613 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2614} 2789}
2615 2790
2616############################################################################# 2791#############################################################################
2617 2792
… …
2623 2798
2624sub new { 2799sub new {
2625 my $class = shift; 2800 my $class = shift;
2626 2801
2627 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2628 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2629 @_, 2805 @_,
2630 ); 2806 );
2631 2807
2632 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2676 2852
2677 if ($tex) { 2853 if ($tex) {
2678 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2680 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2682 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2683 } 2859 }
2684} 2860}
2685 2861
… …
2692 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2693} 2869}
2694 2870
2695############################################################################# 2871#############################################################################
2696 2872
2697package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2698 2874
2699our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2700 2876
2701sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 2878
2858############################################################################# 2879#############################################################################
2859 2880
2860package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2861 2882
… …
2902 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2924 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2905 2926
2906 $self->show; 2927 $self->show;
2907 $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);
2908} 2929}
2909 2930
2910sub mouse_motion { 2931sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2912 2933
2913 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2916} 2939}
2917 2940
2918sub button_up { 2941sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2920 2943
… …
2922 undef $GRAB; 2945 undef $GRAB;
2923 $self->hide; 2946 $self->hide;
2924 2947
2925 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2927 } 2954 1
2928} 2955}
2929 2956
2930############################################################################# 2957#############################################################################
2931 2958
2932package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2933 2960
2934our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2935 2962
2936sub new { 2963sub new {
2937 my $class = shift; 2964 my $class = shift;
2938 2965
2939 $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 (
2940 fontsize => 0.8, 3075 fontsize => 0.8,
2941 @_, 3076 @_,
2942 ) 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
2943} 3087}
2944 3088
2945sub reorder { 3089sub reorder {
2946 my ($self) = @_; 3090 my ($self) = @_;
2947 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2948 3092
2949 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 } 3095 }
2952 3096
… …
2954 3098
2955 my @items = sort { 3099 my @items = sort {
2956 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2959 3105
2960 my $count = 10 + 1; 3106 my $count = 10 + 1;
2961 for my $item (@items) { 3107 for my $item (@items) {
2962 last unless --$count; 3108 last unless --$count;
2963 3109
… …
2978 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2983 can_events => 1, 3130 can_events => 1,
2984 can_hover => 1 3131 can_hover => 1
2985 }; 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 }
2986 } 3143 }
2987 3144
2988 $self->clear; 3145 $self->clear;
2989 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2990} 3147}
… …
2995 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2997 3154
2998 return unless $text; 3155 return unless $text;
2999 3156
3000 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3001 3158
3002 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3003 3160
3004 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
3005 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3035 3192
3036 $self->reorder; 3193 $self->reorder;
3037 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3038} 3195}
3039 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3040############################################################################# 3205#############################################################################
3041 3206
3042package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
3043 3208
3044our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3045
3046use CFClient::OpenGL;
3047 3210
3048sub new { 3211sub new {
3049 my $class = shift; 3212 my $class = shift;
3050 3213
3051 $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 => [],
3052 @_, 3456 @_,
3053 ) 3457 )
3054} 3458}
3055 3459
3056sub configure { 3460# XXX: Do sorting? Argl...
3057 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
3058
3059 $self->{w} = $w;
3060 $self->{h} = $h;
3061}
3062
3063sub check_size {
3064 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3065 3464
3066 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3067 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
3068} 3521}
3069 3522
3070sub size_request { 3523sub size_request {
3071 my ($self) = @_; 3524 my ($self) = @_;
3072 3525
3073 ($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
3074} 3541}
3075 3542
3076sub size_allocate { 3543sub size_allocate {
3077 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3078 3545
3079 for my $child ($self->children) { 3546 for my $child ($self->children) {
3080 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)};
3081 3548
3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3083 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3084 3551
3085 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3086 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3087
3088 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3089 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090 3554
3091 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3092 } 3556 }
3093} 3557}
3094 3558
… …
3105} 3569}
3106 3570
3107sub update { 3571sub update {
3108 my ($self) = @_; 3572 my ($self) = @_;
3109 3573
3110 $self->check_size;
3111 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3112} 3575}
3113 3576
3114sub add { 3577sub add {
3115 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3116 3579
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122
3123 for my $child (@children) {
3124 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3125 3581 for @children;
3126 # integerise window positions
3127 $child->{x} = int $child->{x};
3128 $child->{y} = int $child->{y};
3129 }
3130 3582
3131 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3132} 3584}
3133 3585
3134sub remove { 3586sub remove {
3135 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3136 3588
3137 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3138 3593
3139 while (@children) { 3594 while (@children) {
3140 my $w = pop @children; 3595 my $w = pop @children;
3141 push @children, $w->children; 3596 push @children, $w->children;
3142 $w->set_invisible; 3597 $w->set_invisible;
… …
3161 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3162 $_->() 3617 $_->()
3163 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3164 } 3619 }
3165 3620
3166 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3167 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3168 3625
3169 for (;;) { 3626 outer:
3170 if ($self->{check_size}) { 3627 while () {
3171 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3172 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3173 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 }
3174 } 3636 }
3175 3637
3176 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3177 3640
3178 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3179 ? @$widget{qw(user_w user_h)} 3642 and last;
3180 : $widget->size_request;
3181
3182 if (delete $widget->{force_alloc}
3183 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3184 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3185 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}) {
3186 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3187 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3188 3664
3189 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3190 3666
3191 $widget->{parent}->check_size
3192 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 }
3193 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3194 } 3677 }
3195 } 3678 }
3196 3679
3197 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3198 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3199 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)};
3200 3688
3201 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3202 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3203 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
3204 $widget->{w} = $w; 3699 $widget->{w} = $w;
3205 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3206 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3207 } 3704 }
3208 } 3705 }
3209 3706
3210 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3211 $_->() 3708 $_->()
3212 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3213 } 3710 }
3711
3214 3712
3215 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3216 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3217 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3218 3716
… …
3220 glLoadIdentity; 3718 glLoadIdentity;
3221 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3222 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3223 glLoadIdentity; 3721 glLoadIdentity;
3224 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
3225 $self->_draw; 3730 $self->_draw;
3226} 3731}
3227 3732
3228############################################################################# 3733#############################################################################
3229 3734

Diff Legend

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