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.304 by elmex, Tue Jun 13 11:01:04 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
… …
263 272
264 return unless $self->{visible}; 273 return unless $self->{visible};
265 274
266 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
267 276
277 delete $self->{visible};
268 delete $self->{root}; 278 delete $self->{root};
269 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
… …
558 593
559sub DESTROY { 594sub DESTROY {
560 my ($self) = @_; 595 my ($self) = @_;
561 596
562 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
563 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 601}
565 602
566############################################################################# 603#############################################################################
567 604
568package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
593 630
594 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
596 633
597 glEnable GL_BLEND; 634 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 636 glColor_premultiply @$color;
600 637
601 glBegin GL_QUADS; 638 glBegin GL_QUADS;
602 glVertex 0 , 0; 639 glVertex 0 , 0;
603 glVertex 0 , $h; 640 glVertex 0 , $h;
604 glVertex $w, $h; 641 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
621} 658}
622 659
623sub size_request { 660sub size_request {
624 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
625} 664}
626 665
627sub draw { } 666sub draw { }
628 667
629############################################################################# 668#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
634 673
635sub new { 674sub new {
636 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
637 676
638 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
639 678
640 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
641 children => [], 680 children => [],
642 can_events => 0, 681 can_events => 0,
643 %arg, 682 %arg,
644 ); 683 );
684
645 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
646 687
647 $self 688 $self
648} 689}
649 690
650sub add { 691sub add {
… …
698 $x -= $self->{x}; 739 $x -= $self->{x};
699 $y -= $self->{y}; 740 $y -= $self->{y};
700 741
701 my $res; 742 my $res;
702 743
703 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
705 and return $res; 746 and return $res;
706 } 747 }
707 748
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 770}
730 771
731sub add { 772sub add {
732 my ($self, $child) = @_; 773 my ($self, $child) = @_;
733 774
734 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
737} 777}
738 778
739sub remove { 779sub remove {
740 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
750sub size_request { 790sub size_request {
751 $_[0]{children}[0]->size_request 791 $_[0]{children}[0]->size_request
752} 792}
753 793
754sub size_allocate { 794sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 795 my ($self, $w, $h) = @_;
756 796
757 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
758} 798}
759 799
760############################################################################# 800#############################################################################
801
802# back-buffered drawing area
761 803
762package CFClient::UI::Window; 804package CFClient::UI::Window;
763 805
764our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
765 807
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 820 $self->SUPER::update;
779} 821}
780 822
781sub size_allocate { 823sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 824 my ($self, $w, $h) = @_;
783 825
784 $self->SUPER::size_allocate ($w, $h, $changed); 826 $self->SUPER::size_allocate ($w, $h);
785 $self->update 827 $self->update;
786 if $changed;
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
844 894
845 ($w, $h) 895 ($w, $h)
846} 896}
847 897
848sub size_allocate { 898sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
850 900
901 my $child = $self->child;
902
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 905
854 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
855 $self->update; 907 $self->update;
856} 908}
857 909
… …
893} 945}
894 946
895sub _render { 947sub _render {
896 my ($self) = @_; 948 my ($self) = @_;
897 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 954
900 $self->SUPER::_render; 955 $self->SUPER::_render;
901} 956}
902 957
… …
905package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
906 961
907our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
908 963
909sub new { 964sub new {
910 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
911 968
912 my $self; 969 my $self;
913 970
914 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
915 vertical => 1, 972 vertical => 1,
… …
920 ; 977 ;
921 978
922 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 981 slider => $slider,
925 @_, 982 %arg,
926 ); 983 );
927 984
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
931 987
932 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
933} 995}
934 996
935sub update { 997sub update {
936 my ($self) = @_; 998 my ($self) = @_;
937 999
… …
941 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1005}
944 1006
945sub size_allocate { 1007sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
947 1009
948 $self->SUPER::size_allocate ($w, $h, $changed); 1010 $self->SUPER::size_allocate ($w, $h);
949 1011
950 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1014}
953 1015
… …
976 1038
977 if ($self->{bg}) { 1039 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
979 1041
980 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
983 1045
984 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
985 glVertex 0 , 0; 1047 glVertex 0 , 0;
986 glVertex 0 , $h; 1048 glVertex 0 , $h;
987 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1000 1062
1001our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1002 1064
1003use CFClient::OpenGL; 1065use CFClient::OpenGL;
1004 1066
1005my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1074
1009sub new { 1075sub new {
1010 my $class = shift; 1076 my ($class, %arg) = @_;
1011 1077
1012 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1081 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1082 can_events => 1,
1018 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1019 ); 1086 );
1020 1087
1021 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1089 align => 0,
1023 valign => 1, 1090 valign => 1,
1024 text => $self->{title}, 1091 text => $self->{title},
1025 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1026 1103
1027 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1113}
1029 1114
1030sub border { 1115sub border {
1031 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1032} 1117}
1033 1118
1034sub size_request { 1119sub size_request {
1035 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1036 1127
1037 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1038 1129
1039 ( 1130 (
1040 $w + $self->border * 2, 1131 $w + $self->border * 2,
1041 $h + $self->border * 2, 1132 $h + $self->border * 2,
1042 ) 1133 )
1043} 1134}
1044 1135
1045sub size_allocate { 1136sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1137 my ($self, $w, $h) = @_;
1047 1138
1048 return unless $changed; 1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1049 1144
1145 my $border = $self->border;
1146
1050 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1052 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1057} 1154}
1058 1155
1059sub button_down { 1156sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1061 1158
… …
1077 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1078 1175
1079 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1081 1178
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1183 $self->realloc;
1088 }; 1184 };
1089 1185
1090 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1190 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1096 1192
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1194
1099 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1101 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1105 } 1203 1
1106} 1204}
1107 1205
1108sub button_up { 1206sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1110 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1111 delete $self->{motion}; 1212 !!delete $self->{motion}
1112} 1213}
1113 1214
1114sub mouse_motion { 1215sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1116 1217
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1118} 1221}
1119 1222
1120sub _draw { 1223sub _draw {
1121 my ($self) = @_; 1224 my ($self) = @_;
1122 1225
1226 my $child = $self->{children}[0];
1227
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1230
1126 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1233
1129 my $border = $self->border; 1234 my $border = $self->border;
1130 1235
1131 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1241
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1139 1244
1140 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1248 $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); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1250 }
1151 1251
1152 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1153 1253
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1157} 1265}
1158 1266
1159############################################################################# 1267#############################################################################
1160 1268
1161package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1184 1292
1185 $child->set_parent ($self); 1293 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1187 1295
1188 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1189} 1303}
1190 1304
1191# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1306sub clear {
1193 my ($self) = @_; 1307 my ($self) = @_;
… …
1235 (sum @$hs), 1349 (sum @$hs),
1236 ) 1350 )
1237} 1351}
1238 1352
1239sub size_allocate { 1353sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1354 my ($self, $w, $h) = @_;
1241 1355
1242 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1243 1357
1244 my $req_w = (sum @$ws) || 1; 1358 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1359 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1438 )
1325} 1439}
1326 1440
1327sub size_allocate { 1441sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1442 my ($self, $w, $h) = @_;
1329 1443
1330 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1445 my $children = $self->{children};
1332 1446
1333 my @req; 1447 my @req;
… …
1416 ellipsise => 3, # end 1530 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1418 fontsize => 1, 1532 fontsize => 1,
1419 align => -1, 1533 align => -1,
1420 valign => -1, 1534 valign => -1,
1421 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1422 can_events => 0, 1537 can_events => 0,
1423 %arg 1538 %arg
1424 ); 1539 );
1425 1540
1426 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1453 1568
1454 delete $self->{texture}; 1569 delete $self->{texture};
1455 $self->SUPER::update; 1570 $self->SUPER::update;
1456} 1571}
1457 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1458sub set_text { 1580sub set_text {
1459 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1460 1582
1461 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1463 1585
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1466 1588
1589 delete $self->{size_req};
1467 $self->realloc; 1590 $self->realloc;
1468 $self->update; 1591 $self->update;
1469} 1592}
1470 1593
1471sub set_markup { 1594sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1601
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1481 1604
1605 delete $self->{size_req};
1482 $self->realloc; 1606 $self->realloc;
1483 $self->update; 1607 $self->update;
1484} 1608}
1485 1609
1486sub size_request { 1610sub size_request {
1487 my ($self) = @_; 1611 my ($self) = @_;
1488 1612
1613 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1619
1495 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1496 1621
1497 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1625
1501 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1502 1627
1503 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1505 } 1633 };
1506 1634
1507 ( 1635 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1636}
1512 1637
1513sub size_allocate { 1638sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1639 my ($self, $w, $h) = @_;
1640
1641 delete $self->{ox};
1515 1642
1516 delete $self->{texture} 1643 delete $self->{texture}
1517 if $changed; 1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1645}
1519 1646
1520sub set_fontsize { 1647sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1522 1649
1523 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1651 delete $self->{texture};
1525 1652
1526 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1527} 1662}
1528 1663
1529sub _draw { 1664sub _draw {
1530 my ($self) = @_; 1665 my ($self) = @_;
1531 1666
… …
1537 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1676
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1543 1679
1680 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1547 1684
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1688 };
1554 1689
1555 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1694
1558 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1702 }
1564 1703
1565 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1566} 1705}
1567 1706
… …
1584 can_hover => 1, 1723 can_hover => 1,
1585 can_focus => 1, 1724 can_focus => 1,
1586 valign => 0, 1725 valign => 0,
1587 can_events => 1, 1726 can_events => 1,
1588 #text => ... 1727 #text => ...
1728 #hidden => "*",
1589 @_ 1729 @_
1590 ) 1730 )
1591} 1731}
1592 1732
1593sub _set_text { 1733sub _set_text {
… …
1595 1735
1596 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1597 1737
1598 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1599 1739
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1741 $self->{text} = $text;
1604 1742
1605 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1607 1746
1608 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1609} 1751}
1610 1752
1611sub set_text { 1753sub set_text {
1612 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1613 1755
1614 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1757 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1758}
1619 1759
1620sub get_text { 1760sub get_text {
1621 $_[0]{text} 1761 $_[0]{text}
1622} 1762}
… …
1652 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1655 } elsif ($uni) { 1795 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1657 } 1799 }
1658 1800
1659 $self->_set_text ($text); 1801 $self->_set_text ($text);
1660 1802
1661 $self->realloc; 1803 $self->realloc;
1804
1805 1
1662} 1806}
1663 1807
1664sub focus_in { 1808sub focus_in {
1665 my ($self) = @_; 1809 my ($self) = @_;
1666 1810
… …
1681 utf8::encode $text; 1825 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1683 1827
1684 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1685 $self->update; 1829 $self->update;
1830
1831 1
1686} 1832}
1687 1833
1688sub mouse_motion { 1834sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1691} 1839}
1692 1840
1693sub _draw { 1841sub _draw {
1694 my ($self) = @_; 1842 my ($self) = @_;
1695 1843
1696 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1697 1845
1698 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1701 } else { 1849 } else {
1702 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1703 } 1851 }
1704 1852
1705 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1856 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1772 } else { 1920 } else {
1773 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1774 } 1922 }
1775 1923
1776 } else { 1924 } else {
1777 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1778 } 1928 1
1779
1780} 1929}
1781 1930
1782############################################################################# 1931#############################################################################
1783 1932
1784package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1793 1942
1794sub new { 1943sub new {
1795 my $class = shift; 1944 my $class = shift;
1796 1945
1797 $class->SUPER::new ( 1946 $class->SUPER::new (
1798 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1799 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1801 can_hover => 1, 1951 can_hover => 1,
1802 align => 0, 1952 align => 0,
1803 valign => 0, 1953 valign => 0,
… …
1812 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1813 1963
1814 $self->emit ("activate") 1964 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1817} 1969}
1818 1970
1819sub _draw { 1971sub _draw {
1820 my ($self) = @_; 1972 my ($self) = @_;
1821 1973
1822 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1975
1828 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1831 1979
… …
1836 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1837} 1985}
1838 1986
1839############################################################################# 1987#############################################################################
1840 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1841package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1842 2028
1843our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1844 2030
1845my @tex = 2031my @tex =
… …
1850 2036
1851sub new { 2037sub new {
1852 my $class = shift; 2038 my $class = shift;
1853 2039
1854 $class->SUPER::new ( 2040 $class->SUPER::new (
1855 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1856 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 2047 state => 0,
… …
1864} 2051}
1865 2052
1866sub size_request { 2053sub size_request {
1867 my ($self) = @_; 2054 my ($self) = @_;
1868 2055
1869 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1870} 2057}
1871 2058
1872sub button_down { 2059sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1874 2061
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1879 } 2070 1
1880} 2071}
1881 2072
1882sub _draw { 2073sub _draw {
1883 my ($self) = @_; 2074 my ($self) = @_;
1884 2075
1885 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1886 2077
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2079
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2083
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2085
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2087
… …
2049 2242
2050 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2052 2245
2053 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2251
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2166 vertical => 0, 2360 vertical => 0,
2167 can_hover => 1, 2361 can_hover => 1,
2168 inner_pad => 0.02, 2362 inner_pad => 0.02,
2169 @_ 2363 @_
2170 ); 2364 );
… …
2180sub set_range { 2374sub set_range {
2181 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2182 2376
2183 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2184 2378
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2187} 2383}
2188 2384
2189sub set_value { 2385sub set_value {
2190 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2191 2387
… …
2210} 2406}
2211 2407
2212sub size_request { 2408sub size_request {
2213 my ($self) = @_; 2409 my ($self) = @_;
2214 2410
2215 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2412}
2220 2413
2221sub button_down { 2414sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2223 2416
2224 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2225 2418
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2420
2228 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2229} 2422}
2230 2423
2231sub mouse_motion { 2424sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2233 2426
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2431
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2433
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2242 } 2439 1
2243} 2440}
2244 2441
2245sub update { 2442sub update {
2246 my ($self) = @_; 2443 my ($self) = @_;
2247 2444
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2250 2454
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2253 2457
… …
2259 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2261 2465
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2264 }); 2468 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2469
2272 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2273 2471
2274 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2275 2473
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2338 2536
2339############################################################################# 2537#############################################################################
2340 2538
2341package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2342 2540
2343our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2344 2542
2345use CFClient::OpenGL; 2543use CFClient::OpenGL;
2346 2544
… …
2348 my $class = shift; 2546 my $class = shift;
2349 2547
2350 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2351 fontsize => 1, 2549 fontsize => 1,
2352 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2353 #font => default_font 2552 #font => default_font
2354 @_, 2553 @_,
2355 2554
2356 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2357 par => [], 2556 par => [],
… …
2373 $self->{fontsize} = $fontsize; 2572 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2573 $self->reflow;
2375} 2574}
2376 2575
2377sub size_allocate { 2576sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2577 my ($self, $w, $h) = @_;
2379 2578
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2579 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2580
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2585
2388 $self->reflow; 2586 $self->reflow;
2389} 2587}
2390 2588
2391sub text_size { 2589sub text_size {
… …
2393 2591
2394 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2395 2593
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2399 2598
2400 $layout->size 2599 $layout->size
2401} 2600}
2402 2601
… …
2441 2640
2442 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2443 2642
2444 delete $self->{texture}; 2643 delete $self->{texture};
2445 2644
2446 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2647
2449 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2649 my $height = 0;
2451 2650
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2654
2456 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2459 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2662 $_->[1] = $h;
2463 } 2663 }
… …
2466 } 2666 }
2467 2667
2468 $self->{height} = $height; 2668 $self->{height} = $height;
2469 2669
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2471 2671
2472 delete $self->{texture}; 2672 delete $self->{texture};
2473 } 2673 }
2474 2674
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2478 2678
2479 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2480 2680
2481 my $y0 = $top; 2681 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2695 my $h = $par->[1];
2496 2696
2497 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2500 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2501 2702
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2704
2504 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2717sub _draw {
2517 my ($self) = @_; 2718 my ($self) = @_;
2518 2719
2519 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2524 2725
2525 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2526 2727
2527} 2728}
… …
2610} 2811}
2611 2812
2612sub set_tooltip_from { 2813sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2614 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2615 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2831 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2833 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2842
2630 ($w + 4, $h + 4) 2843 ($w + 4, $h + 4)
2631} 2844}
2632 2845
2633sub size_allocate { 2846sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2847 my ($self, $w, $h) = @_;
2635 2848
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2850}
2640 2851
2641sub visibility_change { 2852sub visibility_change {
2642 my ($self, $visible) = @_; 2853 my ($self, $visible) = @_;
2643 2854
… …
2648 or return; 2859 or return;
2649 2860
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2862
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2654 2865
2655 $self->move ($x, $y); 2866 $self->move_abs ($x, $y);
2656 }); 2867 });
2657} 2868}
2658 2869
2659sub _draw { 2870sub _draw {
2660 my ($self) = @_; 2871 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2959
2749 if ($tex) { 2960 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2755 } 2966 }
2756} 2967}
2757 2968
2758sub DESTROY { 2969sub destroy {
2759 my ($self) = @_; 2970 my ($self) = @_;
2760 2971
2761 $self->{timer}->cancel 2972 $self->{timer}->cancel
2762 if $self->{timer}; 2973 if $self->{timer};
2763 2974
2764 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2765} 2976}
2766 2977
2767############################################################################# 2978#############################################################################
2768 2979
2769package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2770 2981
2771our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2772 2983
2773sub new { 2984# 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 2985
2809############################################################################# 2986#############################################################################
2810 2987
2811package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2812 2989
… …
2824 ); 3001 );
2825 3002
2826 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2827 3004
2828 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2829 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2830 3007
2831 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2832 if (!ref $widget) { 3009 if (!ref $widget) {
2833 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2834 can_hover => 1, 3011 can_hover => 1,
2835 can_events => 1, 3012 can_events => 1,
2836 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2837 } 3015 }
2838 3016
2839 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2840 3018
2841 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2853 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 3032 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2856 3034
2857 $self->show; 3035 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 3037}
2860 3038
2861sub mouse_motion { 3039sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2863 3041
2864 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2867} 3047}
2868 3048
2869sub button_up { 3049sub button_up {
2870 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2871 3051
… …
2873 undef $GRAB; 3053 undef $GRAB;
2874 $self->hide; 3054 $self->hide;
2875 3055
2876 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2878 } 3062 1
2879} 3063}
2880 3064
2881############################################################################# 3065#############################################################################
2882 3066
2883package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2884 3068
2885our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2886 3070
2887sub new { 3071sub new {
2888 my $class = shift; 3072 my $class = shift;
2889 3073
2890 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3239 fontsize => 0.8,
2892 @_, 3240 @_,
2893 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2894} 3248}
2895 3249
2896sub reorder { 3250sub reorder {
2897 my ($self) = @_; 3251 my ($self) = @_;
2898 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2899 3258
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3261 }
2903 3262
… …
2906 my @items = sort { 3265 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2910 3269
3270 $self->{timer}->interval (1);
3271
2911 my $count = 10 + 1; 3272 my $count = 10 + 1;
2912 for my $item (@items) { 3273 for my $item (@items) {
2913 last unless --$count; 3274 last unless --$count;
2914 3275
2915 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3280 : $item->{text};
2920 3281
… …
2928 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3295 can_events => 1,
2935 can_hover => 1 3296 can_hover => 1
2936 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2937 } 3310 }
2938 3311
2939 $self->clear; 3312 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2941} 3314}
… …
2946 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2948 3321
2949 return unless $text; 3322 return unless $text;
2950 3323
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3325
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3327
2955 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2957 $item->{count}++; 3330 $item->{count}++;
2958 } else { 3331 } else {
2959 $item->{count} = 1; 3332 $item->{count} = 1;
2960 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2961 } 3334 }
2962 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2963 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2964 delete $item->{label}; 3337 delete $item->{label};
2965 } else { 3338 } else {
2966 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2967 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2986 3359
2987 $self->reorder; 3360 $self->reorder;
2988 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2989} 3362}
2990 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2991############################################################################# 3372#############################################################################
2992 3373
3374package CFClient::UI::Inventory;
3375
3376our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378sub new {
3379 my $class = shift;
3380
3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
2993package CFClient::UI::Root; 3736package CFClient::UI::Root;
2994 3737
2995our @ISA = CFClient::UI::Container::; 3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
2996 3741
2997use CFClient::OpenGL; 3742use CFClient::OpenGL;
2998 3743
2999sub new { 3744sub new {
3000 my $class = shift; 3745 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3752 Scalar::Util::weaken ($self->{root} = $self);
3008 3753
3009 $self 3754 $self
3010} 3755}
3011 3756
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 { 3757sub size_request {
3029 my ($self) = @_; 3758 my ($self) = @_;
3030 3759
3031 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3032} 3761}
3033 3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
3775}
3776
3034sub size_allocate { 3777sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3778 my ($self, $w, $h) = @_;
3036 3779
3037 for my $child ($self->children) { 3780 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3782
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3042 3785
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3787 $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 3788
3051 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3052 } 3790 }
3053} 3791}
3054 3792
… …
3071} 3809}
3072 3810
3073sub add { 3811sub add {
3074 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3075 3813
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3078 3815 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3816
3084 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3085} 3818}
3086 3819
3087sub remove { 3820sub remove {
3088 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3089 3822
3090 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3091 3827
3092 while (@children) { 3828 while (@children) {
3093 my $w = pop @children; 3829 my $w = pop @children;
3094 push @children, $w->children; 3830 push @children, $w->children;
3095 $w->set_invisible; 3831 $w->set_invisible;
… …
3115 $_->() 3851 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3117 } 3853 }
3118 3854
3119 if ($self->{realloc}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3120 my @queue; 3857 my @queue;
3858 my $widget;
3121 3859
3860 outer:
3122 while () { 3861 while () {
3123 if ($self->{realloc}) { 3862 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3125 3865
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3128 } 3870 }
3129 3871
3872 while () {
3873 @queue or last outer;
3874
3875 $widget = pop @{ $queue[-1] || [] }
3876 and last;
3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3896 $widget->{req_w} = $w;
3897 $widget->{req_h} = $h;
3898
3899 $self->{size_alloc}{$widget+0} = $widget;
3900
3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3911 }
3912 }
3913
3914 while (my $size_alloc = delete $self->{size_alloc}) {
3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3916 values %$size_alloc;
3917
3918 while () {
3130 my $widget = pop @queue || last; 3919 my $widget = pop @queue || last;
3131 3920
3132 $widget->{visible} or last; # do not resize invisible widgets 3921 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 3922
3157 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3159 3925
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3161 3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3162 $widget->{w} = $w; 3933 $widget->{w} = $w;
3163 $widget->{h} = $h; 3934 $widget->{h} = $h;
3164 3935
3165 $widget->emit (size_allocate => $w, $h, $changed); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3166 } 3938 }
3167 } 3939 }
3168 3940
3169 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3170 $_->() 3942 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3172 } 3944 }
3945
3173 3946
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3177 3950
… …
3179 glLoadIdentity; 3952 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3955 glLoadIdentity;
3183 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3184 $self->_draw; 3964 $self->_draw;
3185} 3965}
3186 3966
3187############################################################################# 3967#############################################################################
3188 3968

Diff Legend

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