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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.298 by root, Wed Jun 7 07:00:30 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, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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;
… …
1009my @border = 1070my @border =
1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1011 qw(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);
1012 1073
1013sub new { 1074sub new {
1014 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1015 1078
1016 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1082 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1083 can_events => 1,
1022 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1023 ); 1087 );
1024 1088
1025 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1026 align => 0, 1090 align => 0,
1027 valign => 1, 1091 valign => 1,
1028 text => $self->{title}, 1092 text => $title,
1029 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1030 1095
1031 $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};
1032} 1104}
1033 1105
1034sub border { 1106sub border {
1035 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1036} 1108}
1037 1109
1038sub size_request { 1110sub size_request {
1039 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1040 1115
1041 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1042 1117
1043 ( 1118 (
1044 $w + $self->border * 2, 1119 $w + $self->border * 2,
1045 $h + $self->border * 2, 1120 $h + $self->border * 2,
1046 ) 1121 )
1047} 1122}
1048 1123
1049sub size_allocate { 1124sub size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1051 1126
1052 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 }
1053 1132
1133 my $border = $self->border;
1134
1054 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1056 1137
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1061} 1139}
1062 1140
1063sub button_down { 1141sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1065 1143
… …
1081 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1082 1160
1083 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1085 1163
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1091 $self->realloc; 1168 $self->realloc;
1092 }; 1169 };
1093 1170
1094 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1098 $self->{motion} = sub { 1175 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1100 1177
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1179
1103 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1105 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1109 } 1188 1
1110} 1189}
1111 1190
1112sub button_up { 1191sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1114 1193
1115 delete $self->{motion}; 1194 !!delete $self->{motion}
1116} 1195}
1117 1196
1118sub mouse_motion { 1197sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1120 1199
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1122} 1203}
1123 1204
1124sub _draw { 1205sub _draw {
1125 my ($self) = @_; 1206 my ($self) = @_;
1126 1207
1208 my $child = $self->{children}[0];
1209
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1212
1130 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
… …
1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 } 1232 }
1150 1233
1151 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1152 1235
1153 $self->{title}->draw if $self->{title};
1154
1155 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1156} 1242}
1157 1243
1158############################################################################# 1244#############################################################################
1159 1245
1160package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1234 (sum @$hs), 1320 (sum @$hs),
1235 ) 1321 )
1236} 1322}
1237 1323
1238sub size_allocate { 1324sub size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1240 1326
1241 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1242 1328
1243 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1409 )
1324} 1410}
1325 1411
1326sub size_allocate { 1412sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1328 1414
1329 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1416 my $children = $self->{children};
1331 1417
1332 my @req; 1418 my @req;
… …
1415 ellipsise => 3, # end 1501 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1417 fontsize => 1, 1503 fontsize => 1,
1418 align => -1, 1504 align => -1,
1419 valign => -1, 1505 valign => -1,
1420 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1421 can_events => 0, 1508 can_events => 0,
1422 %arg 1509 %arg
1423 ); 1510 );
1424 1511
1425 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1452 1539
1453 delete $self->{texture}; 1540 delete $self->{texture};
1454 $self->SUPER::update; 1541 $self->SUPER::update;
1455} 1542}
1456 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1457sub set_text { 1551sub set_text {
1458 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1459 1553
1460 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1461 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1462 1556
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1464 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1465 1559
1560 delete $self->{size_req};
1466 $self->realloc; 1561 $self->realloc;
1467 $self->update; 1562 $self->update;
1468} 1563}
1469 1564
1470sub set_markup { 1565sub set_markup {
… …
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477 1572
1478 $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;
1479 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1480 1575
1576 delete $self->{size_req};
1481 $self->realloc; 1577 $self->realloc;
1482 $self->update; 1578 $self->update;
1483} 1579}
1484 1580
1485sub size_request { 1581sub size_request {
1486 my ($self) = @_; 1582 my ($self) = @_;
1487 1583
1584 $self->{size_req} ||= do {
1488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1489 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1493 1590
1494 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1495 1592
1496 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1497 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1498 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1596
1500 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1501 1598
1502 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1504 } 1604 };
1505 1605
1506 ( 1606 @{ $self->{size_req} }
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1607}
1511 1608
1512sub size_allocate { 1609sub size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1514 1613
1515 delete $self->{texture} 1614 delete $self->{texture}
1516 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517} 1616}
1518 1617
1519sub set_fontsize { 1618sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1521 1620
1522 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1523 delete $self->{texture}; 1622 delete $self->{texture};
1524 1623
1525 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1526} 1633}
1527 1634
1528sub _draw { 1635sub _draw {
1529 my ($self) = @_; 1636 my ($self) = @_;
1530 1637
… …
1536 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1647
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1542 1650
1651 unless (exists $self->{ox}) {
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1546 1655
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1550
1551 $tex
1552 }; 1659 };
1553 1660
1554 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1555 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};
1556 1665
1557 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1558 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1559 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1560 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1562 } 1673 }
1563 1674
1564 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1565} 1676}
1566 1677
… …
1583 can_hover => 1, 1694 can_hover => 1,
1584 can_focus => 1, 1695 can_focus => 1,
1585 valign => 0, 1696 valign => 0,
1586 can_events => 1, 1697 can_events => 1,
1587 #text => ... 1698 #text => ...
1699 #hidden => "*",
1588 @_ 1700 @_
1589 ) 1701 )
1590} 1702}
1591 1703
1592sub _set_text { 1704sub _set_text {
… …
1594 1706
1595 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1596 1708
1597 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1598 1710
1599 delete $self->{texture};
1600
1601 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1602 $self->{text} = $text; 1712 $self->{text} = $text;
1603 1713
1604 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1605 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1606 1717
1607 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1608} 1722}
1609 1723
1610sub set_text { 1724sub set_text {
1611 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1612 1726
1613 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1614 $self->_set_text ($text); 1728 $self->_set_text ($text);
1615
1616 $self->realloc;
1617} 1729}
1618 1730
1619sub get_text { 1731sub get_text {
1620 $_[0]{text} 1732 $_[0]{text}
1621} 1733}
… …
1651 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1652 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1653 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1654 } elsif ($uni) { 1766 } elsif ($uni) {
1655 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1656 } 1770 }
1657 1771
1658 $self->_set_text ($text); 1772 $self->_set_text ($text);
1659 1773
1660 $self->realloc; 1774 $self->realloc;
1775
1776 1
1661} 1777}
1662 1778
1663sub focus_in { 1779sub focus_in {
1664 my ($self) = @_; 1780 my ($self) = @_;
1665 1781
… …
1680 utf8::encode $text; 1796 utf8::encode $text;
1681 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1682 1798
1683 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1684 $self->update; 1800 $self->update;
1801
1802 1
1685} 1803}
1686 1804
1687sub mouse_motion { 1805sub mouse_motion {
1688 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1689# 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
1690} 1810}
1691 1811
1692sub _draw { 1812sub _draw {
1693 my ($self) = @_; 1813 my ($self) = @_;
1694 1814
1695 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1696 1816
1697 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1698 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1699 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1700 } else { 1820 } else {
1701 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1702 } 1822 }
1703 1823
1704 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1706 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1707 glVertex 0 , 0; 1827 glVertex 0 , 0;
1708 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1709 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1710 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1771 } else { 1891 } else {
1772 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1773 } 1893 }
1774 1894
1775 } else { 1895 } else {
1776 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1777 } 1899 1
1778
1779} 1900}
1780 1901
1781############################################################################# 1902#############################################################################
1782 1903
1783package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1792 1913
1793sub new { 1914sub new {
1794 my $class = shift; 1915 my $class = shift;
1795 1916
1796 $class->SUPER::new ( 1917 $class->SUPER::new (
1797 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1798 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1800 can_hover => 1, 1922 can_hover => 1,
1801 align => 0, 1923 align => 0,
1802 valign => 0, 1924 valign => 0,
… …
1811 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1812 1934
1813 $self->emit ("activate") 1935 $self->emit ("activate")
1814 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1815 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1816} 1940}
1817 1941
1818sub _draw { 1942sub _draw {
1819 my ($self) = @_; 1943 my ($self) = @_;
1820 1944
1821 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1822
1823 if ($GRAB == $self) {
1824 $self->{fg} = $self->{active_fg};
1825 }
1826 1946
1827 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1830 1950
… …
1849 1969
1850sub new { 1970sub new {
1851 my $class = shift; 1971 my $class = shift;
1852 1972
1853 $class->SUPER::new ( 1973 $class->SUPER::new (
1854 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1855 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 1980 state => 0,
… …
1863} 1984}
1864 1985
1865sub size_request { 1986sub size_request {
1866 my ($self) = @_; 1987 my ($self) = @_;
1867 1988
1868 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1869} 1990}
1870 1991
1871sub button_down { 1992sub button_down {
1872 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1873 1994
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1878 } 2003 1
1879} 2004}
1880 2005
1881sub _draw { 2006sub _draw {
1882 my ($self) = @_; 2007 my ($self) = @_;
1883 2008
1884 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1885 2010
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 2012
1888 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;
1889 2016
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 2018
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 2020
… …
2048 2175
2049 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2050 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2051 2178
2052 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2053 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;
2054 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 2184
2057 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2058 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2158 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2165 vertical => 0, 2293 vertical => 0,
2166 can_hover => 1, 2294 can_hover => 1,
2167 inner_pad => 0.02, 2295 inner_pad => 0.02,
2168 @_ 2296 @_
2169 ); 2297 );
… …
2179sub set_range { 2307sub set_range {
2180 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2181 2309
2182 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2183 2311
2184 $self->update
2185 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2186} 2316}
2187 2317
2188sub set_value { 2318sub set_value {
2189 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2190 2320
… …
2209} 2339}
2210 2340
2211sub size_request { 2341sub size_request {
2212 my ($self) = @_; 2342 my ($self) = @_;
2213 2343
2214 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2345}
2219 2346
2220sub button_down { 2347sub button_down {
2221 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2222 2349
2223 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2224 2351
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226 2353
2227 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2228} 2355}
2229 2356
2230sub mouse_motion { 2357sub mouse_motion {
2231 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2232 2359
… …
2236 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237 2364
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239 2366
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2241 } 2372 1
2242} 2373}
2243 2374
2244sub update { 2375sub update {
2245 my ($self) = @_; 2376 my ($self) = @_;
2246 2377
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2248 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2249 2387
2250 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2252 2390
… …
2258 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2259 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2260 2398
2261 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2262 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2263 }); 2401 }
2264
2265 $self->SUPER::update;
2266}
2267
2268sub _draw {
2269 my ($self) = @_;
2270 2402
2271 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2272 2404
2273 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2274 2406
… …
2335sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2336sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2337 2469
2338############################################################################# 2470#############################################################################
2339 2471
2340package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2341 2473
2342our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2343 2475
2344use CFClient::OpenGL; 2476use CFClient::OpenGL;
2345 2477
… …
2347 my $class = shift; 2479 my $class = shift;
2348 2480
2349 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2350 fontsize => 1, 2482 fontsize => 1,
2351 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2352 #font => default_font 2485 #font => default_font
2353 @_, 2486 @_,
2354 2487
2355 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2356 par => [], 2489 par => [],
… …
2372 $self->{fontsize} = $fontsize; 2505 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2506 $self->reflow;
2374} 2507}
2375 2508
2376sub size_allocate { 2509sub size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2510 my ($self, $w, $h) = @_;
2378 2511
2379 $self->SUPER::size_allocate ($w, $h, $changed); 2512 $self->SUPER::size_allocate ($w, $h);
2380
2381 return unless $changed;
2382 2513
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2386 2518
2387 $self->reflow; 2519 $self->reflow;
2388} 2520}
2389 2521
2390sub text_size { 2522sub text_size {
… …
2392 2524
2393 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2394 2526
2395 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2398 2531
2399 $layout->size 2532 $layout->size
2400} 2533}
2401 2534
… …
2440 2573
2441 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2442 2575
2443 delete $self->{texture}; 2576 delete $self->{texture};
2444 2577
2445 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447 2580
2448 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2449 my $height = 0; 2582 my $height = 0;
2450 2583
… …
2453 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2454 2587
2455 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2456 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2457 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2458 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2459 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2460 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2461 $_->[1] = $h; 2595 $_->[1] = $h;
2462 } 2596 }
… …
2465 } 2599 }
2466 2600
2467 $self->{height} = $height; 2601 $self->{height} = $height;
2468 2602
2469 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2470 2604
2471 delete $self->{texture}; 2605 delete $self->{texture};
2472 } 2606 }
2473 2607
2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2475 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2476 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2477 2611
2478 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2479 2613
2480 my $y0 = $top; 2614 my $y0 = $top;
… …
2494 my $h = $par->[1]; 2628 my $h = $par->[1];
2495 2629
2496 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2497 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2498 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2500 2635
2501 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2502 2637
2503 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2515sub _draw { 2650sub _draw {
2516 my ($self) = @_; 2651 my ($self) = @_;
2517 2652
2518 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2520 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2522 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2523 2658
2524 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2525 2660
2526} 2661}
… …
2609} 2744}
2610 2745
2611sub set_tooltip_from { 2746sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2613 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2760
2614 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2762 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2764 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2765 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2766 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2767 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 2775
2629 ($w + 4, $h + 4) 2776 ($w + 4, $h + 4)
2630} 2777}
2631 2778
2632sub size_allocate { 2779sub size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2780 my ($self, $w, $h) = @_;
2634 2781
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2782 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638} 2783}
2639 2784
2640sub visibility_change { 2785sub visibility_change {
2641 my ($self, $visible) = @_; 2786 my ($self, $visible) = @_;
2642 2787
… …
2647 or return; 2792 or return;
2648 2793
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2795
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2653 2798
2654 $self->move ($x, $y); 2799 $self->move_abs ($x, $y);
2655 }); 2800 });
2656} 2801}
2657 2802
2658sub _draw { 2803sub _draw {
2659 my ($self) = @_; 2804 my ($self) = @_;
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2891 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 2892
2748 if ($tex) { 2893 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 2894 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 2896 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 2898 glDisable GL_TEXTURE_2D;
2754 } 2899 }
2755} 2900}
2756 2901
… …
2763 $self->SUPER::DESTROY; 2908 $self->SUPER::DESTROY;
2764} 2909}
2765 2910
2766############################################################################# 2911#############################################################################
2767 2912
2768package CFClient::UI::Inventory; 2913package CFClient::UI::Buttonbar;
2769 2914
2770our @ISA = CFClient::UI::ScrolledWindow::; 2915our @ISA = CFClient::UI::HBox::;
2771 2916
2772sub new { 2917# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 2918
2808############################################################################# 2919#############################################################################
2809 2920
2810package CFClient::UI::Menu; 2921package CFClient::UI::Menu;
2811 2922
… …
2823 ); 2934 );
2824 2935
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 2937
2827 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2829 2940
2830 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2831 if (!ref $widget) { 2942 if (!ref $widget) {
2832 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2833 can_hover => 1, 2944 can_hover => 1,
2834 can_events => 1, 2945 can_events => 1,
2835 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2836 } 2948 }
2837 2949
2838 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2839 2951
2840 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
2852 # maybe save $GRAB? must be careful about events... 2964 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2965 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2966 $self->{button} = $ev->{button};
2855 2967
2856 $self->show; 2968 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2969 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2970}
2859 2971
2860sub mouse_motion { 2972sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2973 my ($self, $ev, $x, $y) = @_;
2862 2974
2863 # TODO: should use vbox->find_widget or so 2975 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2976 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 2977 $self->{hover} = $self->{item}{$HOVER};
2978
2979 0
2866} 2980}
2867 2981
2868sub button_up { 2982sub button_up {
2869 my ($self, $ev, $x, $y) = @_; 2983 my ($self, $ev, $x, $y) = @_;
2870 2984
… …
2872 undef $GRAB; 2986 undef $GRAB;
2873 $self->hide; 2987 $self->hide;
2874 2988
2875 $self->_emit ("popdown"); 2989 $self->_emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 2990 $self->{hover}[1]->() if $self->{hover};
2991 } else {
2992 return 0
2993 }
2994
2877 } 2995 1
2878} 2996}
2879 2997
2880############################################################################# 2998#############################################################################
2881 2999
2882package CFClient::UI::Statusbox; 3000package CFClient::UI::Multiplexer;
2883 3001
2884our @ISA = CFClient::UI::VBox::; 3002our @ISA = CFClient::UI::Container::;
2885 3003
2886sub new { 3004sub new {
2887 my $class = shift; 3005 my $class = shift;
2888 3006
2889 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 @_,
3009 );
3010
3011 $self->{current} = $self->{children}[0]
3012 if @{ $self->{children} };
3013
3014 $self
3015}
3016
3017sub add {
3018 my ($self, @widgets) = @_;
3019
3020 $self->SUPER::add (@widgets);
3021
3022 $self->{current} = $self->{children}[0]
3023 if @{ $self->{children} };
3024}
3025
3026sub set_current_page {
3027 my ($self, $page_or_widget) = @_;
3028
3029 my $widget = ref $page_or_widget
3030 ? $page_or_widget
3031 : $self->{children}[$page_or_widget];
3032
3033 $self->{current} = $widget;
3034 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035
3036 $self->_emit (page_changed => $self->{current});
3037
3038 $self->realloc;
3039}
3040
3041sub visible_children {
3042 $_[0]{current}
3043}
3044
3045sub size_request {
3046 my ($self) = @_;
3047
3048 $self->{current}->size_request
3049}
3050
3051sub size_allocate {
3052 my ($self, $w, $h) = @_;
3053
3054 $self->{current}->configure (0, 0, $w, $h);
3055}
3056
3057sub _draw {
3058 my ($self) = @_;
3059
3060 $self->{current}->draw;
3061}
3062
3063#############################################################################
3064
3065package CFClient::UI::Notebook;
3066
3067our @ISA = CFClient::UI::VBox::;
3068
3069sub new {
3070 my $class = shift;
3071
3072 my $self = $class->SUPER::new (
3073 buttonbar => (new CFClient::UI::Buttonbar),
3074 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3075 # filter => # will be put between multiplexer and $self
3076 @_,
3077 );
3078
3079 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3080 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3081
3082 $self
3083}
3084
3085sub add {
3086 my ($self, $title, $widget, $tooltip) = @_;
3087
3088 Scalar::Util::weaken $self;
3089
3090 $self->{buttonbar}->add (new CFClient::UI::Button
3091 markup => $title,
3092 tooltip => $tooltip,
3093 on_activate => sub { $self->set_current_page ($widget) },
3094 );
3095
3096 $self->{multiplexer}->add ($widget);
3097}
3098
3099sub set_current_page {
3100 my ($self, $page) = @_;
3101
3102 $self->{multiplexer}->set_current_page ($page);
3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3104}
3105
3106#############################################################################
3107
3108package CFClient::UI::Combobox;
3109
3110use utf8;
3111
3112our @ISA = CFClient::UI::Button::;
3113
3114sub new {
3115 my $class = shift;
3116
3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3172 fontsize => 0.8,
2891 @_, 3173 @_,
2892 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
2893} 3181}
2894 3182
2895sub reorder { 3183sub reorder {
2896 my ($self) = @_; 3184 my ($self) = @_;
2897 my $NOW = time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
2898 3191
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3194 }
2902 3195
… …
2905 my @items = sort { 3198 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
2909 3202
3203 $self->{timer}->interval (1);
3204
2910 my $count = 10 + 1; 3205 my $count = 10 + 1;
2911 for my $item (@items) { 3206 for my $item (@items) {
2912 last unless --$count; 3207 last unless --$count;
2913 3208
2914 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3213 : $item->{text};
2919 3214
… …
2927 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3228 can_events => 1,
2934 can_hover => 1 3229 can_hover => 1
2935 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
2936 } 3243 }
2937 3244
2938 $self->clear; 3245 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
2940} 3247}
… …
2945 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
2947 3254
2948 return unless $text; 3255 return unless $text;
2949 3256
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3258
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3260
2954 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
… …
2985 3292
2986 $self->reorder; 3293 $self->reorder;
2987 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
2988} 3295}
2989 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
2990############################################################################# 3305#############################################################################
2991 3306
3307package CFClient::UI::Inventory;
3308
3309our @ISA = CFClient::UI::ScrolledWindow::;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3316 @_,
3317 );
3318
3319 $self
3320}
3321
3322sub set_items {
3323 my ($self, $items) = @_;
3324
3325 $self->{child}->clear;
3326 return unless $items;
3327
3328 my @items = sort {
3329 ($a->{type} <=> $b->{type})
3330 or ($a->{name} cmp $b->{name})
3331 } @$items;
3332
3333 $self->{real_items} = \@items;
3334
3335 my $row = 0;
3336 for my $item (@items) {
3337 CFClient::Item::update_widgets $item;
3338
3339 $self->{child}->add (0, $row, $item->{face_widget});
3340 $self->{child}->add (1, $row, $item->{desc_widget});
3341 $self->{child}->add (2, $row, $item->{weight_widget});
3342
3343 $row++;
3344 }
3345}
3346
3347#############################################################################
3348
3349package CFClient::UI::BindEditor;
3350
3351our @ISA = CFClient::UI::FancyFrame::;
3352
3353sub new {
3354 my $class = shift;
3355
3356 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3357
3358 $self->add (my $vb = new CFClient::UI::VBox);
3359
3360
3361 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3362 text => "start recording",
3363 tooltip => "Start/Stops recording of actions."
3364 ."All subsequent actions after the recording started will be captured."
3365 ."The actions are displayed after the record was stopped."
3366 ."To bind the action you have to click on the 'Bind' button",
3367 on_activate => sub {
3368 unless ($self->{recording}) {
3369 $self->start;
3370 } else {
3371 $self->stop;
3372 }
3373 });
3374
3375 $vb->add (new CFClient::UI::Label text => "Actions:");
3376 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3377
3378 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3381 $hb->add (new CFClient::UI::Button
3382 text => "bind",
3383 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3384 on_activate => sub {
3385 $self->ask_for_bind;
3386 });
3387
3388 $vb->add (my $hb = new CFClient::UI::HBox);
3389 $hb->add (new CFClient::UI::Button
3390 text => "ok",
3391 expand => 1,
3392 tooltip => "This closes the binding editor and saves the binding",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->commit;
3396 });
3397
3398 $hb->add (new CFClient::UI::Button
3399 text => "cancel",
3400 expand => 1,
3401 tooltip => "This closes the binding editor without saving",
3402 on_activate => sub {
3403 $self->hide;
3404 $self->{binding_cancel}->()
3405 if $self->{binding_cancel};
3406 });
3407
3408 $self->update_binding_widgets;
3409
3410 $self
3411}
3412
3413sub commit {
3414 my ($self) = @_;
3415 my ($mod, $sym, $cmds) = $self->get_binding;
3416 if ($sym != 0 && @$cmds > 0) {
3417 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3418 ."'. Don't forget 'Save Config'!");
3419 $self->{binding_change}->($mod, $sym, $cmds)
3420 if $self->{binding_change};
3421 } else {
3422 $::STATUSBOX->add ("No action bound, no key or action specified!");
3423 $self->{binding_cancel}->()
3424 if $self->{binding_cancel};
3425 }
3426}
3427
3428sub start {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("stop recording");
3432 $self->{recording} = 1;
3433 $self->clear_command_list;
3434 $::CONN->start_record if $::CONN;
3435}
3436
3437sub stop {
3438 my ($self) = @_;
3439
3440 $self->{rec_btn}->set_text ("start recording");
3441 $self->{recording} = 0;
3442
3443 my $rec;
3444 $rec = $::CONN->stop_record if $::CONN;
3445 return unless ref $rec eq 'ARRAY';
3446 $self->set_command_list ($rec);
3447}
3448
3449
3450sub ask_for_bind_and_commit {
3451 my ($self) = @_;
3452 $self->ask_for_bind (1);
3453}
3454
3455sub ask_for_bind {
3456 my ($self, $commit) = @_;
3457
3458 CFClient::Binder::open_binding_dialog (sub {
3459 my ($mod, $sym) = @_;
3460 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461 $self->update_binding_widgets;
3462 $self->commit if $commit;
3463 });
3464}
3465
3466# $mod and $sym are the modifiers and key symbol
3467# $cmds is a array ref of strings (the commands)
3468# $cb is the callback that is executed on OK
3469# $ccb is the callback that is executed on CANCEL and
3470# when the binding was unsuccessful on OK
3471sub set_binding {
3472 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3473
3474 $self->clear_command_list;
3475 $self->{recording} = 0;
3476 $self->{rec_btn}->set_text ("start recording");
3477
3478 $self->{binding} = [$mod, $sym];
3479 $self->{commands} = $cmds;
3480
3481 $self->{binding_change} = $cb;
3482 $self->{binding_cancel} = $ccb;
3483
3484 $self->update_binding_widgets;
3485}
3486
3487# this is a shortcut method that asks for a binding
3488# and then just binds it.
3489sub do_quick_binding {
3490 my ($self, $cmds) = @_;
3491 $self->set_binding (undef, undef, $cmds, sub {
3492 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493 });
3494 $self->ask_for_bind (1);
3495}
3496
3497sub update_binding_widgets {
3498 my ($self) = @_;
3499 my ($mod, $sym, $cmds) = $self->get_binding;
3500 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3501 $self->set_command_list ($cmds);
3502}
3503
3504sub get_binding {
3505 my ($self) = @_;
3506 return (
3507 $self->{binding}->[0],
3508 $self->{binding}->[1],
3509 [ grep { defined $_ } @{$self->{commands}} ]
3510 );
3511}
3512
3513sub clear_command_list {
3514 my ($self) = @_;
3515 $self->{cmdbox}->clear ();
3516}
3517
3518sub set_command_list {
3519 my ($self, $cmds) = @_;
3520
3521 $self->{cmdbox}->clear ();
3522 $self->{commands} = $cmds;
3523
3524 my $idx = 0;
3525
3526 for (@$cmds) {
3527 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3528
3529 my $i = $idx;
3530 $hb->add (new CFClient::UI::Label text => $_);
3531 $hb->add (new CFClient::UI::Button
3532 text => "delete",
3533 tooltip => "Deletes the action from the record",
3534 on_activate => sub {
3535 $self->{cmdbox}->remove ($hb);
3536 $cmds->[$i] = undef;
3537 });
3538
3539
3540 $idx++
3541 }
3542}
3543
3544#############################################################################
3545
3546package CFClient::UI::SpellList;
3547
3548our @ISA = CFClient::UI::Table::;
3549
3550sub new {
3551 my $class = shift;
3552
3553 my $self = $class->SUPER::new (
3554 binding => [],
3555 commands => [],
3556 @_,
3557 )
3558}
3559
3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => 0, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3568my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3570
3571sub rebuild_spell_list {
3572 my ($self) = @_;
3573
3574 $CFClient::UI::ROOT->on_refresh ($self => sub {
3575 $self->clear;
3576
3577 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3578 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3579 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3580 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3581
3582 my $row = 0;
3583
3584 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3585 my $spell = $self->{spell}{$_};
3586
3587 $row++;
3588
3589 my $spell_cb = sub {
3590 my ($widget, $ev) = @_;
3591
3592 if ($ev->{button} == 1) {
3593 $::CONN->user_send ("cast $spell->{name}");
3594 } elsif ($ev->{button} == 2) {
3595 $::CONN->user_send ("invoke $spell->{name}");
3596 } elsif ($ev->{button} == 3) {
3597 (new CFClient::UI::Menu
3598 items => [
3599 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3600 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3601 ],
3602 )->popup ($ev);
3603 } else {
3604 return 0;
3605 }
3606
3607 1
3608 };
3609
3610 $self->add (0, $row, new CFClient::UI::Face
3611 face => $spell->{face},
3612 can_hover => 1,
3613 can_events => 1,
3614 tooltip => $spell->{message},
3615 on_button_down => $spell_cb,
3616 );
3617
3618 $self->add (1, $row, new CFClient::UI::Label
3619 expand => 1,
3620 text => $spell->{name},
3621 can_hover => 1,
3622 can_events => 1,
3623 tooltip => "$spell->{message}$TOOLTIP_ALL",
3624 on_button_down => $spell_cb,
3625 );
3626
3627 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3628 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3629 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3630 }
3631 });
3632}
3633
3634sub add_spell {
3635 my ($self, $spell) = @_;
3636
3637 $self->{spell}->{$spell->{name}} = $spell;
3638 $self->rebuild_spell_list;
3639}
3640
3641sub remove_spell {
3642 my ($self, $spell) = @_;
3643
3644 delete $self->{spell}->{$spell->{name}};
3645 $self->rebuild_spell_list;
3646}
3647
3648#############################################################################
3649
2992package CFClient::UI::Root; 3650package CFClient::UI::Root;
2993 3651
2994our @ISA = CFClient::UI::Container::; 3652our @ISA = CFClient::UI::Container::;
3653
3654use List::Util qw(min max);
2995 3655
2996use CFClient::OpenGL; 3656use CFClient::OpenGL;
2997 3657
2998sub new { 3658sub new {
2999 my $class = shift; 3659 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3666 Scalar::Util::weaken ($self->{root} = $self);
3007 3667
3008 $self 3668 $self
3009} 3669}
3010 3670
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3671sub size_request {
3028 my ($self) = @_; 3672 my ($self) = @_;
3029 3673
3030 ($self->{w}, $self->{h}) 3674 ($self->{w}, $self->{h})
3031} 3675}
3032 3676
3677sub _to_pixel {
3678 my ($coord, $size, $max) = @_;
3679
3680 $coord =
3681 $coord eq "center" ? ($max - $size) * 0.5
3682 : $coord eq "max" ? $max
3683 : $coord;
3684
3685 $coord = 0 if $coord < 0;
3686 $coord = $max - $size if $coord > $max - $size;
3687
3688 int $coord + 0.5
3689}
3690
3033sub size_allocate { 3691sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3692 my ($self, $w, $h) = @_;
3035 3693
3036 for my $child ($self->children) { 3694 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3695 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3696
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3697 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3698 $Y = $child->{force_y} if exists $child->{force_y};
3041 3699
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3700 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3701 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3702
3050 $child->configure ($X, $Y, $W, $H); 3703 $child->configure ($X, $Y, $W, $H);
3051 } 3704 }
3052} 3705}
3053 3706
… …
3070} 3723}
3071 3724
3072sub add { 3725sub add {
3073 my ($self, @children) = @_; 3726 my ($self, @children) = @_;
3074 3727
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3728 $_->{is_toplevel} = 1
3077 3729 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3730
3083 $self->SUPER::add (@children); 3731 $self->SUPER::add (@children);
3084} 3732}
3085 3733
3086sub remove { 3734sub remove {
3087 my ($self, @children) = @_; 3735 my ($self, @children) = @_;
3088 3736
3089 $self->SUPER::remove (@children); 3737 $self->SUPER::remove (@children);
3738
3739 delete $self->{is_toplevel}
3740 for @children;
3090 3741
3091 while (@children) { 3742 while (@children) {
3092 my $w = pop @children; 3743 my $w = pop @children;
3093 push @children, $w->children; 3744 push @children, $w->children;
3094 $w->set_invisible; 3745 $w->set_invisible;
… …
3114 $_->() 3765 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3766 for values %{delete $self->{refresh_hook}};
3116 } 3767 }
3117 3768
3118 if ($self->{realloc}) { 3769 if ($self->{realloc}) {
3770 my %queue;
3119 my @queue; 3771 my @queue;
3772 my $widget;
3120 3773
3774 outer:
3121 while () { 3775 while () {
3122 if ($self->{realloc}) { 3776 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3777 for $widget (values %$realloc) {
3778 $widget->{visible} or next; # do not resize invisible widgets
3124 3779
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3780 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3781
3782 push @{ $queue[$widget->{visible}] }, $widget;
3783 }
3127 } 3784 }
3128 3785
3786 while () {
3787 @queue or last outer;
3788
3789 $widget = pop @{ $queue[-1] || [] }
3790 and last;
3791
3792 pop @queue;
3793 }
3794
3795 delete $queue{$widget+0};
3796
3797 my ($w, $h) = $widget->size_request;
3798
3799 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3800 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3801
3802 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3803 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3804
3805 $w = $widget->{force_w} if exists $widget->{force_w};
3806 $h = $widget->{force_h} if exists $widget->{force_h};
3807
3808 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3809 || delete $widget->{force_realloc}) {
3810 $widget->{req_w} = $w;
3811 $widget->{req_h} = $h;
3812
3813 $self->{size_alloc}{$widget+0} = $widget;
3814
3815 if (my $parent = $widget->{parent}) {
3816 $self->{realloc}{$parent+0} = $parent
3817 unless $queue{$parent+0};
3818
3819 $parent->{force_size_alloc} = 1;
3820 $self->{size_alloc}{$parent+0} = $parent;
3821 }
3822 }
3823
3824 delete $self->{realloc}{$widget+0};
3825 }
3826 }
3827
3828 while (my $size_alloc = delete $self->{size_alloc}) {
3829 my @queue = sort { $b->{visible} <=> $a->{visible} }
3830 values %$size_alloc;
3831
3832 while () {
3129 my $widget = pop @queue || last; 3833 my $widget = pop @queue || last;
3130 3834
3131 $widget->{visible} or last; # do not resize invisible widgets 3835 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3836
3156 $w = 0 if $w < 0; 3837 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3838 $h = 0 if $h < 0;
3158 3839
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3840 $w = int $w + 0.5;
3841 $h = int $h + 0.5;
3160 3842
3843 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3844 $widget->{old_w} = $widget->{w};
3845 $widget->{old_h} = $widget->{h};
3846
3161 $widget->{w} = $w; 3847 $widget->{w} = $w;
3162 $widget->{h} = $h; 3848 $widget->{h} = $h;
3163 3849
3164 $widget->emit (size_allocate => $w, $h, $changed); 3850 $widget->emit (size_allocate => $w, $h);
3851 }
3165 } 3852 }
3166 } 3853 }
3167 3854
3168 while ($self->{post_alloc_hook}) { 3855 while ($self->{post_alloc_hook}) {
3169 $_->() 3856 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3857 for values %{delete $self->{post_alloc_hook}};
3171 } 3858 }
3859
3172 3860
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3863 glClear GL_COLOR_BUFFER_BIT;
3176 3864
… …
3178 glLoadIdentity; 3866 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3868 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3869 glLoadIdentity;
3182 3870
3871 {
3872 package CFClient::UI::Base;
3873
3874 ($draw_x, $draw_y, $draw_w, $draw_h) =
3875 (0, 0, $self->{w}, $self->{h});
3876 }
3877
3183 $self->_draw; 3878 $self->_draw;
3184} 3879}
3185 3880
3186############################################################################# 3881#############################################################################
3187 3882

Diff Legend

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