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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

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

Diff Legend

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