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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 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->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 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;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
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 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_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};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 return unless $self->{visible}; 273 return unless $self->{visible};
259 274
260 # broken show/hide model 275 $_->set_invisible for $self->children;
261 276
262 delete $self->{root}; 277 delete $self->{root};
263 delete $self->{visible}; 278 delete $self->{visible};
264 279
265 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
267 282
268 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
270 285
271 $self->focus_out; 286 $self->focus_out;
272 287
273 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
274} 306}
275 307
276sub hide { 308sub hide {
277 my ($self) = @_; 309 my ($self) = @_;
278 310
… …
280 312
281 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
282 if $self->{parent}; 314 if $self->{parent};
283} 315}
284 316
285sub move { 317sub move_abs {
286 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
287 319
288 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
291 323
292 $self->update; 324 $self->update;
293} 325}
294 326
295sub set_size { 327sub set_size {
296 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
297 329
298 $self->{user_w} = $w; 330 $self->{force_w} = $w;
299 $self->{user_h} = $h; 331 $self->{force_h} = $h;
300 332
301 $self->check_size; 333 $self->realloc;
302} 334}
303 335
304sub size_request { 336sub size_request {
305 require Carp; 337 require Carp;
306 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
308 340
309sub configure { 341sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
311 343
312 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
315 349
316 # use alignment to adjust x, y 350 # use alignment to adjust x, y
317 351
318 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 354 }
323 355
324 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 357 $self->{x} = $x;
326 $self->{y} = $y; 358 $self->{y} = $y;
327 $self->update; 359 $self->update;
328 } 360 }
329 361
330 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
332 } 369 }
333} 370}
334 371
335sub size_allocate { 372sub size_allocate {
336 # nothing to be done 373 # nothing to be done
337} 374}
338 375
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
347} 382}
348 383
349sub set_max_size { 384sub set_max_size {
350 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
351 386
352 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
354} 391}
355 392
356sub set_tooltip { 393sub set_tooltip {
357 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
358 395
… …
363 400
364 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
365 402
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
369 } 406 }
370} 407}
371 408
372# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
373sub coord2local { 410sub coord2local {
… …
410 447
411 $::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
412 unless $FOCUS; 449 unless $FOCUS;
413} 450}
414 451
415sub mouse_motion { } 452sub mouse_motion { 0 }
416sub button_up { } 453sub button_up { 0 }
417sub key_down { } 454sub key_down { 0 }
418sub key_up { } 455sub key_up { 0 }
419 456
420sub button_down { 457sub button_down {
421 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
422 459
423 $self->focus_in; 460 $self->focus_in;
424}
425 461
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
430sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
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
431 538
432sub draw { 539sub draw {
433 my ($self) = @_; 540 my ($self) = @_;
434 541
435 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);
436 553
437 glPushMatrix; 554 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 556
442 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 559 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 561 glBegin GL_QUADS;
449 glVertex $x , $y; 562 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
453 glEnd; 566 glEnd;
454 glDisable GL_BLEND; 567 glDisable GL_BLEND;
455 } 568 }
456 569
457 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 571 glPushMatrix;
459 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 575 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
466 glEnd; 579 glEnd;
467 glPopMatrix; 580 glPopMatrix;
468 #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;
469 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
470} 586}
471 587
472sub _draw { 588sub _draw {
473 my ($self) = @_; 589 my ($self) = @_;
474 590
475 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
476}
477
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545} 592}
546 593
547sub DESTROY { 594sub DESTROY {
548 my ($self) = @_; 595 my ($self) = @_;
549 596
… …
581 628
582 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
584 631
585 glEnable GL_BLEND; 632 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 634 glColor_premultiply @$color;
588 635
589 glBegin GL_QUADS; 636 glBegin GL_QUADS;
590 glVertex 0 , 0; 637 glVertex 0 , 0;
591 glVertex 0 , $h; 638 glVertex 0 , $h;
592 glVertex $w, $h; 639 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
609} 656}
610 657
611sub size_request { 658sub size_request {
612 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
613} 662}
614 663
615sub draw { } 664sub draw { }
616 665
617############################################################################# 666#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
622 671
623sub new { 672sub new {
624 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
625 674
626 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
627 676
628 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
629 children => [], 678 children => [],
630 can_events => 0, 679 can_events => 0,
631 %arg, 680 %arg,
632 ); 681 );
682
633 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
634 685
635 $self 686 $self
636} 687}
637 688
638sub add { 689sub add {
… …
646 $self->{children} = [ 697 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
649 ]; 700 ];
650 701
651 $self->check_size (1); 702 $self->realloc;
652 $self->update;
653} 703}
654 704
655sub children { 705sub children {
656 @{ $_[0]{children} } 706 @{ $_[0]{children} }
657} 707}
… …
662 delete $child->{parent}; 712 delete $child->{parent};
663 $child->hide; 713 $child->hide;
664 714
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 716
667 $self->check_size (1); 717 $self->realloc;
668 $self->update;
669} 718}
670 719
671sub clear { 720sub clear {
672 my ($self) = @_; 721 my ($self) = @_;
673 722
… …
677 for (@$children) { 726 for (@$children) {
678 delete $_->{parent}; 727 delete $_->{parent};
679 $_->hide; 728 $_->hide;
680 } 729 }
681 730
682 $self->check_size; 731 $self->realloc;
683 $self->update;
684} 732}
685 733
686sub find_widget { 734sub find_widget {
687 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
688 736
689 $x -= $self->{x}; 737 $x -= $self->{x};
690 $y -= $self->{y}; 738 $y -= $self->{y};
691 739
692 my $res; 740 my $res;
693 741
694 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
696 and return $res; 744 and return $res;
697 } 745 }
698 746
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
749} 797}
750 798
751############################################################################# 799#############################################################################
752 800
801# back-buffered drawing area
802
753package CFClient::UI::Window; 803package CFClient::UI::Window;
754 804
755our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
756 806
757use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 826 $self->update;
777} 827}
778 828
779sub _render { 829sub _render {
830 my ($self) = @_;
831
780 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
781} 833}
782 834
783sub render_child { 835sub render_child {
784 my ($self) = @_; 836 my ($self) = @_;
785 837
786 $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 {
787 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
789 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
790 $self->_render; 849 $self->_render;
791 }; 850 };
792} 851}
793 852
794sub _draw { 853sub _draw {
795 my ($self) = @_; 854 my ($self) = @_;
796 855
797 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
798 857
799 my $tex = $self->{texture} 858 my $tex = $self->{texture}
800 or return; 859 or return;
801 860
802 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
805 864
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 866
808 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
809} 868}
… …
825} 884}
826 885
827sub size_request { 886sub size_request {
828 my ($self) = @_; 887 my ($self) = @_;
829 888
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 890
832 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
833} 895}
834 896
835sub size_allocate { 897sub size_allocate {
836 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
837 899
900 my $child = $self->child;
901
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 904
841 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
842 $self->update; 906 $self->update;
843} 907}
844 908
… …
880} 944}
881 945
882sub _render { 946sub _render {
883 my ($self) = @_; 947 my ($self) = @_;
884 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
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 953
887 $self->SUPER::_render; 954 $self->SUPER::_render;
888} 955}
889 956
… …
892package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
893 960
894our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
895 962
896sub new { 963sub new {
897 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
898 967
899 my $self; 968 my $self;
900 969
901 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
902 vertical => 1, 971 vertical => 1,
… …
907 ; 976 ;
908 977
909 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 980 slider => $slider,
912 @_, 981 %arg,
913 ); 982 );
914 983
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
918 986
919 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
920} 994}
921 995
922sub update { 996sub update {
923 my ($self) = @_; 997 my ($self) = @_;
924 998
… …
963 1037
964 if ($self->{bg}) { 1038 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
966 1040
967 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
970 1044
971 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
972 glVertex 0 , 0; 1046 glVertex 0 , 0;
973 glVertex 0 , $h; 1047 glVertex 0 , $h;
974 glVertex $w, $h; 1048 glVertex $w, $h;
… …
987 1061
988our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
989 1063
990use CFClient::OpenGL; 1064use CFClient::OpenGL;
991 1065
992my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1073
996sub new { 1074sub new {
997 my $class = shift; 1075 my ($class, %arg) = @_;
998 1076
999 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
1000 1078
1001 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1082 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1083 can_events => 1,
1007 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1008 ); 1087 );
1009 1088
1010 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1011 align => 0, 1090 align => 0,
1012 valign => 1, 1091 valign => 1,
1013 text => $self->{title}, 1092 text => $title,
1014 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1015 1095
1016 $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};
1017} 1104}
1018 1105
1019sub border { 1106sub border {
1020 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1021} 1108}
1022 1109
1023sub size_request { 1110sub size_request {
1024 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1025 1115
1026 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1027 1117
1028 ( 1118 (
1029 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1032} 1122}
1033 1123
1034sub size_allocate { 1124sub size_allocate {
1035 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1036 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1037 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1039 1137
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1044} 1139}
1045 1140
1046sub button_down { 1141sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1048 1143
… …
1064 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1065 1160
1066 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1068 1163
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1166
1074 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1075 }; 1169 };
1076 1170
1077 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1175 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1083 1177
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1179
1086 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1091 } 1188 1
1092} 1189}
1093 1190
1094sub button_up { 1191sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1096 1193
1097 delete $self->{motion}; 1194 !!delete $self->{motion}
1098} 1195}
1099 1196
1100sub mouse_motion { 1197sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1102 1199
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1104} 1203}
1105 1204
1106sub _draw { 1205sub _draw {
1107 my ($self) = @_; 1206 my ($self) = @_;
1108 1207
1208 my $child = $self->{children}[0];
1209
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1212
1112 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1215
1115 my $border = $self->border; 1216 my $border = $self->border;
1116 1217
1117 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1223
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1125 1226
1126 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1232 }
1137 1233
1138 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1139 1235
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1143} 1242}
1144 1243
1145############################################################################# 1244#############################################################################
1146 1245
1147package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1170 1269
1171 $child->set_parent ($self); 1270 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1173 1272
1174 $self->check_size (1); 1273 $self->realloc;
1175} 1274}
1176 1275
1177# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1178sub clear { 1277sub clear {
1179 my ($self) = @_; 1278 my ($self) = @_;
… …
1184 for (@children) { 1283 for (@children) {
1185 delete $_->{parent}; 1284 delete $_->{parent};
1186 $_->hide; 1285 $_->hide;
1187 } 1286 }
1188 1287
1189 $self->check_size (1); 1288 $self->realloc;
1190 $self->update;
1191} 1289}
1192 1290
1193sub get_wh { 1291sub get_wh {
1194 my ($self) = @_; 1292 my ($self) = @_;
1195 1293
… …
1291 } 1389 }
1292} 1390}
1293 1391
1294############################################################################# 1392#############################################################################
1295 1393
1296package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1395
1300our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1301 1397
1302sub size_request { 1398sub size_request {
1303 my ($self) = @_; 1399 my ($self) = @_;
1304 1400
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1306 1402 ? (
1307 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1405 )
1310 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1311} 1410}
1312 1411
1313sub size_allocate { 1412sub size_allocate {
1314 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1315 1414
1316 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1416 my $children = $self->{children};
1319 1417
1320 my @h = map $_->{req_w}, @$children; 1418 my @req;
1321 1419
1322 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1323 1421 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1436 }
1338 } 1437 }
1339 1438
1340 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1341 1440
1342 my $y = 0; 1441 my $pos = 0;
1343 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1445
1348 $y += $h; 1446 $pos += $alloc;
1349 } 1447 }
1350 1448
1351 1 1449 1
1352} 1450}
1353 1451
1354############################################################################# 1452#############################################################################
1355 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1356package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1357 1470
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1361 1472
1362sub size_request { 1473sub new {
1363 my ($self) = @_; 1474 my $class = shift;
1364 1475
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1366 1477 vertical => 1,
1367 ( 1478 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1479 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1480}
1411 1481
1412############################################################################# 1482#############################################################################
1413 1483
1414package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1501 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1433 fontsize => 1, 1503 fontsize => 1,
1434 align => -1, 1504 align => -1,
1435 valign => -1, 1505 valign => -1,
1436 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1437 can_events => 0, 1508 can_events => 0,
1438 %arg 1509 %arg
1439 ); 1510 );
1440 1511
1441 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1468 1539
1469 delete $self->{texture}; 1540 delete $self->{texture};
1470 $self->SUPER::update; 1541 $self->SUPER::update;
1471} 1542}
1472 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1473sub set_text { 1551sub set_text {
1474 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1475 1553
1476 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1478 1556
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1481 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1482 $self->update; 1562 $self->update;
1483 $self->check_size;
1484} 1563}
1485 1564
1486sub set_markup { 1565sub set_markup {
1487 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1488 1567
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1572
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1496 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1497 $self->update; 1578 $self->update;
1498 $self->check_size;
1499} 1579}
1500 1580
1501sub size_request { 1581sub size_request {
1502 my ($self) = @_; 1582 my ($self) = @_;
1503 1583
1584 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1590
1510 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1511 1592
1512 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1596
1516 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1517 1598
1518 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1520 } 1604 };
1521 1605
1522 ( 1606 @{ $self->{size_req} }
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1607}
1527 1608
1528sub size_allocate { 1609sub size_allocate {
1529 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1530 1611
1612 delete $self->{ox};
1613
1531 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1616}
1533 1617
1534sub set_fontsize { 1618sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1536 1620
1537 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1622 delete $self->{texture};
1539 1623
1540 $self->update; 1624 $self->realloc;
1541 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1542} 1633}
1543 1634
1544sub _draw { 1635sub _draw {
1545 my ($self) = @_; 1636 my ($self) = @_;
1546 1637
… …
1552 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1647
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1558 1650
1651 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1562 1655
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1659 };
1569 1660
1570 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 1662
1573 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1574 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 } 1670 }
1579 1671
1580 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1581} 1673}
… …
1599 can_hover => 1, 1691 can_hover => 1,
1600 can_focus => 1, 1692 can_focus => 1,
1601 valign => 0, 1693 valign => 0,
1602 can_events => 1, 1694 can_events => 1,
1603 #text => ... 1695 #text => ...
1696 #hidden => "*",
1604 @_ 1697 @_
1605 ) 1698 )
1606} 1699}
1607 1700
1608sub _set_text { 1701sub _set_text {
… …
1610 1703
1611 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1612 1705
1613 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1614 1707
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1709 $self->{text} = $text;
1619 1710
1620 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1622 1714
1623 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1624} 1719}
1625 1720
1626sub set_text { 1721sub set_text {
1627 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1628 1723
1629 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1725 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633} 1726}
1634 1727
1635sub get_text { 1728sub get_text {
1636 $_[0]{text} 1729 $_[0]{text}
1637} 1730}
… …
1667 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1762 $self->_emit ('escape');
1670 } elsif ($uni) { 1763 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1672 } 1767 }
1673 1768
1674 $self->_set_text ($text); 1769 $self->_set_text ($text);
1675 $self->update; 1770
1676 $self->check_size; 1771 $self->realloc;
1772
1773 1
1677} 1774}
1678 1775
1679sub focus_in { 1776sub focus_in {
1680 my ($self) = @_; 1777 my ($self) = @_;
1681 1778
… …
1696 utf8::encode $text; 1793 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1698 1795
1699 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1700 $self->update; 1797 $self->update;
1798
1799 1
1701} 1800}
1702 1801
1703sub mouse_motion { 1802sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1705# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1706} 1807}
1707 1808
1708sub _draw { 1809sub _draw {
1709 my ($self) = @_; 1810 my ($self) = @_;
1710 1811
1711 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1712 1813
1713 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1716 } else { 1817 } else {
1717 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1718 } 1819 }
1719 1820
1720 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1824 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1787 } else { 1888 } else {
1788 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1789 } 1890 }
1790 1891
1791 } else { 1892 } else {
1792 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1793 } 1896 1
1794
1795} 1897}
1796 1898
1797############################################################################# 1899#############################################################################
1798 1900
1799package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1808 1910
1809sub new { 1911sub new {
1810 my $class = shift; 1912 my $class = shift;
1811 1913
1812 $class->SUPER::new ( 1914 $class->SUPER::new (
1813 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1814 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1816 can_hover => 1, 1919 can_hover => 1,
1817 align => 0, 1920 align => 0,
1818 valign => 0, 1921 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1828 1931
1829 $self->emit ("activate") 1932 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1934 && $y >= 0 && $y < $self->{h};
1935
1936 1
1832} 1937}
1833 1938
1834sub _draw { 1939sub _draw {
1835 my ($self) = @_; 1940 my ($self) = @_;
1836 1941
1837 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1943
1843 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1846 1947
… …
1865 1966
1866sub new { 1967sub new {
1867 my $class = shift; 1968 my $class = shift;
1868 1969
1869 $class->SUPER::new ( 1970 $class->SUPER::new (
1870 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1871 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1975 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1976 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1977 state => 0,
… …
1879} 1981}
1880 1982
1881sub size_request { 1983sub size_request {
1882 my ($self) = @_; 1984 my ($self) = @_;
1883 1985
1884 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1885} 1987}
1886 1988
1887sub button_down { 1989sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1889 1991
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1894 } 2000 1
1895} 2001}
1896 2002
1897sub _draw { 2003sub _draw {
1898 my ($self) = @_; 2004 my ($self) = @_;
1899 2005
1900 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1901 2007
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 2009
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 2013
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 2015
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 2017
… …
2064 2172
2065 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2067 2175
2068 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2181
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2285 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2286 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2287 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2181 vertical => 0, 2290 vertical => 0,
2182 can_hover => 1, 2291 can_hover => 1,
2183 inner_pad => 0.02, 2292 inner_pad => 0.02,
2184 @_ 2293 @_
2185 ); 2294 );
… …
2188 $self->update; 2297 $self->update;
2189 2298
2190 $self 2299 $self
2191} 2300}
2192 2301
2302sub changed { }
2303
2193sub set_range { 2304sub set_range {
2194 my ($self, $range) = @_; 2305 my ($self, $range) = @_;
2195 2306
2196 ($range, $self->{range}) = ($self->{range}, $range); 2307 ($range, $self->{range}) = ($self->{range}, $range);
2197 2308
… …
2223} 2334}
2224 2335
2225sub size_request { 2336sub size_request {
2226 my ($self) = @_; 2337 my ($self) = @_;
2227 2338
2228 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2340}
2233 2341
2234sub button_down { 2342sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2236 2344
2237 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2238 2346
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2348
2241 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2242} 2350}
2243 2351
2244sub mouse_motion { 2352sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2246 2354
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2359
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2361
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2255 } 2367 1
2256} 2368}
2257 2369
2258sub update { 2370sub update {
2259 my ($self) = @_; 2371 my ($self) = @_;
2260 2372
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2263 2382
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2266 2385
… …
2272 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2274 2393
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2277 }); 2396 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2397
2285 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2286 2399
2287 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2288 2401
… …
2393 $self->SUPER::size_allocate ($w, $h); 2506 $self->SUPER::size_allocate ($w, $h);
2394 2507
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2508 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2398 2512
2399 $self->reflow; 2513 $self->reflow;
2400} 2514}
2401 2515
2402sub text_size { 2516sub text_size {
… …
2404 2518
2405 my $layout = $self->{layout}; 2519 my $layout = $self->{layout};
2406 2520
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2522 $layout->set_width ($self->{children}[0]{w} - $indent);
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2409 $layout->set_markup ($text); 2524 $layout->set_markup ($text);
2410 2525
2411 $layout->size 2526 $layout->size
2412} 2527}
2413 2528
… …
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2581
2467 for (@{$self->{par}}) { 2582 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2584 $layout->set_width ($W - $_->[3]);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2470 $layout->set_markup ($_->[4]); 2586 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2587 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2588 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2589 $_->[1] = $h;
2474 } 2590 }
… …
2482 2598
2483 delete $self->{texture}; 2599 delete $self->{texture};
2484 } 2600 }
2485 2601
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2603 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2604 glClear GL_COLOR_BUFFER_BIT;
2489 2605
2490 my $top = int $self->{children}[1]{range}[0]; 2606 my $top = int $self->{children}[1]{range}[0];
2491 2607
2492 my $y0 = $top; 2608 my $y0 = $top;
… …
2506 my $h = $par->[1]; 2622 my $h = $par->[1];
2507 2623
2508 if ($y0 < $y + $h && $y < $y1) { 2624 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2625 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2626 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2511 $layout->set_markup ($par->[4]); 2628 $layout->set_markup ($par->[4]);
2512 2629
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2630 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2631
2515 glRasterPos $par->[3], $y - $y0; 2632 glRasterPos $par->[3], $y - $y0;
… …
2527sub _draw { 2644sub _draw {
2528 my ($self) = @_; 2645 my ($self) = @_;
2529 2646
2530 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2649 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2650 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2651 glDisable GL_TEXTURE_2D;
2535 2652
2536 $self->{children}[1]->draw; 2653 $self->{children}[1]->draw;
2537 2654
2538} 2655}
… …
2592 state => 0, 2709 state => 0,
2593 on_activate => \&toggle_flopper, 2710 on_activate => \&toggle_flopper,
2594 @_ 2711 @_
2595 ); 2712 );
2596 2713
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2714 $self
2603} 2715}
2604 2716
2605sub toggle_flopper { 2717sub toggle_flopper {
2606 my ($self) = @_; 2718 my ($self) = @_;
2607 2719
2608 # TODO: use animation 2720 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2721}
2620 2722
2621############################################################################# 2723#############################################################################
2622 2724
2623package CFClient::UI::Tooltip; 2725package CFClient::UI::Tooltip;
… …
2636} 2738}
2637 2739
2638sub set_tooltip_from { 2740sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2741 my ($self, $widget) = @_;
2640 2742
2743 my $tooltip = $widget->{tooltip};
2744
2745 if ($ENV{CFPLUS_DEBUG} & 2) {
2746 $tooltip .= "\n\n" . (ref $widget) . "\n"
2747 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748 . "req $widget->{req_w} $widget->{req_h}\n"
2749 . "visible $widget->{visible}";
2750 }
2751
2641 $self->add (new CFClient::UI::Label 2752 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2753 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2754 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2755 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2756 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2757 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2758 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2769
2659sub size_allocate { 2770sub size_allocate {
2660 my ($self, $w, $h) = @_; 2771 my ($self, $w, $h) = @_;
2661 2772
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2773 $self->SUPER::size_allocate ($w - 4, $h - 4);
2774}
2775
2776sub visibility_change {
2777 my ($self, $visible) = @_;
2778
2779 return unless $visible;
2780
2781 $self->{root}->on_post_alloc ("move_$self" => sub {
2782 my $widget = $self->{owner}
2783 or return;
2784
2785 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786
2787 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788 if $x + $self->{w} > $::WIDTH;
2789
2790 $self->move_abs ($x, $y);
2791 });
2663} 2792}
2664 2793
2665sub _draw { 2794sub _draw {
2666 my ($self) = @_; 2795 my ($self) = @_;
2667 2796
… …
2684 glVertex $w, $h; 2813 glVertex $w, $h;
2685 glVertex $w, 0; 2814 glVertex $w, 0;
2686 glEnd; 2815 glEnd;
2687 2816
2688 glTranslate 2 - 0.375, 2 - 0.375; 2817 glTranslate 2 - 0.375, 2 - 0.375;
2818
2689 $self->SUPER::_draw; 2819 $self->SUPER::_draw;
2690} 2820}
2691 2821
2692############################################################################# 2822#############################################################################
2693 2823
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2882 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2883
2754 if ($tex) { 2884 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2885 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2887 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2888 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2889 glDisable GL_TEXTURE_2D;
2760 } 2890 }
2761} 2891}
2762 2892
… …
2769 $self->SUPER::DESTROY; 2899 $self->SUPER::DESTROY;
2770} 2900}
2771 2901
2772############################################################################# 2902#############################################################################
2773 2903
2774package CFClient::UI::Inventory; 2904package CFClient::UI::Buttonbar;
2775 2905
2776our @ISA = CFClient::UI::ScrolledWindow::; 2906our @ISA = CFClient::UI::HBox::;
2777 2907
2778sub new { 2908# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2909
2819############################################################################# 2910#############################################################################
2820 2911
2821package CFClient::UI::Menu; 2912package CFClient::UI::Menu;
2822 2913
… …
2834 ); 2925 );
2835 2926
2836 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2927 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2837 2928
2838 for my $item (@{ $self->{items} }) { 2929 for my $item (@{ $self->{items} }) {
2839 my ($widget, $cb) = @$item; 2930 my ($widget, $cb, $tooltip) = @$item;
2840 2931
2841 # handle various types of items, only text for now 2932 # handle various types of items, only text for now
2842 if (!ref $widget) { 2933 if (!ref $widget) {
2843 $widget = new CFClient::UI::Label 2934 $widget = new CFClient::UI::Label
2844 can_hover => 1, 2935 can_hover => 1,
2845 can_events => 1, 2936 can_events => 1,
2846 text => $widget; 2937 text => $widget,
2938 tooltip => $tooltip
2847 } 2939 }
2848 2940
2849 $self->{item}{$widget} = $item; 2941 $self->{item}{$widget} = $item;
2850 2942
2851 $self->{vbox}->add ($widget); 2943 $self->{vbox}->add ($widget);
… …
2863 # maybe save $GRAB? must be careful about events... 2955 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2956 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2957 $self->{button} = $ev->{button};
2866 2958
2867 $self->show; 2959 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2960 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 2961}
2870 2962
2871sub mouse_motion { 2963sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2873 2965
2874 # TODO: should use vbox->find_widget or so 2966 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2967 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2968 $self->{hover} = $self->{item}{$HOVER};
2969
2970 0
2877} 2971}
2878 2972
2879sub button_up { 2973sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2974 my ($self, $ev, $x, $y) = @_;
2881 2975
… …
2883 undef $GRAB; 2977 undef $GRAB;
2884 $self->hide; 2978 $self->hide;
2885 2979
2886 $self->_emit ("popdown"); 2980 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 2981 $self->{hover}[1]->() if $self->{hover};
2982 } else {
2983 return 0
2984 }
2985
2888 } 2986 1
2889} 2987}
2890 2988
2891############################################################################# 2989#############################################################################
2892 2990
2893package CFClient::UI::Statusbox; 2991package CFClient::UI::Multiplexer;
2894 2992
2895our @ISA = CFClient::UI::VBox::; 2993our @ISA = CFClient::UI::Container::;
2896 2994
2897sub new { 2995sub new {
2898 my $class = shift; 2996 my $class = shift;
2899 2997
2900 $class->SUPER::new ( 2998 my $self = $class->SUPER::new (
2999 @_,
3000 );
3001
3002 $self->{current} = $self->{children}[0]
3003 if @{ $self->{children} };
3004
3005 $self
3006}
3007
3008sub add {
3009 my ($self, @widgets) = @_;
3010
3011 $self->SUPER::add (@widgets);
3012
3013 $self->{current} = $self->{children}[0]
3014 if @{ $self->{children} };
3015}
3016
3017sub set_current_page {
3018 my ($self, $page_or_widget) = @_;
3019
3020 my $widget = ref $page_or_widget
3021 ? $page_or_widget
3022 : $self->{children}[$page_or_widget];
3023
3024 $self->{current} = $widget;
3025 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026
3027 $self->_emit (page_changed => $self->{current});
3028
3029 $self->realloc;
3030}
3031
3032sub visible_children {
3033 $_[0]{current}
3034}
3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 $self->{current}->size_request
3040}
3041
3042sub size_allocate {
3043 my ($self, $w, $h) = @_;
3044
3045 $self->{current}->configure (0, 0, $w, $h);
3046}
3047
3048sub _draw {
3049 my ($self) = @_;
3050
3051 $self->{current}->draw;
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::Notebook;
3057
3058our @ISA = CFClient::UI::VBox::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (
3064 buttonbar => (new CFClient::UI::Buttonbar),
3065 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3066 # filter => # will be put between multiplexer and $self
3067 @_,
3068 );
3069
3070 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3071 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3072
3073 $self
3074}
3075
3076sub add {
3077 my ($self, $title, $widget, $tooltip) = @_;
3078
3079 Scalar::Util::weaken $self;
3080
3081 $self->{buttonbar}->add (new CFClient::UI::Button
3082 markup => $title,
3083 tooltip => $tooltip,
3084 on_activate => sub { $self->set_current_page ($widget) },
3085 );
3086
3087 $self->{multiplexer}->add ($widget);
3088}
3089
3090sub set_current_page {
3091 my ($self, $page) = @_;
3092
3093 $self->{multiplexer}->set_current_page ($page);
3094 $self->_emit (page_changed => $self->{multiplexer}{current});
3095}
3096
3097#############################################################################
3098
3099package CFClient::UI::Combobox;
3100
3101use utf8;
3102
3103our @ISA = CFClient::UI::Button::;
3104
3105sub new {
3106 my $class = shift;
3107
3108 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ...
3110 value => undef,
3111 @_,
3112 );
3113
3114 $self->_set_value ($self->{value});
3115
3116 $self
3117}
3118
3119sub button_down {
3120 my ($self, $ev) = @_;
3121
3122 my @menu_items;
3123
3124 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_;
3126
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3128 }
3129
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131}
3132
3133sub _set_value {
3134 my ($self, $value) = @_;
3135
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3137 or return;
3138
3139 $self->{value} = $item->[1];
3140 $self->set_markup ("$item->[0] ⇓");
3141 $self->set_tooltip ($item->[2]);
3142}
3143
3144sub set_value {
3145 my ($self, $value) = @_;
3146
3147 return unless $self->{value} ne $value;
3148
3149 $self->_set_value ($value);
3150 $self->_emit (changed => $value);
3151}
3152
3153#############################################################################
3154
3155package CFClient::UI::Statusbox;
3156
3157our @ISA = CFClient::UI::VBox::;
3158
3159sub new {
3160 my $class = shift;
3161
3162 my $self = $class->SUPER::new (
2901 fontsize => 0.8, 3163 fontsize => 0.8,
2902 @_, 3164 @_,
2903 ) 3165 );
3166
3167 Scalar::Util::weaken (my $this = $self);
3168
3169 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3170
3171 $self
2904} 3172}
2905 3173
2906sub reorder { 3174sub reorder {
2907 my ($self) = @_; 3175 my ($self) = @_;
2908 my $NOW = time; 3176 my $NOW = Time::HiRes::time;
3177
3178 # freeze display when hovering over any label
3179 return if $CFClient::UI::TOOLTIP->{owner}
3180 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3181 values %{ $self->{item} };
2909 3182
2910 while (my ($k, $v) = each %{ $self->{item} }) { 3183 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 } 3185 }
2913 3186
… …
2916 my @items = sort { 3189 my @items = sort {
2917 $a->{pri} <=> $b->{pri} 3190 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id} 3191 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} }; 3192 } values %{ $self->{item} };
2920 3193
3194 $self->{timer}->interval (1);
3195
2921 my $count = 10 + 1; 3196 my $count = 10 + 1;
2922 for my $item (@items) { 3197 for my $item (@items) {
2923 last unless --$count; 3198 last unless --$count;
2924 3199
2925 push @widgets, $item->{label} ||= do { 3200 my $label = $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all) 3201 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1 3202 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}" 3203 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text}; 3204 : $item->{text};
2930 3205
… …
2938 tooltip => $item->{tooltip}, 3213 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP, 3214 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67, 3215 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize}, 3216 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44, 3217 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg}, 3218 fg => [@{ $item->{fg} }],
2944 can_events => 1, 3219 can_events => 1,
2945 can_hover => 1 3220 can_hover => 1
2946 }; 3221 };
3222
3223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3225 $label->update;
3226 $label->set_max_size (undef, $label->{req_h} * $diff)
3227 if $diff < 1;
3228 $self->{timer}->interval (1/30);
3229 } else {
3230 $label->{fg}[3] = $item->{fg}[3] || 1;
3231 }
3232
3233 push @widgets, $label;
2947 } 3234 }
2948 3235
2949 $self->clear; 3236 $self->clear;
2950 $self->SUPER::add (reverse @widgets); 3237 $self->SUPER::add (reverse @widgets);
2951} 3238}
… …
2956 $text =~ s/^\s+//; 3243 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//; 3244 $text =~ s/\s+$//;
2958 3245
2959 return unless $text; 3246 return unless $text;
2960 3247
2961 my $timeout = time + ((delete $arg{timeout}) || 60); 3248 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2962 3249
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3250 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964 3251
2965 if (my $item = $self->{item}{$group}) { 3252 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) { 3253 if ($item->{text} eq $text) {
… …
2996 3283
2997 $self->reorder; 3284 $self->reorder;
2998 $self->SUPER::reconfigure; 3285 $self->SUPER::reconfigure;
2999} 3286}
3000 3287
3288sub DESTROY {
3289 my ($self) = @_;
3290
3291 $self->{timer}->cancel;
3292
3293 $self->SUPER::DESTROY;
3294}
3295
3001############################################################################# 3296#############################################################################
3002 3297
3003package CFClient::UI::Root; 3298package CFClient::UI::Inventory;
3004 3299
3005our @ISA = CFClient::UI::Container::; 3300our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3301
3009sub new { 3302sub new {
3010 my $class = shift; 3303 my $class = shift;
3011 3304
3012 $class->SUPER::new ( 3305 my $self = $class->SUPER::new (
3306 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3307 @_,
3308 );
3309
3310 $self
3311}
3312
3313sub set_items {
3314 my ($self, $items) = @_;
3315
3316 $self->{child}->clear;
3317 return unless $items;
3318
3319 my @items = sort {
3320 ($a->{type} <=> $b->{type})
3321 or ($a->{name} cmp $b->{name})
3322 } @$items;
3323
3324 $self->{real_items} = \@items;
3325
3326 my $row = 0;
3327 for my $item (@items) {
3328 CFClient::Item::update_widgets $item;
3329
3330 $self->{child}->add (0, $row, $item->{face_widget});
3331 $self->{child}->add (1, $row, $item->{desc_widget});
3332 $self->{child}->add (2, $row, $item->{weight_widget});
3333
3334 $row++;
3335 }
3336}
3337
3338#############################################################################
3339
3340package CFClient::UI::BindEditor;
3341
3342our @ISA = CFClient::UI::FancyFrame::;
3343
3344sub new {
3345 my $class = shift;
3346
3347 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349 $self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353 text => "start recording",
3354 tooltip => "Start/Stops recording of actions."
3355 ."All subsequent actions after the recording started will be captured."
3356 ."The actions are displayed after the record was stopped."
3357 ."To bind the action you have to click on the 'Bind' button",
3358 on_activate => sub {
3359 unless ($self->{recording}) {
3360 $self->start;
3361 } else {
3362 $self->stop;
3363 }
3364 });
3365
3366 $vb->add (new CFClient::UI::Label text => "Actions:");
3367 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3370 $vb->add (my $hb = new CFClient::UI::HBox);
3371 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372 $hb->add (new CFClient::UI::Button
3373 text => "bind",
3374 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375 on_activate => sub {
3376 $self->ask_for_bind;
3377 });
3378
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add (new CFClient::UI::Button
3381 text => "ok",
3382 expand => 1,
3383 tooltip => "This closes the binding editor and saves the binding",
3384 on_activate => sub {
3385 $self->hide;
3386 $self->commit;
3387 });
3388
3389 $hb->add (new CFClient::UI::Button
3390 text => "cancel",
3391 expand => 1,
3392 tooltip => "This closes the binding editor without saving",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->{binding_cancel}->()
3396 if $self->{binding_cancel};
3397 });
3398
3399 $self->update_binding_widgets;
3400
3401 $self
3402}
3403
3404sub commit {
3405 my ($self) = @_;
3406 my ($mod, $sym, $cmds) = $self->get_binding;
3407 if ($sym != 0 && @$cmds > 0) {
3408 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409 ."'. Don't forget 'Save Config'!");
3410 $self->{binding_change}->($mod, $sym, $cmds)
3411 if $self->{binding_change};
3412 } else {
3413 $::STATUSBOX->add ("No action bound, no key or action specified!");
3414 $self->{binding_cancel}->()
3415 if $self->{binding_cancel};
3416 }
3417}
3418
3419sub start {
3420 my ($self) = @_;
3421
3422 $self->{rec_btn}->set_text ("stop recording");
3423 $self->{recording} = 1;
3424 $self->clear_command_list;
3425 $::CONN->start_record if $::CONN;
3426}
3427
3428sub stop {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("start recording");
3432 $self->{recording} = 0;
3433
3434 my $rec;
3435 $rec = $::CONN->stop_record if $::CONN;
3436 return unless ref $rec eq 'ARRAY';
3437 $self->set_command_list ($rec);
3438}
3439
3440
3441sub ask_for_bind_and_commit {
3442 my ($self) = @_;
3443 $self->ask_for_bind (1);
3444}
3445
3446sub ask_for_bind {
3447 my ($self, $commit) = @_;
3448
3449 CFClient::Binder::open_binding_dialog (sub {
3450 my ($mod, $sym) = @_;
3451 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452 $self->update_binding_widgets;
3453 $self->commit if $commit;
3454 });
3455}
3456
3457# $mod and $sym are the modifiers and key symbol
3458# $cmds is a array ref of strings (the commands)
3459# $cb is the callback that is executed on OK
3460# $ccb is the callback that is executed on CANCEL and
3461# when the binding was unsuccessful on OK
3462sub set_binding {
3463 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465 $self->clear_command_list;
3466 $self->{recording} = 0;
3467 $self->{rec_btn}->set_text ("start recording");
3468
3469 $self->{binding} = [$mod, $sym];
3470 $self->{commands} = $cmds;
3471
3472 $self->{binding_change} = $cb;
3473 $self->{binding_cancel} = $ccb;
3474
3475 $self->update_binding_widgets;
3476}
3477
3478# this is a shortcut method that asks for a binding
3479# and then just binds it.
3480sub do_quick_binding {
3481 my ($self, $cmds) = @_;
3482 $self->set_binding (undef, undef, $cmds, sub {
3483 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484 });
3485 $self->ask_for_bind (1);
3486}
3487
3488sub update_binding_widgets {
3489 my ($self) = @_;
3490 my ($mod, $sym, $cmds) = $self->get_binding;
3491 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492 $self->set_command_list ($cmds);
3493}
3494
3495sub get_binding {
3496 my ($self) = @_;
3497 return (
3498 $self->{binding}->[0],
3499 $self->{binding}->[1],
3500 [ grep { defined $_ } @{$self->{commands}} ]
3501 );
3502}
3503
3504sub clear_command_list {
3505 my ($self) = @_;
3506 $self->{cmdbox}->clear ();
3507}
3508
3509sub set_command_list {
3510 my ($self, $cmds) = @_;
3511
3512 $self->{cmdbox}->clear ();
3513 $self->{commands} = $cmds;
3514
3515 my $idx = 0;
3516
3517 for (@$cmds) {
3518 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520 my $i = $idx;
3521 $hb->add (new CFClient::UI::Label text => $_);
3522 $hb->add (new CFClient::UI::Button
3523 text => "delete",
3524 tooltip => "Deletes the action from the record",
3525 on_activate => sub {
3526 $self->{cmdbox}->remove ($hb);
3527 $cmds->[$i] = undef;
3528 });
3529
3530
3531 $idx++
3532 }
3533}
3534
3535#############################################################################
3536
3537package CFClient::UI::SpellList;
3538
3539our @ISA = CFClient::UI::Table::;
3540
3541sub new {
3542 my $class = shift;
3543
3544 my $self = $class->SUPER::new (
3545 binding => [],
3546 commands => [],
3547 @_,
3548 )
3549}
3550
3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3557
3558sub rebuild_spell_list {
3559 my ($self) = @_;
3560
3561 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear;
3563
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568
3569 my $row = 0;
3570
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_};
3573
3574 $row++;
3575
3576 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face},
3578 can_hover => 1,
3579 can_events => 1,
3580 tooltip => $spell->{message},
3581 );
3582
3583 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1,
3585 text => $spell->{name},
3586 can_hover => 1,
3587 can_events => 1,
3588 tooltip => $spell->{message},
3589 );
3590
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 }
3602 });
3603}
3604
3605sub add_spell {
3606 my ($self, $spell) = @_;
3607
3608 $self->{spell}->{$spell->{name}} = $spell;
3609 $self->rebuild_spell_list;
3610}
3611
3612sub remove_spell {
3613 my ($self, $spell) = @_;
3614
3615 delete $self->{spell}->{$spell->{name}};
3616 $self->rebuild_spell_list;
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::Root;
3622
3623our @ISA = CFClient::UI::Container::;
3624
3625use List::Util qw(min max);
3626
3627use CFClient::OpenGL;
3628
3629sub new {
3630 my $class = shift;
3631
3632 my $self = $class->SUPER::new (
3013 visible => 1, 3633 visible => 1,
3014 @_, 3634 @_,
3015 ) 3635 );
3016}
3017 3636
3018sub configure { 3637 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3638
3021 $self->{w} = $w; 3639 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3640}
3031 3641
3032sub size_request { 3642sub size_request {
3033 my ($self) = @_; 3643 my ($self) = @_;
3034 3644
3035 ($self->{w}, $self->{h}) 3645 ($self->{w}, $self->{h})
3646}
3647
3648sub _to_pixel {
3649 my ($coord, $size, $max) = @_;
3650
3651 $coord =
3652 $coord eq "center" ? ($max - $size) * 0.5
3653 : $coord eq "max" ? $max
3654 : $coord;
3655
3656 $coord = 0 if $coord < 0;
3657 $coord = $max - $size if $coord > $max - $size;
3658
3659 int $coord + 0.5
3036} 3660}
3037 3661
3038sub size_allocate { 3662sub size_allocate {
3039 my ($self, $w, $h) = @_; 3663 my ($self, $w, $h) = @_;
3040 3664
3041 for my $child ($self->children) { 3665 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3666 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3667
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3668 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3669 $Y = $child->{force_y} if exists $child->{force_y};
3046 3670
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3671 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3672 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3673
3056 $child->configure ($X, $Y, $W, $H); 3674 $child->configure ($X, $Y, $W, $H);
3057 } 3675 }
3058} 3676}
3059 3677
… …
3070} 3688}
3071 3689
3072sub update { 3690sub update {
3073 my ($self) = @_; 3691 my ($self) = @_;
3074 3692
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3693 $::WANT_REFRESH++;
3077} 3694}
3078 3695
3079sub add { 3696sub add {
3080 my ($self, @children) = @_; 3697 my ($self, @children) = @_;
3081 3698
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3699 $_->{is_toplevel} = 1
3090 3700 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3701
3096 $self->SUPER::add (@children); 3702 $self->SUPER::add (@children);
3097} 3703}
3098 3704
3099sub remove { 3705sub remove {
3100 my ($self, @children) = @_; 3706 my ($self, @children) = @_;
3101 3707
3102 $self->SUPER::remove (@children); 3708 $self->SUPER::remove (@children);
3709
3710 delete $self->{is_toplevel}
3711 for @children;
3103 3712
3104 while (@children) { 3713 while (@children) {
3105 my $w = pop @children; 3714 my $w = pop @children;
3106 push @children, $w->children; 3715 push @children, $w->children;
3107 $w->set_invisible; 3716 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3735 while ($self->{refresh_hook}) {
3127 $_->() 3736 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3737 for values %{delete $self->{refresh_hook}};
3129 } 3738 }
3130 3739
3131 if ($self->{check_size}) { 3740 if ($self->{realloc}) {
3741 my %queue;
3132 my @queue; 3742 my @queue;
3743 my $widget;
3133 3744
3134 for (;;) { 3745 outer:
3135 if ($self->{check_size}) { 3746 while () {
3136 #TODO use array-of-depth approach 3747 if (my $realloc = delete $self->{realloc}) {
3748 for $widget (values %$realloc) {
3749 $widget->{visible} or next; # do not resize invisible widgets
3137 3750
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3751 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3752
3753 push @{ $queue[$widget->{visible}] }, $widget;
3754 }
3140 } 3755 }
3141 3756
3757 while () {
3758 @queue or last outer;
3759
3142 my $widget = pop @queue || last; 3760 $widget = pop @{ $queue[-1] || [] }
3143 3761 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3762
3763 pop @queue;
3764 }
3765
3766 delete $queue{$widget+0};
3767
3768 my ($w, $h) = $widget->size_request;
3769
3770 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3771 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3772
3773 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3774 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3775
3776 $w = $widget->{force_w} if exists $widget->{force_w};
3777 $h = $widget->{force_h} if exists $widget->{force_h};
3778
3779 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3780 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3781 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3782 $widget->{req_h} = $h;
3156 3783
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3784 $self->{size_alloc}{$widget+0} = $widget;
3158 3785
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3786 if (my $parent = $widget->{parent}) {
3787 $self->{realloc}{$parent+0} = $parent
3788 unless $queue{$parent+0};
3789
3790 $parent->{force_size_alloc} = 1;
3791 $self->{size_alloc}{$parent+0} = $parent;
3792 }
3161 } 3793 }
3794
3795 delete $self->{realloc}{$widget+0};
3162 } 3796 }
3163 } 3797 }
3164 3798
3165 while ($self->{size_alloc}) { 3799 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3800 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3801 values %$size_alloc;
3802
3803 while () {
3804 my $widget = pop @queue || last;
3805
3806 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3807
3169 $w = 0 if $w < 0; 3808 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3809 $h = 0 if $h < 0;
3171 3810
3811 $w = int $w + 0.5;
3812 $h = int $h + 0.5;
3813
3814 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815 $widget->{old_w} = $widget->{w};
3816 $widget->{old_h} = $widget->{h};
3817
3172 $widget->{w} = $w; 3818 $widget->{w} = $w;
3173 $widget->{h} = $h; 3819 $widget->{h} = $h;
3820
3174 $widget->emit (size_allocate => $w, $h); 3821 $widget->emit (size_allocate => $w, $h);
3822 }
3175 } 3823 }
3176 } 3824 }
3177 3825
3178 while ($self->{post_alloc_hook}) { 3826 while ($self->{post_alloc_hook}) {
3179 $_->() 3827 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3828 for values %{delete $self->{post_alloc_hook}};
3181 } 3829 }
3830
3182 3831
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3832 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3833 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3834 glClear GL_COLOR_BUFFER_BIT;
3186 3835
… …
3188 glLoadIdentity; 3837 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3838 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3839 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3840 glLoadIdentity;
3192 3841
3842 {
3843 package CFClient::UI::Base;
3844
3845 ($draw_x, $draw_y, $draw_w, $draw_h) =
3846 (0, 0, $self->{w}, $self->{h});
3847 }
3848
3193 $self->_draw; 3849 $self->_draw;
3194} 3850}
3195 3851
3196############################################################################# 3852#############################################################################
3197 3853

Diff Legend

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