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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC

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

Diff Legend

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