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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.286 by root, Mon Jun 5 03:48:49 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) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 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;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 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
176 $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.]+$/;
177 $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};
178 $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};
179 $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.]+$/;
180 $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};
181 $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
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $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};
219 $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};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
275 delete $self->{visible}; 278 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->focus_out;
284 287
285 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
309 312
310 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
311 if $self->{parent}; 314 if $self->{parent};
312} 315}
313 316
314sub move { 317sub move_abs {
315 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
316 319
317 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
318 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
319 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
320 323
321 $self->update; 324 $self->update;
322} 325}
323 326
324sub set_size { 327sub set_size {
325 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
326 329
327 $self->{def_w} = $w; 330 $self->{force_w} = $w;
328 $self->{def_h} = $h; 331 $self->{force_h} = $h;
329 332
330 $self->realloc; 333 $self->realloc;
331} 334}
332 335
333sub size_request { 336sub size_request {
… …
337 340
338sub configure { 341sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
340 343
341 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
344 349
345 # use alignment to adjust x, y 350 # use alignment to adjust x, y
346 351
347 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 354 }
352 355
353 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 357 $self->{x} = $x;
355 $self->{y} = $y; 358 $self->{y} = $y;
356 $self->update; 359 $self->update;
357 } 360 }
358 361
359 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 363 return unless $self->{visible};
361 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
363 } 369 }
364} 370}
365 371
366sub size_allocate { 372sub size_allocate {
367 # nothing to be done 373 # nothing to be done
368} 374}
369 375
370sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
371} 382}
372 383
373sub set_max_size { 384sub set_max_size {
374 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
375 386
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
378} 391}
379 392
380sub set_tooltip { 393sub set_tooltip {
381 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
382 395
… …
387 400
388 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
389 402
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 406 }
394} 407}
395 408
396# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
397sub coord2local { 410sub coord2local {
… …
434 447
435 $::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
436 unless $FOCUS; 449 unless $FOCUS;
437} 450}
438 451
439sub mouse_motion { } 452sub mouse_motion { 0 }
440sub button_up { } 453sub button_up { 0 }
441sub key_down { } 454sub key_down { 0 }
442sub key_up { } 455sub key_up { 0 }
443 456
444sub button_down { 457sub button_down {
445 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
446 459
447 $self->focus_in; 460 $self->focus_in;
448}
449 461
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455 464
456sub find_widget { 465sub find_widget {
457 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
458 467
459 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
467 476
468sub set_parent { 477sub set_parent {
469 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
470 479
471 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476} 482}
477 483
478sub connect { 484sub connect {
479 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
480 486
… …
499} 505}
500 506
501sub realloc { 507sub realloc {
502 my ($self) = @_; 508 my ($self) = @_;
503 509
504 return unless $self->{visible}; 510 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
507 512
508 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
510} 519}
511 520
512sub update { 521sub update {
513 my ($self) = @_; 522 my ($self) = @_;
514 523
515 $self->{parent}->update 524 $self->{parent}->update
516 if $self->{parent}; 525 if $self->{parent};
517} 526}
518 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
519sub draw { 539sub draw {
520 my ($self) = @_; 540 my ($self) = @_;
521 541
522 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);
523 553
524 glPushMatrix; 554 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 556
529 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 559 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 561 glBegin GL_QUADS;
536 glVertex $x , $y; 562 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
540 glEnd; 566 glEnd;
541 glDisable GL_BLEND; 567 glDisable GL_BLEND;
542 } 568 }
543 569
544 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 571 glPushMatrix;
546 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 575 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
553 glEnd; 579 glEnd;
554 glPopMatrix; 580 glPopMatrix;
555 #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;
556 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
557} 586}
558 587
559sub _draw { 588sub _draw {
560 my ($self) = @_; 589 my ($self) = @_;
561 590
… …
599 628
600 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
602 631
603 glEnable GL_BLEND; 632 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 634 glColor_premultiply @$color;
606 635
607 glBegin GL_QUADS; 636 glBegin GL_QUADS;
608 glVertex 0 , 0; 637 glVertex 0 , 0;
609 glVertex 0 , $h; 638 glVertex 0 , $h;
610 glVertex $w, $h; 639 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
627} 656}
628 657
629sub size_request { 658sub size_request {
630 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
631} 662}
632 663
633sub draw { } 664sub draw { }
634 665
635############################################################################# 666#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
640 671
641sub new { 672sub new {
642 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
643 674
644 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
645 676
646 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
647 children => [], 678 children => [],
648 can_events => 0, 679 can_events => 0,
649 %arg, 680 %arg,
650 ); 681 );
682
651 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
652 685
653 $self 686 $self
654} 687}
655 688
656sub add { 689sub add {
… …
704 $x -= $self->{x}; 737 $x -= $self->{x};
705 $y -= $self->{y}; 738 $y -= $self->{y};
706 739
707 my $res; 740 my $res;
708 741
709 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
711 and return $res; 744 and return $res;
712 } 745 }
713 746
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756sub size_request { 789sub size_request {
757 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
758} 791}
759 792
760sub size_allocate { 793sub size_allocate {
761 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
762 795
763 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
764} 797}
765 798
766############################################################################# 799#############################################################################
800
801# back-buffered drawing area
767 802
768package CFClient::UI::Window; 803package CFClient::UI::Window;
769 804
770our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
771 806
… …
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 819 $self->SUPER::update;
785} 820}
786 821
787sub size_allocate { 822sub size_allocate {
788 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
789 824
790 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
791 $self->update 826 $self->update;
792 if $changed;
793} 827}
794 828
795sub _render { 829sub _render {
830 my ($self) = @_;
831
796 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
797} 833}
798 834
799sub render_child { 835sub render_child {
800 my ($self) = @_; 836 my ($self) = @_;
801 837
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
805 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
806 $self->_render; 849 $self->_render;
807 }; 850 };
808} 851}
809 852
810sub _draw { 853sub _draw {
811 my ($self) = @_; 854 my ($self) = @_;
812 855
813 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
814 857
815 my $tex = $self->{texture} 858 my $tex = $self->{texture}
816 or return; 859 or return;
817 860
818 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
821 864
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 866
824 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
825} 868}
… …
841} 884}
842 885
843sub size_request { 886sub size_request {
844 my ($self) = @_; 887 my ($self) = @_;
845 888
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 890
848 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
850 893
851 ($w, $h) 894 ($w, $h)
852} 895}
853 896
854sub size_allocate { 897sub size_allocate {
855 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
856 899
900 my $child = $self->child;
901
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 904
860 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
861 $self->update; 906 $self->update;
862} 907}
863 908
… …
899} 944}
900 945
901sub _render { 946sub _render {
902 my ($self) = @_; 947 my ($self) = @_;
903 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 953
906 $self->SUPER::_render; 954 $self->SUPER::_render;
907} 955}
908 956
… …
911package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
912 960
913our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
914 962
915sub new { 963sub new {
916 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
917 967
918 my $self; 968 my $self;
919 969
920 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
921 vertical => 1, 971 vertical => 1,
… …
926 ; 976 ;
927 977
928 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 980 slider => $slider,
931 @_, 981 %arg,
932 ); 982 );
933 983
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
937 986
938 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
939} 994}
940 995
941sub update { 996sub update {
942 my ($self) = @_; 997 my ($self) = @_;
943 998
… …
947 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1004}
950 1005
951sub size_allocate { 1006sub size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
953 1008
954 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
955 1010
956 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1013}
959 1014
… …
982 1037
983 if ($self->{bg}) { 1038 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
985 1040
986 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
989 1044
990 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
991 glVertex 0 , 0; 1046 glVertex 0 , 0;
992 glVertex 0 , $h; 1047 glVertex 0 , $h;
993 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1006 1061
1007our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1008 1063
1009use CFClient::OpenGL; 1064use CFClient::OpenGL;
1010 1065
1011my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1073
1015sub new { 1074sub new {
1016 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1017 1078
1018 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1082 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1083 can_events => 1,
1024 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1025 ); 1087 );
1026 1088
1027 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1090 align => 0,
1029 valign => 1, 1091 valign => 1,
1030 text => $self->{title}, 1092 text => $title,
1031 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1032 1095
1033 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1104}
1035 1105
1036sub border { 1106sub border {
1037 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1038} 1108}
1039 1109
1040sub size_request { 1110sub size_request {
1041 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1042 1115
1043 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1044 1117
1045 ( 1118 (
1046 $w + $self->border * 2, 1119 $w + $self->border * 2,
1047 $h + $self->border * 2, 1120 $h + $self->border * 2,
1048 ) 1121 )
1049} 1122}
1050 1123
1051sub size_allocate { 1124sub size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1053 1126
1054 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1055 1132
1133 my $border = $self->border;
1134
1056 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1058 1137
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1063} 1139}
1064 1140
1065sub button_down { 1141sub button_down {
1066 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1067 1143
… …
1083 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1084 1160
1085 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1087 1163
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1168 $self->realloc;
1094 }; 1169 };
1095 1170
1096 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1175 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1102 1177
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1179
1105 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1107 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1111 } 1188 1
1112} 1189}
1113 1190
1114sub button_up { 1191sub button_up {
1115 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1116 1193
1117 delete $self->{motion}; 1194 !!delete $self->{motion}
1118} 1195}
1119 1196
1120sub mouse_motion { 1197sub mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1122 1199
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1124} 1203}
1125 1204
1126sub _draw { 1205sub _draw {
1127 my ($self) = @_; 1206 my ($self) = @_;
1128 1207
1208 my $child = $self->{children}[0];
1209
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1212
1132 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1215
1135 my $border = $self->border; 1216 my $border = $self->border;
1136 1217
1137 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1223
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1145 1226
1146 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1232 }
1157 1233
1158 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1159 1235
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1163} 1242}
1164 1243
1165############################################################################# 1244#############################################################################
1166 1245
1167package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1241 (sum @$hs), 1320 (sum @$hs),
1242 ) 1321 )
1243} 1322}
1244 1323
1245sub size_allocate { 1324sub size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1247 1326
1248 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1249 1328
1250 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1409 )
1331} 1410}
1332 1411
1333sub size_allocate { 1412sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1335 1414
1336 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1416 my $children = $self->{children};
1338 1417
1339 my @req; 1418 my @req;
… …
1422 ellipsise => 3, # end 1501 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1424 fontsize => 1, 1503 fontsize => 1,
1425 align => -1, 1504 align => -1,
1426 valign => -1, 1505 valign => -1,
1427 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1428 can_events => 0, 1508 can_events => 0,
1429 %arg 1509 %arg
1430 ); 1510 );
1431 1511
1432 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1459 1539
1460 delete $self->{texture}; 1540 delete $self->{texture};
1461 $self->SUPER::update; 1541 $self->SUPER::update;
1462} 1542}
1463 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1464sub set_text { 1551sub set_text {
1465 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1466 1553
1467 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1469 1556
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1472 1560
1473 $self->realloc; 1561 $self->realloc;
1562 $self->update;
1474} 1563}
1475 1564
1476sub set_markup { 1565sub set_markup {
1477 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1478 1567
… …
1481 1570
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1572
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1486 1576
1487 $self->realloc; 1577 $self->realloc;
1578 $self->update;
1488} 1579}
1489 1580
1490sub size_request { 1581sub size_request {
1491 my ($self) = @_; 1582 my ($self) = @_;
1492 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1592
1499 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1500 1594
1501 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1598
1505 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1506 1600
1507 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1509 } 1603 }
1510 1604
1605 ($w, $h)
1511 ( 1606 }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1607}
1516 1608
1517sub size_allocate { 1609sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1519 1613
1520 delete $self->{texture} 1614 delete $self->{texture}
1521 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1616}
1523 1617
1524sub set_fontsize { 1618sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1526 1620
… …
1541 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1639
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1547 1642
1643 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1551 1647
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1651 };
1558 1652
1559 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1655
… …
1599 1693
1600 delete $self->{cur_h}; 1694 delete $self->{cur_h};
1601 1695
1602 return if $self->{text} eq $text; 1696 return if $self->{text} eq $text;
1603 1697
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1698 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1699 $self->{text} = $text;
1608 1700
1609 $text =~ s/./*/g if $self->{hidden}; 1701 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1702 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h};
1611 1704
1612 $self->_emit (changed => $self->{text}); 1705 $self->_emit (changed => $self->{text});
1706
1707 $self->realloc;
1708 $self->update;
1613} 1709}
1614 1710
1615sub set_text { 1711sub set_text {
1616 my ($self, $text) = @_; 1712 my ($self, $text) = @_;
1617 1713
1618 $self->{cursor} = length $text; 1714 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1715 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1716}
1623 1717
1624sub get_text { 1718sub get_text {
1625 $_[0]{text} 1719 $_[0]{text}
1626} 1720}
… …
1656 $self->{cursor} = length $text; 1750 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1751 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1752 $self->_emit ('escape');
1659 } elsif ($uni) { 1753 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1754 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else {
1756 return 0;
1661 } 1757 }
1662 1758
1663 $self->_set_text ($text); 1759 $self->_set_text ($text);
1664 1760
1665 $self->realloc; 1761 $self->realloc;
1762
1763 1
1666} 1764}
1667 1765
1668sub focus_in { 1766sub focus_in {
1669 my ($self) = @_; 1767 my ($self) = @_;
1670 1768
… …
1685 utf8::encode $text; 1783 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1784 $self->{cursor} = length substr $text, 0, $idx;
1687 1785
1688 $self->_set_text ($self->{text}); 1786 $self->_set_text ($self->{text});
1689 $self->update; 1787 $self->update;
1788
1789 1
1690} 1790}
1691 1791
1692sub mouse_motion { 1792sub mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1793 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795
1796 0
1695} 1797}
1696 1798
1697sub _draw { 1799sub _draw {
1698 my ($self) = @_; 1800 my ($self) = @_;
1699 1801
1700 local $self->{fg} = $self->{fg}; 1802 local $self->{fg} = $self->{fg};
1701 1803
1702 if ($FOCUS == $self) { 1804 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1805 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1806 $self->{fg} = $self->{active_fg};
1705 } else { 1807 } else {
1706 glColor @{$self->{bg}}; 1808 glColor_premultiply @{$self->{bg}};
1707 } 1809 }
1708 1810
1709 glEnable GL_BLEND; 1811 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1812 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1814 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1815 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1816 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1817 glVertex $self->{w}, 0;
… …
1776 } else { 1878 } else {
1777 $self->set_text ($self->{history_saveback}); 1879 $self->set_text ($self->{history_saveback});
1778 } 1880 }
1779 1881
1780 } else { 1882 } else {
1781 $self->SUPER::key_down ($ev); 1883 return $self->SUPER::key_down ($ev)
1884 }
1885
1782 } 1886 1
1783
1784} 1887}
1785 1888
1786############################################################################# 1889#############################################################################
1787 1890
1788package CFClient::UI::Button; 1891package CFClient::UI::Button;
… …
1797 1900
1798sub new { 1901sub new {
1799 my $class = shift; 1902 my $class = shift;
1800 1903
1801 $class->SUPER::new ( 1904 $class->SUPER::new (
1802 padding => 4, 1905 padding_x => 4,
1906 padding_y => 4,
1803 fg => [1, 1, 1], 1907 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1908 active_fg => [0, 0, 1],
1805 can_hover => 1, 1909 can_hover => 1,
1806 align => 0, 1910 align => 0,
1807 valign => 0, 1911 valign => 0,
… …
1816 my ($self, $ev, $x, $y) = @_; 1920 my ($self, $ev, $x, $y) = @_;
1817 1921
1818 $self->emit ("activate") 1922 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1923 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1924 && $y >= 0 && $y < $self->{h};
1925
1926 1
1821} 1927}
1822 1928
1823sub _draw { 1929sub _draw {
1824 my ($self) = @_; 1930 my ($self) = @_;
1825 1931
1826 local $self->{fg} = $self->{fg}; 1932 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1933
1832 glEnable GL_TEXTURE_2D; 1934 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1936 glColor 0, 0, 0, 1;
1835 1937
… …
1854 1956
1855sub new { 1957sub new {
1856 my $class = shift; 1958 my $class = shift;
1857 1959
1858 $class->SUPER::new ( 1960 $class->SUPER::new (
1859 padding => 2, 1961 padding_x => 2,
1962 padding_y => 2,
1860 fg => [1, 1, 1], 1963 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1964 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1965 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1966 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1967 state => 0,
… …
1868} 1971}
1869 1972
1870sub size_request { 1973sub size_request {
1871 my ($self) = @_; 1974 my ($self) = @_;
1872 1975
1873 ($self->{padding} * 2 + 6) x 2 1976 (6) x 2
1874} 1977}
1875 1978
1876sub button_down { 1979sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1980 my ($self, $ev, $x, $y) = @_;
1878 1981
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 1984 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 1985 $self->_emit (changed => $self->{state});
1986 } else {
1987 return 0
1988 }
1989
1883 } 1990 1
1884} 1991}
1885 1992
1886sub _draw { 1993sub _draw {
1887 my ($self) = @_; 1994 my ($self) = @_;
1888 1995
1889 $self->SUPER::_draw; 1996 $self->SUPER::_draw;
1890 1997
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1998 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 1999
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2000 my ($w, $h) = @$self{qw(w h)};
2001
2002 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2003
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2004 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2005
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2006 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2007
… …
2053 2162
2054 my $h1 = $self->{h} * (1 - $ycut1); 2163 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2164 my $h2 = $self->{h} * (1 - $ycut2);
2056 2165
2057 glEnable GL_BLEND; 2166 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2171
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2172 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2173 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2273 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2274 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2275 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2276 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2277 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2278 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2279 min_h => $::WIDTH / 80,
2170 vertical => 0, 2280 vertical => 0,
2171 can_hover => 1, 2281 can_hover => 1,
2172 inner_pad => 0.02, 2282 inner_pad => 0.02,
2173 @_ 2283 @_
2174 ); 2284 );
… …
2214} 2324}
2215 2325
2216sub size_request { 2326sub size_request {
2217 my ($self) = @_; 2327 my ($self) = @_;
2218 2328
2219 my $w = $self->{req_w}; 2329 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2330}
2224 2331
2225sub button_down { 2332sub button_down {
2226 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2227 2334
2228 $self->SUPER::button_down ($ev, $x, $y); 2335 $self->SUPER::button_down ($ev, $x, $y);
2229 2336
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2338
2232 $self->mouse_motion ($ev, $x, $y); 2339 $self->mouse_motion ($ev, $x, $y)
2233} 2340}
2234 2341
2235sub mouse_motion { 2342sub mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2237 2344
… …
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2348 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2349
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2350 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2351
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2352 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2353 } else {
2354 return 0;
2355 }
2356
2246 } 2357 1
2247} 2358}
2248 2359
2249sub update { 2360sub update {
2250 my ($self) = @_; 2361 my ($self) = @_;
2251 2362
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2363 delete $self->{knob_w};
2364 $self->SUPER::update;
2365}
2366
2367sub _draw {
2368 my ($self) = @_;
2369
2370 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2371 $self->set_value ($self->{range}[0]);
2254 2372
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2373 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2374 my $range = ($hi - $page - $lo) || 1e-100;
2257 2375
… …
2263 $value = ($value - $lo) / $range; 2381 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2382 $value = $value * $self->{scale} + $self->{offset};
2265 2383
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2384 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2385 $self->{knob_w} = $knob_w;
2268 }); 2386 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2387
2276 $self->SUPER::_draw (); 2388 $self->SUPER::_draw ();
2277 2389
2278 glScale $self->{w}, $self->{h}; 2390 glScale $self->{w}, $self->{h};
2279 2391
… …
2377 $self->{fontsize} = $fontsize; 2489 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2490 $self->reflow;
2379} 2491}
2380 2492
2381sub size_allocate { 2493sub size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2494 my ($self, $w, $h) = @_;
2383 2495
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2496 $self->SUPER::size_allocate ($w, $h);
2385
2386 return unless $changed;
2387 2497
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2498 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2500 $self->{layout}->set_width ($self->{children}[0]{w});
2391 2501
… …
2475 2585
2476 delete $self->{texture}; 2586 delete $self->{texture};
2477 } 2587 }
2478 2588
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2590 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2591 glClear GL_COLOR_BUFFER_BIT;
2482 2592
2483 my $top = int $self->{children}[1]{range}[0]; 2593 my $top = int $self->{children}[1]{range}[0];
2484 2594
2485 my $y0 = $top; 2595 my $y0 = $top;
… …
2520sub _draw { 2630sub _draw {
2521 my ($self) = @_; 2631 my ($self) = @_;
2522 2632
2523 glEnable GL_TEXTURE_2D; 2633 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2634 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2635 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2528 2638
2529 $self->{children}[1]->draw; 2639 $self->{children}[1]->draw;
2530 2640
2531} 2641}
… …
2614} 2724}
2615 2725
2616sub set_tooltip_from { 2726sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2727 my ($self, $widget) = @_;
2618 2728
2729 my $tooltip = $widget->{tooltip};
2730
2731 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}";
2736 }
2737
2619 $self->add (new CFClient::UI::Label 2738 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2739 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2741 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2742 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2743 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2744 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2752
2634 ($w + 4, $h + 4) 2753 ($w + 4, $h + 4)
2635} 2754}
2636 2755
2637sub size_allocate { 2756sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2757 my ($self, $w, $h) = @_;
2639 2758
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2759 $self->SUPER::size_allocate ($w - 4, $h - 4);
2760}
2761
2762sub visibility_change {
2763 my ($self, $visible) = @_;
2764
2765 return unless $visible;
2766
2767 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner}
2769 or return;
2770
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH;
2775
2776 $self->move_abs ($x, $y);
2777 });
2643} 2778}
2644 2779
2645sub _draw { 2780sub _draw {
2646 my ($self) = @_; 2781 my ($self) = @_;
2647 2782
… …
2664 glVertex $w, $h; 2799 glVertex $w, $h;
2665 glVertex $w, 0; 2800 glVertex $w, 0;
2666 glEnd; 2801 glEnd;
2667 2802
2668 glTranslate 2 - 0.375, 2 - 0.375; 2803 glTranslate 2 - 0.375, 2 - 0.375;
2804
2669 $self->SUPER::_draw; 2805 $self->SUPER::_draw;
2670} 2806}
2671 2807
2672############################################################################# 2808#############################################################################
2673 2809
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 2869
2734 if ($tex) { 2870 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 2871 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 2873 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 2875 glDisable GL_TEXTURE_2D;
2740 } 2876 }
2741} 2877}
2742 2878
… …
2749 $self->SUPER::DESTROY; 2885 $self->SUPER::DESTROY;
2750} 2886}
2751 2887
2752############################################################################# 2888#############################################################################
2753 2889
2754package CFClient::UI::Inventory; 2890package CFClient::UI::Buttonbar;
2755 2891
2756our @ISA = CFClient::UI::ScrolledWindow::; 2892our @ISA = CFClient::UI::HBox::;
2757 2893
2758sub new { 2894# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 2895
2794############################################################################# 2896#############################################################################
2795 2897
2796package CFClient::UI::Menu; 2898package CFClient::UI::Menu;
2797 2899
… …
2838 # maybe save $GRAB? must be careful about events... 2940 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 2941 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 2942 $self->{button} = $ev->{button};
2841 2943
2842 $self->show; 2944 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 2946}
2845 2947
2846sub mouse_motion { 2948sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2848 2950
2849 # TODO: should use vbox->find_widget or so 2951 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 2953 $self->{hover} = $self->{item}{$HOVER};
2954
2955 0
2852} 2956}
2853 2957
2854sub button_up { 2958sub button_up {
2855 my ($self, $ev, $x, $y) = @_; 2959 my ($self, $ev, $x, $y) = @_;
2856 2960
… …
2858 undef $GRAB; 2962 undef $GRAB;
2859 $self->hide; 2963 $self->hide;
2860 2964
2861 $self->_emit ("popdown"); 2965 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 2966 $self->{hover}[1]->() if $self->{hover};
2967 } else {
2968 return 0
2969 }
2970
2863 } 2971 1
2864} 2972}
2865 2973
2866############################################################################# 2974#############################################################################
2867 2975
2868package CFClient::UI::Statusbox; 2976package CFClient::UI::Multiplexer;
2869 2977
2870our @ISA = CFClient::UI::VBox::; 2978our @ISA = CFClient::UI::Container::;
2871 2979
2872sub new { 2980sub new {
2873 my $class = shift; 2981 my $class = shift;
2874 2982
2875 $class->SUPER::new ( 2983 my $self = $class->SUPER::new (
2984 @_,
2985 );
2986
2987 $self->{current} = $self->{children}[0]
2988 if @{ $self->{children} };
2989
2990 $self
2991}
2992
2993sub add {
2994 my ($self, @widgets) = @_;
2995
2996 $self->SUPER::add (@widgets);
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000}
3001
3002sub set_current_page {
3003 my ($self, $page_or_widget) = @_;
3004
3005 my $widget = ref $page_or_widget
3006 ? $page_or_widget
3007 : $self->{children}[$page_or_widget];
3008
3009 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011
3012 $self->_emit (page_changed => $self->{current});
3013
3014 $self->realloc;
3015}
3016
3017sub visible_children {
3018 $_[0]{current}
3019}
3020
3021sub size_request {
3022 my ($self) = @_;
3023
3024 $self->{current}->size_request
3025}
3026
3027sub size_allocate {
3028 my ($self, $w, $h) = @_;
3029
3030 $self->{current}->configure (0, 0, $w, $h);
3031}
3032
3033sub _draw {
3034 my ($self) = @_;
3035
3036 $self->{current}->draw;
3037}
3038
3039#############################################################################
3040
3041package CFClient::UI::Notebook;
3042
3043our @ISA = CFClient::UI::VBox::;
3044
3045sub new {
3046 my $class = shift;
3047
3048 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self
3052 @_,
3053 );
3054
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3056 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3057
3058 $self
3059}
3060
3061sub add {
3062 my ($self, $title, $widget, $tooltip) = @_;
3063
3064 Scalar::Util::weaken $self;
3065
3066 $self->{buttonbar}->add (new CFClient::UI::Button
3067 markup => $title,
3068 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) },
3070 );
3071
3072 $self->{multiplexer}->add ($widget);
3073}
3074
3075sub set_current_page {
3076 my ($self, $page) = @_;
3077
3078 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current});
3080}
3081
3082#############################################################################
3083
3084package CFClient::UI::Statusbox;
3085
3086our @ISA = CFClient::UI::VBox::;
3087
3088sub new {
3089 my $class = shift;
3090
3091 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3092 fontsize => 0.8,
2877 @_, 3093 @_,
2878 ) 3094 );
3095
3096 Scalar::Util::weaken (my $this = $self);
3097
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099
3100 $self
2879} 3101}
2880 3102
2881sub reorder { 3103sub reorder {
2882 my ($self) = @_; 3104 my ($self) = @_;
2883 my $NOW = time; 3105 my $NOW = Time::HiRes::time;
3106
3107 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} };
2884 3111
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3112 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3113 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3114 }
2888 3115
… …
2891 my @items = sort { 3118 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3119 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3120 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3121 } values %{ $self->{item} };
2895 3122
3123 $self->{timer}->interval (1);
3124
2896 my $count = 10 + 1; 3125 my $count = 10 + 1;
2897 for my $item (@items) { 3126 for my $item (@items) {
2898 last unless --$count; 3127 last unless --$count;
2899 3128
2900 push @widgets, $item->{label} ||= do { 3129 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3130 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3131 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3132 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3133 : $item->{text};
2905 3134
… …
2913 tooltip => $item->{tooltip}, 3142 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3143 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3144 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3145 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3146 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3147 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3148 can_events => 1,
2920 can_hover => 1 3149 can_hover => 1
2921 }; 3150 };
3151
3152 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3153 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3154 $label->update;
3155 $label->set_max_size (undef, $label->{req_h} * $diff)
3156 if $diff < 1;
3157 $self->{timer}->interval (1/30);
3158 } else {
3159 $label->{fg}[3] = $item->{fg}[3] || 1;
3160 }
3161
3162 push @widgets, $label;
2922 } 3163 }
2923 3164
2924 $self->clear; 3165 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3166 $self->SUPER::add (reverse @widgets);
2926} 3167}
… …
2931 $text =~ s/^\s+//; 3172 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3173 $text =~ s/\s+$//;
2933 3174
2934 return unless $text; 3175 return unless $text;
2935 3176
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3177 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3178
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3179 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3180
2940 if (my $item = $self->{item}{$group}) { 3181 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3182 if ($item->{text} eq $text) {
… …
2971 3212
2972 $self->reorder; 3213 $self->reorder;
2973 $self->SUPER::reconfigure; 3214 $self->SUPER::reconfigure;
2974} 3215}
2975 3216
3217sub DESTROY {
3218 my ($self) = @_;
3219
3220 $self->{timer}->cancel;
3221
3222 $self->SUPER::DESTROY;
3223}
3224
2976############################################################################# 3225#############################################################################
2977 3226
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
2978package CFClient::UI::Root; 3522package CFClient::UI::Root;
2979 3523
2980our @ISA = CFClient::UI::Container::; 3524our @ISA = CFClient::UI::Container::;
3525
3526use List::Util qw(min max);
2981 3527
2982use CFClient::OpenGL; 3528use CFClient::OpenGL;
2983 3529
2984sub new { 3530sub new {
2985 my $class = shift; 3531 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3538 Scalar::Util::weaken ($self->{root} = $self);
2993 3539
2994 $self 3540 $self
2995} 3541}
2996 3542
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3543sub size_request {
3014 my ($self) = @_; 3544 my ($self) = @_;
3015 3545
3016 ($self->{w}, $self->{h}) 3546 ($self->{w}, $self->{h})
3017} 3547}
3018 3548
3549sub _to_pixel {
3550 my ($coord, $size, $max) = @_;
3551
3552 $coord =
3553 $coord eq "center" ? ($max - $size) * 0.5
3554 : $coord eq "max" ? $max
3555 : $coord;
3556
3557 $coord = 0 if $coord < 0;
3558 $coord = $max - $size if $coord > $max - $size;
3559
3560 int $coord + 0.5
3561}
3562
3019sub size_allocate { 3563sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3564 my ($self, $w, $h) = @_;
3021 3565
3022 for my $child ($self->children) { 3566 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3568
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3569 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3570 $Y = $child->{force_y} if exists $child->{force_y};
3027 3571
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3572 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3573 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3574
3036 $child->configure ($X, $Y, $W, $H); 3575 $child->configure ($X, $Y, $W, $H);
3037 } 3576 }
3038} 3577}
3039 3578
… …
3056} 3595}
3057 3596
3058sub add { 3597sub add {
3059 my ($self, @children) = @_; 3598 my ($self, @children) = @_;
3060 3599
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3600 $_->{is_toplevel} = 1
3063 3601 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3602
3069 $self->SUPER::add (@children); 3603 $self->SUPER::add (@children);
3070} 3604}
3071 3605
3072sub remove { 3606sub remove {
3073 my ($self, @children) = @_; 3607 my ($self, @children) = @_;
3074 3608
3075 $self->SUPER::remove (@children); 3609 $self->SUPER::remove (@children);
3610
3611 delete $self->{is_toplevel}
3612 for @children;
3076 3613
3077 while (@children) { 3614 while (@children) {
3078 my $w = pop @children; 3615 my $w = pop @children;
3079 push @children, $w->children; 3616 push @children, $w->children;
3080 $w->set_invisible; 3617 $w->set_invisible;
… …
3100 $_->() 3637 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3638 for values %{delete $self->{refresh_hook}};
3102 } 3639 }
3103 3640
3104 if ($self->{realloc}) { 3641 if ($self->{realloc}) {
3642 my %queue;
3105 my @queue; 3643 my @queue;
3644 my $widget;
3106 3645
3646 outer:
3107 while () { 3647 while () {
3108 if ($self->{realloc}) { 3648 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3649 for $widget (values %$realloc) {
3650 $widget->{visible} or next; # do not resize invisible widgets
3110 3651
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3652 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3653
3654 push @{ $queue[$widget->{visible}] }, $widget;
3655 }
3113 } 3656 }
3114 3657
3658 while () {
3659 @queue or last outer;
3660
3661 $widget = pop @{ $queue[-1] || [] }
3662 and last;
3663
3664 pop @queue;
3665 }
3666
3667 delete $queue{$widget+0};
3668
3669 my ($w, $h) = $widget->size_request;
3670
3671 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3672 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3673
3674 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3675 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3676
3677 $w = $widget->{force_w} if exists $widget->{force_w};
3678 $h = $widget->{force_h} if exists $widget->{force_h};
3679
3680 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3681 || delete $widget->{force_realloc}) {
3682 $widget->{req_w} = $w;
3683 $widget->{req_h} = $h;
3684
3685 $self->{size_alloc}{$widget+0} = $widget;
3686
3687 if (my $parent = $widget->{parent}) {
3688 $self->{realloc}{$parent+0} = $parent
3689 unless $queue{$parent+0};
3690
3691 $parent->{force_size_alloc} = 1;
3692 $self->{size_alloc}{$parent+0} = $parent;
3693 }
3694 }
3695
3696 delete $self->{realloc}{$widget+0};
3697 }
3698 }
3699
3700 while (my $size_alloc = delete $self->{size_alloc}) {
3701 my @queue = sort { $b->{visible} <=> $a->{visible} }
3702 values %$size_alloc;
3703
3704 while () {
3115 my $widget = pop @queue || last; 3705 my $widget = pop @queue || last;
3116 3706
3117 $widget->{visible} or last; # do not resize invisible widgets 3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3708
3142 $w = 0 if $w < 0; 3709 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3710 $h = 0 if $h < 0;
3144 3711
3712 $w = int $w + 0.5;
3713 $h = int $h + 0.5;
3714
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w};
3717 $widget->{old_h} = $widget->{h};
3718
3145 $widget->{w} = $w; 3719 $widget->{w} = $w;
3146 $widget->{h} = $h; 3720 $widget->{h} = $h;
3721
3147 $widget->emit (size_allocate => $w, $h, 1); 3722 $widget->emit (size_allocate => $w, $h);
3723 }
3148 } 3724 }
3149 } 3725 }
3150 3726
3151 while ($self->{post_alloc_hook}) { 3727 while ($self->{post_alloc_hook}) {
3152 $_->() 3728 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3729 for values %{delete $self->{post_alloc_hook}};
3154 } 3730 }
3731
3155 3732
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3733 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3734 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3735 glClear GL_COLOR_BUFFER_BIT;
3159 3736
… …
3161 glLoadIdentity; 3738 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3740 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3741 glLoadIdentity;
3165 3742
3743 {
3744 package CFClient::UI::Base;
3745
3746 ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h});
3748 }
3749
3166 $self->_draw; 3750 $self->_draw;
3167} 3751}
3168 3752
3169############################################################################# 3753#############################################################################
3170 3754

Diff Legend

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