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

Diff Legend

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