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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
269 delete $self->{visible}; 278 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->focus_out;
278 287
279 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
303 312
304 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
305 if $self->{parent}; 314 if $self->{parent};
306} 315}
307 316
308sub move { 317sub move_abs {
309 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
310 319
311 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
314 323
315 $self->update; 324 $self->update;
316} 325}
317 326
318sub set_size { 327sub set_size {
319 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
320 329
321 $self->{def_w} = $w; 330 $self->{force_w} = $w;
322 $self->{def_h} = $h; 331 $self->{force_h} = $h;
323 332
324 $self->realloc; 333 $self->realloc;
325} 334}
326 335
327sub size_request { 336sub size_request {
… …
331 340
332sub configure { 341sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
334 343
335 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
338 349
339 # use alignment to adjust x, y 350 # use alignment to adjust x, y
340 351
341 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 354 }
346 355
347 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 357 $self->{x} = $x;
349 $self->{y} = $y; 358 $self->{y} = $y;
350 $self->update; 359 $self->update;
351 } 360 }
352 361
353 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 363 return unless $self->{visible};
355 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
357 } 369 }
358} 370}
359 371
360sub size_allocate { 372sub size_allocate {
361 # nothing to be done 373 # nothing to be done
362} 374}
363 375
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449 464
450sub find_widget { 465sub find_widget {
451 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
452 467
453 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
461 476
462sub set_parent { 477sub set_parent {
463 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
464 479
465 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
468} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
492 506
493sub realloc { 507sub realloc {
494 my ($self) = @_; 508 my ($self) = @_;
495 509
496 if ($self->{visible}) { 510 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
498 512
499 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 514 $self->{root}->update;
501 } else { 515 } else {
502 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
503 } 518 }
504} 519}
505 520
506sub update { 521sub update {
507 my ($self) = @_; 522 my ($self) = @_;
508 523
509 $self->{parent}->update 524 $self->{parent}->update
510 if $self->{parent}; 525 if $self->{parent};
511} 526}
512 527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
513sub draw { 539sub draw {
514 my ($self) = @_; 540 my ($self) = @_;
515 541
516 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 553
518 glPushMatrix; 554 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 556
523 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 559 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 561 glBegin GL_QUADS;
530 glVertex $x , $y; 562 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
534 glEnd; 566 glEnd;
535 glDisable GL_BLEND; 567 glDisable GL_BLEND;
536 } 568 }
537 569
538 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 571 glPushMatrix;
540 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 575 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
547 glEnd; 579 glEnd;
548 glPopMatrix; 580 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
551} 586}
552 587
553sub _draw { 588sub _draw {
554 my ($self) = @_; 589 my ($self) = @_;
555 590
… …
593 628
594 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
596 631
597 glEnable GL_BLEND; 632 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 634 glColor_premultiply @$color;
600 635
601 glBegin GL_QUADS; 636 glBegin GL_QUADS;
602 glVertex 0 , 0; 637 glVertex 0 , 0;
603 glVertex 0 , $h; 638 glVertex 0 , $h;
604 glVertex $w, $h; 639 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
621} 656}
622 657
623sub size_request { 658sub size_request {
624 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
625} 662}
626 663
627sub draw { } 664sub draw { }
628 665
629############################################################################# 666#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
634 671
635sub new { 672sub new {
636 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
637 674
638 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
639 676
640 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
641 children => [], 678 children => [],
642 can_events => 0, 679 can_events => 0,
643 %arg, 680 %arg,
644 ); 681 );
682
645 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
646 685
647 $self 686 $self
648} 687}
649 688
650sub add { 689sub add {
… …
698 $x -= $self->{x}; 737 $x -= $self->{x};
699 $y -= $self->{y}; 738 $y -= $self->{y};
700 739
701 my $res; 740 my $res;
702 741
703 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
705 and return $res; 744 and return $res;
706 } 745 }
707 746
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
750sub size_request { 789sub size_request {
751 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
752} 791}
753 792
754sub size_allocate { 793sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
756 795
757 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
758} 797}
759 798
760############################################################################# 799#############################################################################
800
801# back-buffered drawing area
761 802
762package CFClient::UI::Window; 803package CFClient::UI::Window;
763 804
764our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
765 806
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 819 $self->SUPER::update;
779} 820}
780 821
781sub size_allocate { 822sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
783 824
784 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
785 $self->update 826 $self->update;
786 if $changed;
787} 827}
788 828
789sub _render { 829sub _render {
830 my ($self) = @_;
831
790 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
791} 833}
792 834
793sub render_child { 835sub render_child {
794 my ($self) = @_; 836 my ($self) = @_;
795 837
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
799 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
800 $self->_render; 849 $self->_render;
801 }; 850 };
802} 851}
803 852
804sub _draw { 853sub _draw {
805 my ($self) = @_; 854 my ($self) = @_;
806 855
807 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
808 857
809 my $tex = $self->{texture} 858 my $tex = $self->{texture}
810 or return; 859 or return;
811 860
812 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
815 864
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 866
818 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
819} 868}
… …
835} 884}
836 885
837sub size_request { 886sub size_request {
838 my ($self) = @_; 887 my ($self) = @_;
839 888
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 890
842 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
844 893
845 ($w, $h) 894 ($w, $h)
846} 895}
847 896
848sub size_allocate { 897sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
850 899
900 my $child = $self->child;
901
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 904
854 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
855 $self->update; 906 $self->update;
856} 907}
857 908
… …
893} 944}
894 945
895sub _render { 946sub _render {
896 my ($self) = @_; 947 my ($self) = @_;
897 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 953
900 $self->SUPER::_render; 954 $self->SUPER::_render;
901} 955}
902 956
… …
905package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
906 960
907our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
908 962
909sub new { 963sub new {
910 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
911 967
912 my $self; 968 my $self;
913 969
914 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
915 vertical => 1, 971 vertical => 1,
… …
920 ; 976 ;
921 977
922 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 980 slider => $slider,
925 @_, 981 %arg,
926 ); 982 );
927 983
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
931 986
932 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
933} 994}
934 995
935sub update { 996sub update {
936 my ($self) = @_; 997 my ($self) = @_;
937 998
… …
941 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1004}
944 1005
945sub size_allocate { 1006sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
947 1008
948 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
949 1010
950 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1013}
953 1014
… …
976 1037
977 if ($self->{bg}) { 1038 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
979 1040
980 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
983 1044
984 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
985 glVertex 0 , 0; 1046 glVertex 0 , 0;
986 glVertex 0 , $h; 1047 glVertex 0 , $h;
987 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1000 1061
1001our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1002 1063
1003use CFClient::OpenGL; 1064use CFClient::OpenGL;
1004 1065
1005my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1073
1009sub new { 1074sub new {
1010 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1011 1078
1012 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1082 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1083 can_events => 1,
1018 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1019 ); 1087 );
1020 1088
1021 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1022 align => 0, 1090 align => 0,
1023 valign => 1, 1091 valign => 1,
1024 text => $self->{title}, 1092 text => $title,
1025 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1026 1095
1027 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028} 1104}
1029 1105
1030sub border { 1106sub border {
1031 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1032} 1108}
1033 1109
1034sub size_request { 1110sub size_request {
1035 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1036 1115
1037 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1038 1117
1039 ( 1118 (
1040 $w + $self->border * 2, 1119 $w + $self->border * 2,
1041 $h + $self->border * 2, 1120 $h + $self->border * 2,
1042 ) 1121 )
1043} 1122}
1044 1123
1045sub size_allocate { 1124sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1047 1126
1048 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1049 1132
1133 my $border = $self->border;
1134
1050 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1052 1137
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1057} 1139}
1058 1140
1059sub button_down { 1141sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1061 1143
… …
1077 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1078 1160
1079 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1081 1163
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1168 $self->realloc;
1088 }; 1169 };
1089 1170
1090 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1175 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1096 1177
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1179
1099 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1101 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1105 } 1188 1
1106} 1189}
1107 1190
1108sub button_up { 1191sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1110 1193
1111 delete $self->{motion}; 1194 !!delete $self->{motion}
1112} 1195}
1113 1196
1114sub mouse_motion { 1197sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1116 1199
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1118} 1203}
1119 1204
1120sub _draw { 1205sub _draw {
1121 my ($self) = @_; 1206 my ($self) = @_;
1122 1207
1208 my $child = $self->{children}[0];
1209
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1212
1126 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1215
1129 my $border = $self->border; 1216 my $border = $self->border;
1130 1217
1131 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1223
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1139 1226
1140 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1232 }
1151 1233
1152 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1153 1235
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1157} 1242}
1158 1243
1159############################################################################# 1244#############################################################################
1160 1245
1161package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1235 (sum @$hs), 1320 (sum @$hs),
1236 ) 1321 )
1237} 1322}
1238 1323
1239sub size_allocate { 1324sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1241 1326
1242 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1243 1328
1244 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1409 )
1325} 1410}
1326 1411
1327sub size_allocate { 1412sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1329 1414
1330 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1416 my $children = $self->{children};
1332 1417
1333 my @req; 1418 my @req;
… …
1416 ellipsise => 3, # end 1501 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1418 fontsize => 1, 1503 fontsize => 1,
1419 align => -1, 1504 align => -1,
1420 valign => -1, 1505 valign => -1,
1421 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1422 can_events => 0, 1508 can_events => 0,
1423 %arg 1509 %arg
1424 ); 1510 );
1425 1511
1426 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1453 1539
1454 delete $self->{texture}; 1540 delete $self->{texture};
1455 $self->SUPER::update; 1541 $self->SUPER::update;
1456} 1542}
1457 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1458sub set_text { 1551sub set_text {
1459 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1460 1553
1461 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1463 1556
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1466 1559
1560 delete $self->{size_req};
1467 $self->realloc; 1561 $self->realloc;
1468 $self->update; 1562 $self->update;
1469} 1563}
1470 1564
1471sub set_markup { 1565sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1572
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1481 1575
1576 delete $self->{size_req};
1482 $self->realloc; 1577 $self->realloc;
1483 $self->update; 1578 $self->update;
1484} 1579}
1485 1580
1486sub size_request { 1581sub size_request {
1487 my ($self) = @_; 1582 my ($self) = @_;
1488 1583
1584 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1590
1495 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1496 1592
1497 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1596
1501 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1502 1598
1503 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1505 } 1604 };
1506 1605
1507 ( 1606 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1607}
1512 1608
1513sub size_allocate { 1609sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1515 1613
1516 delete $self->{texture} 1614 delete $self->{texture}
1517 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1616}
1519 1617
1520sub set_fontsize { 1618sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1522 1620
1523 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1622 delete $self->{texture};
1525 1623
1526 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1527} 1633}
1528 1634
1529sub _draw { 1635sub _draw {
1530 my ($self) = @_; 1636 my ($self) = @_;
1531 1637
… …
1537 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1647
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1543 1650
1651 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1547 1655
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1659 };
1554 1660
1555 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1665
1558 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1673 }
1564 1674
1565 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1566} 1676}
1567 1677
… …
1584 can_hover => 1, 1694 can_hover => 1,
1585 can_focus => 1, 1695 can_focus => 1,
1586 valign => 0, 1696 valign => 0,
1587 can_events => 1, 1697 can_events => 1,
1588 #text => ... 1698 #text => ...
1699 #hidden => "*",
1589 @_ 1700 @_
1590 ) 1701 )
1591} 1702}
1592 1703
1593sub _set_text { 1704sub _set_text {
… …
1595 1706
1596 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1597 1708
1598 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1599 1710
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1712 $self->{text} = $text;
1604 1713
1605 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1607 1717
1608 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1609} 1722}
1610 1723
1611sub set_text { 1724sub set_text {
1612 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1613 1726
1614 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1728 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1729}
1619 1730
1620sub get_text { 1731sub get_text {
1621 $_[0]{text} 1732 $_[0]{text}
1622} 1733}
… …
1652 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1655 } elsif ($uni) { 1766 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1657 } 1770 }
1658 1771
1659 $self->_set_text ($text); 1772 $self->_set_text ($text);
1660 1773
1661 $self->realloc; 1774 $self->realloc;
1775
1776 1
1662} 1777}
1663 1778
1664sub focus_in { 1779sub focus_in {
1665 my ($self) = @_; 1780 my ($self) = @_;
1666 1781
… …
1681 utf8::encode $text; 1796 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1683 1798
1684 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1685 $self->update; 1800 $self->update;
1801
1802 1
1686} 1803}
1687 1804
1688sub mouse_motion { 1805sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1691} 1810}
1692 1811
1693sub _draw { 1812sub _draw {
1694 my ($self) = @_; 1813 my ($self) = @_;
1695 1814
1696 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1697 1816
1698 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1701 } else { 1820 } else {
1702 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1703 } 1822 }
1704 1823
1705 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1827 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1772 } else { 1891 } else {
1773 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1774 } 1893 }
1775 1894
1776 } else { 1895 } else {
1777 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1778 } 1899 1
1779
1780} 1900}
1781 1901
1782############################################################################# 1902#############################################################################
1783 1903
1784package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1793 1913
1794sub new { 1914sub new {
1795 my $class = shift; 1915 my $class = shift;
1796 1916
1797 $class->SUPER::new ( 1917 $class->SUPER::new (
1798 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1799 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1801 can_hover => 1, 1922 can_hover => 1,
1802 align => 0, 1923 align => 0,
1803 valign => 0, 1924 valign => 0,
… …
1812 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1813 1934
1814 $self->emit ("activate") 1935 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1817} 1940}
1818 1941
1819sub _draw { 1942sub _draw {
1820 my ($self) = @_; 1943 my ($self) = @_;
1821 1944
1822 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1946
1828 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1831 1950
… …
1850 1969
1851sub new { 1970sub new {
1852 my $class = shift; 1971 my $class = shift;
1853 1972
1854 $class->SUPER::new ( 1973 $class->SUPER::new (
1855 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1856 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1980 state => 0,
… …
1864} 1984}
1865 1985
1866sub size_request { 1986sub size_request {
1867 my ($self) = @_; 1987 my ($self) = @_;
1868 1988
1869 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1870} 1990}
1871 1991
1872sub button_down { 1992sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1874 1994
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1879 } 2003 1
1880} 2004}
1881 2005
1882sub _draw { 2006sub _draw {
1883 my ($self) = @_; 2007 my ($self) = @_;
1884 2008
1885 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1886 2010
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2012
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2016
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2018
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2020
… …
2049 2175
2050 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2052 2178
2053 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2184
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2166 vertical => 0, 2293 vertical => 0,
2167 can_hover => 1, 2294 can_hover => 1,
2168 inner_pad => 0.02, 2295 inner_pad => 0.02,
2169 @_ 2296 @_
2170 ); 2297 );
… …
2210} 2337}
2211 2338
2212sub size_request { 2339sub size_request {
2213 my ($self) = @_; 2340 my ($self) = @_;
2214 2341
2215 my $w = $self->{req_w}; 2342 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2343}
2220 2344
2221sub button_down { 2345sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
2223 2347
2224 $self->SUPER::button_down ($ev, $x, $y); 2348 $self->SUPER::button_down ($ev, $x, $y);
2225 2349
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2351
2228 $self->mouse_motion ($ev, $x, $y); 2352 $self->mouse_motion ($ev, $x, $y)
2229} 2353}
2230 2354
2231sub mouse_motion { 2355sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2356 my ($self, $ev, $x, $y) = @_;
2233 2357
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2361 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2362
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2363 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2364
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2365 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2366 } else {
2367 return 0;
2368 }
2369
2242 } 2370 1
2243} 2371}
2244 2372
2245sub update { 2373sub update {
2246 my ($self) = @_; 2374 my ($self) = @_;
2247 2375
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2376 delete $self->{knob_w};
2377 $self->SUPER::update;
2378}
2379
2380sub _draw {
2381 my ($self) = @_;
2382
2383 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2384 $self->set_value ($self->{range}[0]);
2250 2385
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2386 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2387 my $range = ($hi - $page - $lo) || 1e-100;
2253 2388
… …
2259 $value = ($value - $lo) / $range; 2394 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2395 $value = $value * $self->{scale} + $self->{offset};
2261 2396
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2397 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2398 $self->{knob_w} = $knob_w;
2264 }); 2399 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2400
2272 $self->SUPER::_draw (); 2401 $self->SUPER::_draw ();
2273 2402
2274 glScale $self->{w}, $self->{h}; 2403 glScale $self->{w}, $self->{h};
2275 2404
… …
2348 my $class = shift; 2477 my $class = shift;
2349 2478
2350 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2351 fontsize => 1, 2480 fontsize => 1,
2352 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2353 #font => default_font 2483 #font => default_font
2354 @_, 2484 @_,
2355 2485
2356 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2357 par => [], 2487 par => [],
… …
2373 $self->{fontsize} = $fontsize; 2503 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2504 $self->reflow;
2375} 2505}
2376 2506
2377sub size_allocate { 2507sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2508 my ($self, $w, $h) = @_;
2379 2509
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2510 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2511
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2516
2388 $self->reflow; 2517 $self->reflow;
2389} 2518}
2390 2519
2391sub text_size { 2520sub text_size {
… …
2393 2522
2394 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2395 2524
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2399 2529
2400 $layout->size 2530 $layout->size
2401} 2531}
2402 2532
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2585
2456 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2459 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2593 $_->[1] = $h;
2463 } 2594 }
… …
2471 2602
2472 delete $self->{texture}; 2603 delete $self->{texture};
2473 } 2604 }
2474 2605
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2607 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2478 2609
2479 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2480 2611
2481 my $y0 = $top; 2612 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2626 my $h = $par->[1];
2496 2627
2497 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2500 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2501 2633
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2635
2504 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2648sub _draw {
2517 my ($self) = @_; 2649 my ($self) = @_;
2518 2650
2519 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2524 2656
2525 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2526 2658
2527} 2659}
… …
2610} 2742}
2611 2743
2612sub set_tooltip_from { 2744sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2745 my ($self, $widget) = @_;
2614 2746
2747 my $tooltip = $widget->{tooltip};
2748
2749 if ($ENV{CFPLUS_DEBUG} & 2) {
2750 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}";
2754 }
2755
2615 $self->add (new CFClient::UI::Label 2756 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2757 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2759 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2760 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2761 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2762 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2770
2630 ($w + 4, $h + 4) 2771 ($w + 4, $h + 4)
2631} 2772}
2632 2773
2633sub size_allocate { 2774sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2775 my ($self, $w, $h) = @_;
2635 2776
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2777 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2778}
2640 2779
2641sub visibility_change { 2780sub visibility_change {
2642 my ($self, $visible) = @_; 2781 my ($self, $visible) = @_;
2643 2782
… …
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2790
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2792 if $x + $self->{w} > $::WIDTH;
2654 2793
2655 $self->move ($x, $y); 2794 $self->move_abs ($x, $y);
2656 }); 2795 });
2657} 2796}
2658 2797
2659sub _draw { 2798sub _draw {
2660 my ($self) = @_; 2799 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2887
2749 if ($tex) { 2888 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2755 } 2894 }
2756} 2895}
2757 2896
… …
2764 $self->SUPER::DESTROY; 2903 $self->SUPER::DESTROY;
2765} 2904}
2766 2905
2767############################################################################# 2906#############################################################################
2768 2907
2769package CFClient::UI::Inventory; 2908package CFClient::UI::Buttonbar;
2770 2909
2771our @ISA = CFClient::UI::ScrolledWindow::; 2910our @ISA = CFClient::UI::HBox::;
2772 2911
2773sub new { 2912# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808 2913
2809############################################################################# 2914#############################################################################
2810 2915
2811package CFClient::UI::Menu; 2916package CFClient::UI::Menu;
2812 2917
… …
2824 ); 2929 );
2825 2930
2826 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2827 2932
2828 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2829 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2830 2935
2831 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2832 if (!ref $widget) { 2937 if (!ref $widget) {
2833 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2834 can_hover => 1, 2939 can_hover => 1,
2835 can_events => 1, 2940 can_events => 1,
2836 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2837 } 2943 }
2838 2944
2839 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2840 2946
2841 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
2853 # maybe save $GRAB? must be careful about events... 2959 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2960 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2961 $self->{button} = $ev->{button};
2856 2962
2857 $self->show; 2963 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2964 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2965}
2860 2966
2861sub mouse_motion { 2967sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2863 2969
2864 # TODO: should use vbox->find_widget or so 2970 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 2972 $self->{hover} = $self->{item}{$HOVER};
2973
2974 0
2867} 2975}
2868 2976
2869sub button_up { 2977sub button_up {
2870 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2871 2979
… …
2873 undef $GRAB; 2981 undef $GRAB;
2874 $self->hide; 2982 $self->hide;
2875 2983
2876 $self->_emit ("popdown"); 2984 $self->_emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 2985 $self->{hover}[1]->() if $self->{hover};
2986 } else {
2987 return 0
2988 }
2989
2878 } 2990 1
2879} 2991}
2880 2992
2881############################################################################# 2993#############################################################################
2882 2994
2883package CFClient::UI::Statusbox; 2995package CFClient::UI::Multiplexer;
2884 2996
2885our @ISA = CFClient::UI::VBox::; 2997our @ISA = CFClient::UI::Container::;
2886 2998
2887sub new { 2999sub new {
2888 my $class = shift; 3000 my $class = shift;
2889 3001
2890 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 @_,
3004 );
3005
3006 $self->{current} = $self->{children}[0]
3007 if @{ $self->{children} };
3008
3009 $self
3010}
3011
3012sub add {
3013 my ($self, @widgets) = @_;
3014
3015 $self->SUPER::add (@widgets);
3016
3017 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} };
3019}
3020
3021sub set_current_page {
3022 my ($self, $page_or_widget) = @_;
3023
3024 my $widget = ref $page_or_widget
3025 ? $page_or_widget
3026 : $self->{children}[$page_or_widget];
3027
3028 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030
3031 $self->_emit (page_changed => $self->{current});
3032
3033 $self->realloc;
3034}
3035
3036sub visible_children {
3037 $_[0]{current}
3038}
3039
3040sub size_request {
3041 my ($self) = @_;
3042
3043 $self->{current}->size_request
3044}
3045
3046sub size_allocate {
3047 my ($self, $w, $h) = @_;
3048
3049 $self->{current}->configure (0, 0, $w, $h);
3050}
3051
3052sub _draw {
3053 my ($self) = @_;
3054
3055 $self->{current}->draw;
3056}
3057
3058#############################################################################
3059
3060package CFClient::UI::Notebook;
3061
3062our @ISA = CFClient::UI::VBox::;
3063
3064sub new {
3065 my $class = shift;
3066
3067 my $self = $class->SUPER::new (
3068 buttonbar => (new CFClient::UI::Buttonbar),
3069 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3070 # filter => # will be put between multiplexer and $self
3071 @_,
3072 );
3073
3074 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3075 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3076
3077 $self
3078}
3079
3080sub add {
3081 my ($self, $title, $widget, $tooltip) = @_;
3082
3083 Scalar::Util::weaken $self;
3084
3085 $self->{buttonbar}->add (new CFClient::UI::Button
3086 markup => $title,
3087 tooltip => $tooltip,
3088 on_activate => sub { $self->set_current_page ($widget) },
3089 );
3090
3091 $self->{multiplexer}->add ($widget);
3092}
3093
3094sub set_current_page {
3095 my ($self, $page) = @_;
3096
3097 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3099}
3100
3101#############################################################################
3102
3103package CFClient::UI::Combobox;
3104
3105use utf8;
3106
3107our @ISA = CFClient::UI::Button::;
3108
3109sub new {
3110 my $class = shift;
3111
3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3155}
3156
3157#############################################################################
3158
3159package CFClient::UI::Statusbox;
3160
3161our @ISA = CFClient::UI::VBox::;
3162
3163sub new {
3164 my $class = shift;
3165
3166 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3167 fontsize => 0.8,
2892 @_, 3168 @_,
2893 ) 3169 );
3170
3171 Scalar::Util::weaken (my $this = $self);
3172
3173 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3174
3175 $self
2894} 3176}
2895 3177
2896sub reorder { 3178sub reorder {
2897 my ($self) = @_; 3179 my ($self) = @_;
2898 my $NOW = time; 3180 my $NOW = Time::HiRes::time;
3181
3182 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} };
2899 3186
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3189 }
2903 3190
… …
2906 my @items = sort { 3193 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3194 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3195 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3196 } values %{ $self->{item} };
2910 3197
3198 $self->{timer}->interval (1);
3199
2911 my $count = 10 + 1; 3200 my $count = 10 + 1;
2912 for my $item (@items) { 3201 for my $item (@items) {
2913 last unless --$count; 3202 last unless --$count;
2914 3203
2915 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3206 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3207 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3208 : $item->{text};
2920 3209
… …
2928 tooltip => $item->{tooltip}, 3217 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3219 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3221 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3222 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3223 can_events => 1,
2935 can_hover => 1 3224 can_hover => 1
2936 }; 3225 };
3226
3227 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3228 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3229 $label->update;
3230 $label->set_max_size (undef, $label->{req_h} * $diff)
3231 if $diff < 1;
3232 $self->{timer}->interval (1/30);
3233 } else {
3234 $label->{fg}[3] = $item->{fg}[3] || 1;
3235 }
3236
3237 push @widgets, $label;
2937 } 3238 }
2938 3239
2939 $self->clear; 3240 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3241 $self->SUPER::add (reverse @widgets);
2941} 3242}
… …
2946 $text =~ s/^\s+//; 3247 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3248 $text =~ s/\s+$//;
2948 3249
2949 return unless $text; 3250 return unless $text;
2950 3251
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3253
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3255
2955 if (my $item = $self->{item}{$group}) { 3256 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3257 if ($item->{text} eq $text) {
… …
2986 3287
2987 $self->reorder; 3288 $self->reorder;
2988 $self->SUPER::reconfigure; 3289 $self->SUPER::reconfigure;
2989} 3290}
2990 3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
2991############################################################################# 3300#############################################################################
2992 3301
3302package CFClient::UI::Inventory;
3303
3304our @ISA = CFClient::UI::ScrolledWindow::;
3305
3306sub new {
3307 my $class = shift;
3308
3309 my $self = $class->SUPER::new (
3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3311 @_,
3312 );
3313
3314 $self
3315}
3316
3317sub set_items {
3318 my ($self, $items) = @_;
3319
3320 $self->{child}->clear;
3321 return unless $items;
3322
3323 my @items = sort {
3324 ($a->{type} <=> $b->{type})
3325 or ($a->{name} cmp $b->{name})
3326 } @$items;
3327
3328 $self->{real_items} = \@items;
3329
3330 my $row = 0;
3331 for my $item (@items) {
3332 CFClient::Item::update_widgets $item;
3333
3334 $self->{child}->add (0, $row, $item->{face_widget});
3335 $self->{child}->add (1, $row, $item->{desc_widget});
3336 $self->{child}->add (2, $row, $item->{weight_widget});
3337
3338 $row++;
3339 }
3340}
3341
3342#############################################################################
3343
3344package CFClient::UI::BindEditor;
3345
3346our @ISA = CFClient::UI::FancyFrame::;
3347
3348sub new {
3349 my $class = shift;
3350
3351 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353 $self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357 text => "start recording",
3358 tooltip => "Start/Stops recording of actions."
3359 ."All subsequent actions after the recording started will be captured."
3360 ."The actions are displayed after the record was stopped."
3361 ."To bind the action you have to click on the 'Bind' button",
3362 on_activate => sub {
3363 unless ($self->{recording}) {
3364 $self->start;
3365 } else {
3366 $self->stop;
3367 }
3368 });
3369
3370 $vb->add (new CFClient::UI::Label text => "Actions:");
3371 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3374 $vb->add (my $hb = new CFClient::UI::HBox);
3375 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376 $hb->add (new CFClient::UI::Button
3377 text => "bind",
3378 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379 on_activate => sub {
3380 $self->ask_for_bind;
3381 });
3382
3383 $vb->add (my $hb = new CFClient::UI::HBox);
3384 $hb->add (new CFClient::UI::Button
3385 text => "ok",
3386 expand => 1,
3387 tooltip => "This closes the binding editor and saves the binding",
3388 on_activate => sub {
3389 $self->hide;
3390 $self->commit;
3391 });
3392
3393 $hb->add (new CFClient::UI::Button
3394 text => "cancel",
3395 expand => 1,
3396 tooltip => "This closes the binding editor without saving",
3397 on_activate => sub {
3398 $self->hide;
3399 $self->{binding_cancel}->()
3400 if $self->{binding_cancel};
3401 });
3402
3403 $self->update_binding_widgets;
3404
3405 $self
3406}
3407
3408sub commit {
3409 my ($self) = @_;
3410 my ($mod, $sym, $cmds) = $self->get_binding;
3411 if ($sym != 0 && @$cmds > 0) {
3412 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413 ."'. Don't forget 'Save Config'!");
3414 $self->{binding_change}->($mod, $sym, $cmds)
3415 if $self->{binding_change};
3416 } else {
3417 $::STATUSBOX->add ("No action bound, no key or action specified!");
3418 $self->{binding_cancel}->()
3419 if $self->{binding_cancel};
3420 }
3421}
3422
3423sub start {
3424 my ($self) = @_;
3425
3426 $self->{rec_btn}->set_text ("stop recording");
3427 $self->{recording} = 1;
3428 $self->clear_command_list;
3429 $::CONN->start_record if $::CONN;
3430}
3431
3432sub stop {
3433 my ($self) = @_;
3434
3435 $self->{rec_btn}->set_text ("start recording");
3436 $self->{recording} = 0;
3437
3438 my $rec;
3439 $rec = $::CONN->stop_record if $::CONN;
3440 return unless ref $rec eq 'ARRAY';
3441 $self->set_command_list ($rec);
3442}
3443
3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3450sub ask_for_bind {
3451 my ($self, $commit) = @_;
3452
3453 CFClient::Binder::open_binding_dialog (sub {
3454 my ($mod, $sym) = @_;
3455 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456 $self->update_binding_widgets;
3457 $self->commit if $commit;
3458 });
3459}
3460
3461# $mod and $sym are the modifiers and key symbol
3462# $cmds is a array ref of strings (the commands)
3463# $cb is the callback that is executed on OK
3464# $ccb is the callback that is executed on CANCEL and
3465# when the binding was unsuccessful on OK
3466sub set_binding {
3467 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469 $self->clear_command_list;
3470 $self->{recording} = 0;
3471 $self->{rec_btn}->set_text ("start recording");
3472
3473 $self->{binding} = [$mod, $sym];
3474 $self->{commands} = $cmds;
3475
3476 $self->{binding_change} = $cb;
3477 $self->{binding_cancel} = $ccb;
3478
3479 $self->update_binding_widgets;
3480}
3481
3482# this is a shortcut method that asks for a binding
3483# and then just binds it.
3484sub do_quick_binding {
3485 my ($self, $cmds) = @_;
3486 $self->set_binding (undef, undef, $cmds, sub {
3487 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488 });
3489 $self->ask_for_bind (1);
3490}
3491
3492sub update_binding_widgets {
3493 my ($self) = @_;
3494 my ($mod, $sym, $cmds) = $self->get_binding;
3495 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496 $self->set_command_list ($cmds);
3497}
3498
3499sub get_binding {
3500 my ($self) = @_;
3501 return (
3502 $self->{binding}->[0],
3503 $self->{binding}->[1],
3504 [ grep { defined $_ } @{$self->{commands}} ]
3505 );
3506}
3507
3508sub clear_command_list {
3509 my ($self) = @_;
3510 $self->{cmdbox}->clear ();
3511}
3512
3513sub set_command_list {
3514 my ($self, $cmds) = @_;
3515
3516 $self->{cmdbox}->clear ();
3517 $self->{commands} = $cmds;
3518
3519 my $idx = 0;
3520
3521 for (@$cmds) {
3522 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524 my $i = $idx;
3525 $hb->add (new CFClient::UI::Label text => $_);
3526 $hb->add (new CFClient::UI::Button
3527 text => "delete",
3528 tooltip => "Deletes the action from the record",
3529 on_activate => sub {
3530 $self->{cmdbox}->remove ($hb);
3531 $cmds->[$i] = undef;
3532 });
3533
3534
3535 $idx++
3536 }
3537}
3538
3539#############################################################################
3540
3541package CFClient::UI::SpellList;
3542
3543our @ISA = CFClient::UI::Table::;
3544
3545sub new {
3546 my $class = shift;
3547
3548 my $self = $class->SUPER::new (
3549 binding => [],
3550 commands => [],
3551 @_,
3552 )
3553}
3554
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3561
3562sub rebuild_spell_list {
3563 my ($self) = @_;
3564
3565 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear;
3567
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572
3573 my $row = 0;
3574
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_};
3577
3578 $row++;
3579
3580 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $spell->{message},
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 }
3606 });
3607}
3608
3609sub add_spell {
3610 my ($self, $spell) = @_;
3611
3612 $self->{spell}->{$spell->{name}} = $spell;
3613 $self->rebuild_spell_list;
3614}
3615
3616sub remove_spell {
3617 my ($self, $spell) = @_;
3618
3619 delete $self->{spell}->{$spell->{name}};
3620 $self->rebuild_spell_list;
3621}
3622
3623#############################################################################
3624
2993package CFClient::UI::Root; 3625package CFClient::UI::Root;
2994 3626
2995our @ISA = CFClient::UI::Container::; 3627our @ISA = CFClient::UI::Container::;
3628
3629use List::Util qw(min max);
2996 3630
2997use CFClient::OpenGL; 3631use CFClient::OpenGL;
2998 3632
2999sub new { 3633sub new {
3000 my $class = shift; 3634 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3641 Scalar::Util::weaken ($self->{root} = $self);
3008 3642
3009 $self 3643 $self
3010} 3644}
3011 3645
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3646sub size_request {
3029 my ($self) = @_; 3647 my ($self) = @_;
3030 3648
3031 ($self->{w}, $self->{h}) 3649 ($self->{w}, $self->{h})
3032} 3650}
3033 3651
3652sub _to_pixel {
3653 my ($coord, $size, $max) = @_;
3654
3655 $coord =
3656 $coord eq "center" ? ($max - $size) * 0.5
3657 : $coord eq "max" ? $max
3658 : $coord;
3659
3660 $coord = 0 if $coord < 0;
3661 $coord = $max - $size if $coord > $max - $size;
3662
3663 int $coord + 0.5
3664}
3665
3034sub size_allocate { 3666sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3667 my ($self, $w, $h) = @_;
3036 3668
3037 for my $child ($self->children) { 3669 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3670 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3671
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3672 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3673 $Y = $child->{force_y} if exists $child->{force_y};
3042 3674
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3675 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3676 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3677
3051 $child->configure ($X, $Y, $W, $H); 3678 $child->configure ($X, $Y, $W, $H);
3052 } 3679 }
3053} 3680}
3054 3681
… …
3071} 3698}
3072 3699
3073sub add { 3700sub add {
3074 my ($self, @children) = @_; 3701 my ($self, @children) = @_;
3075 3702
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3703 $_->{is_toplevel} = 1
3078 3704 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3705
3084 $self->SUPER::add (@children); 3706 $self->SUPER::add (@children);
3085} 3707}
3086 3708
3087sub remove { 3709sub remove {
3088 my ($self, @children) = @_; 3710 my ($self, @children) = @_;
3089 3711
3090 $self->SUPER::remove (@children); 3712 $self->SUPER::remove (@children);
3713
3714 delete $self->{is_toplevel}
3715 for @children;
3091 3716
3092 while (@children) { 3717 while (@children) {
3093 my $w = pop @children; 3718 my $w = pop @children;
3094 push @children, $w->children; 3719 push @children, $w->children;
3095 $w->set_invisible; 3720 $w->set_invisible;
… …
3115 $_->() 3740 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3741 for values %{delete $self->{refresh_hook}};
3117 } 3742 }
3118 3743
3119 if ($self->{realloc}) { 3744 if ($self->{realloc}) {
3745 my %queue;
3120 my @queue; 3746 my @queue;
3747 my $widget;
3121 3748
3749 outer:
3122 while () { 3750 while () {
3123 if ($self->{realloc}) { 3751 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3752 for $widget (values %$realloc) {
3753 $widget->{visible} or next; # do not resize invisible widgets
3125 3754
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3755 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3756
3757 push @{ $queue[$widget->{visible}] }, $widget;
3758 }
3128 } 3759 }
3129 3760
3761 while () {
3762 @queue or last outer;
3763
3764 $widget = pop @{ $queue[-1] || [] }
3765 and last;
3766
3767 pop @queue;
3768 }
3769
3770 delete $queue{$widget+0};
3771
3772 my ($w, $h) = $widget->size_request;
3773
3774 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3775 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3776
3777 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3778 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3779
3780 $w = $widget->{force_w} if exists $widget->{force_w};
3781 $h = $widget->{force_h} if exists $widget->{force_h};
3782
3783 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3784 || delete $widget->{force_realloc}) {
3785 $widget->{req_w} = $w;
3786 $widget->{req_h} = $h;
3787
3788 $self->{size_alloc}{$widget+0} = $widget;
3789
3790 if (my $parent = $widget->{parent}) {
3791 $self->{realloc}{$parent+0} = $parent
3792 unless $queue{$parent+0};
3793
3794 $parent->{force_size_alloc} = 1;
3795 $self->{size_alloc}{$parent+0} = $parent;
3796 }
3797 }
3798
3799 delete $self->{realloc}{$widget+0};
3800 }
3801 }
3802
3803 while (my $size_alloc = delete $self->{size_alloc}) {
3804 my @queue = sort { $b->{visible} <=> $a->{visible} }
3805 values %$size_alloc;
3806
3807 while () {
3130 my $widget = pop @queue || last; 3808 my $widget = pop @queue || last;
3131 3809
3132 $widget->{visible} or last; # do not resize invisible widgets 3810 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3811
3157 $w = 0 if $w < 0; 3812 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3813 $h = 0 if $h < 0;
3159 3814
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3815 $w = int $w + 0.5;
3816 $h = int $h + 0.5;
3161 3817
3818 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3819 $widget->{old_w} = $widget->{w};
3820 $widget->{old_h} = $widget->{h};
3821
3162 $widget->{w} = $w; 3822 $widget->{w} = $w;
3163 $widget->{h} = $h; 3823 $widget->{h} = $h;
3164 3824
3165 $widget->emit (size_allocate => $w, $h, $changed); 3825 $widget->emit (size_allocate => $w, $h);
3826 }
3166 } 3827 }
3167 } 3828 }
3168 3829
3169 while ($self->{post_alloc_hook}) { 3830 while ($self->{post_alloc_hook}) {
3170 $_->() 3831 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3832 for values %{delete $self->{post_alloc_hook}};
3172 } 3833 }
3834
3173 3835
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3836 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3837 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3838 glClear GL_COLOR_BUFFER_BIT;
3177 3839
… …
3179 glLoadIdentity; 3841 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3842 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3843 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3844 glLoadIdentity;
3183 3845
3846 {
3847 package CFClient::UI::Base;
3848
3849 ($draw_x, $draw_y, $draw_w, $draw_h) =
3850 (0, 0, $self->{w}, $self->{h});
3851 }
3852
3184 $self->_draw; 3853 $self->_draw;
3185} 3854}
3186 3855
3187############################################################################# 3856#############################################################################
3188 3857

Diff Legend

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