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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{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.]+$/;
181 $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};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 253}
262 254
263sub set_visible { 255sub set_visible {
264 my ($self) = @_; 256 my ($self) = @_;
265 257
266 return if $self->{visible}; 258 return if $self->{visible};
267 259
268 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
270 262
271 $self->emit (visibility_change => 1) 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
272} 268}
273 269
274sub set_invisible { 270sub set_invisible {
275 my ($self) = @_; 271 my ($self) = @_;
276 272
277 return unless $self->{visible}; 273 return unless $self->{visible};
278 274
279 # broken show/hide model 275 $_->set_invisible for $self->children;
280 276
277 delete $self->{visible};
281 delete $self->{root}; 278 delete $self->{root};
282 delete $self->{visible};
283 279
284 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
286 282
287 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
289 285
290 $self->focus_out; 286 $self->focus_out;
291 287
292 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
293} 306}
294 307
295sub hide { 308sub hide {
296 my ($self) = @_; 309 my ($self) = @_;
297 310
… …
299 312
300 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
301 if $self->{parent}; 314 if $self->{parent};
302} 315}
303 316
304sub move { 317sub move_abs {
305 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
306 319
307 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
309 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
310 323
311 $self->update; 324 $self->update;
312} 325}
313 326
314sub set_size { 327sub set_size {
315 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
316 329
317 $self->{def_w} = $w; 330 $self->{force_w} = $w;
318 $self->{def_h} = $h; 331 $self->{force_h} = $h;
319 332
320 $self->check_size; 333 $self->realloc;
321} 334}
322 335
323sub size_request { 336sub size_request {
324 require Carp; 337 require Carp;
325 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
327 340
328sub configure { 341sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
330 343
331 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
334 349
335 # use alignment to adjust x, y 350 # use alignment to adjust x, y
336 351
337 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 354 }
342 355
343 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 357 $self->{x} = $x;
345 $self->{y} = $y; 358 $self->{y} = $y;
346 $self->update; 359 $self->update;
347 } 360 }
348 361
349 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $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;
351 } 369 }
352} 370}
353 371
354sub size_allocate { 372sub size_allocate {
355 # nothing to be done 373 # nothing to be done
356} 374}
357 375
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
366} 382}
367 383
368sub set_max_size { 384sub set_max_size {
369 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
370 386
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
373} 391}
374 392
375sub set_tooltip { 393sub set_tooltip {
376 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
377 395
… …
382 400
383 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
384 402
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 406 }
389} 407}
390 408
391# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
392sub coord2local { 410sub coord2local {
… …
429 447
430 $::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
431 unless $FOCUS; 449 unless $FOCUS;
432} 450}
433 451
434sub mouse_motion { } 452sub mouse_motion { 0 }
435sub button_up { } 453sub button_up { 0 }
436sub key_down { } 454sub key_down { 0 }
437sub key_up { } 455sub key_up { 0 }
438 456
439sub button_down { 457sub button_down {
440 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
441 459
442 $self->focus_in; 460 $self->focus_in;
443}
444 461
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
449sub 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
450 538
451sub draw { 539sub draw {
452 my ($self) = @_; 540 my ($self) = @_;
453 541
454 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);
455 553
456 glPushMatrix; 554 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 556
461 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 559 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 561 glBegin GL_QUADS;
468 glVertex $x , $y; 562 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
472 glEnd; 566 glEnd;
473 glDisable GL_BLEND; 567 glDisable GL_BLEND;
474 } 568 }
475 569
476 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 571 glPushMatrix;
478 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 575 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
485 glEnd; 579 glEnd;
486 glPopMatrix; 580 glPopMatrix;
487 #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;
488 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
489} 586}
490 587
491sub _draw { 588sub _draw {
492 my ($self) = @_; 589 my ($self) = @_;
493 590
494 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
495} 592}
496 593
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 594sub DESTROY {
558 my ($self) = @_; 595 my ($self) = @_;
559 596
560 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
561 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 601}
563 602
564############################################################################# 603#############################################################################
565 604
566package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
591 630
592 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
594 633
595 glEnable GL_BLEND; 634 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 636 glColor_premultiply @$color;
598 637
599 glBegin GL_QUADS; 638 glBegin GL_QUADS;
600 glVertex 0 , 0; 639 glVertex 0 , 0;
601 glVertex 0 , $h; 640 glVertex 0 , $h;
602 glVertex $w, $h; 641 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
619} 658}
620 659
621sub size_request { 660sub size_request {
622 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
623} 664}
624 665
625sub draw { } 666sub draw { }
626 667
627############################################################################# 668#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
632 673
633sub new { 674sub new {
634 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
635 676
636 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
637 678
638 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
639 children => [], 680 children => [],
640 can_events => 0, 681 can_events => 0,
641 %arg, 682 %arg,
642 ); 683 );
684
643 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
644 687
645 $self 688 $self
646} 689}
647 690
648sub add { 691sub add {
… …
656 $self->{children} = [ 699 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
659 ]; 702 ];
660 703
661 $self->check_size (1); 704 $self->realloc;
662 $self->update;
663} 705}
664 706
665sub children { 707sub children {
666 @{ $_[0]{children} } 708 @{ $_[0]{children} }
667} 709}
… …
672 delete $child->{parent}; 714 delete $child->{parent};
673 $child->hide; 715 $child->hide;
674 716
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 718
677 $self->check_size (1); 719 $self->realloc;
678 $self->update;
679} 720}
680 721
681sub clear { 722sub clear {
682 my ($self) = @_; 723 my ($self) = @_;
683 724
… …
687 for (@$children) { 728 for (@$children) {
688 delete $_->{parent}; 729 delete $_->{parent};
689 $_->hide; 730 $_->hide;
690 } 731 }
691 732
692 $self->check_size; 733 $self->realloc;
693 $self->update;
694} 734}
695 735
696sub find_widget { 736sub find_widget {
697 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
698 738
699 $x -= $self->{x}; 739 $x -= $self->{x};
700 $y -= $self->{y}; 740 $y -= $self->{y};
701 741
702 my $res; 742 my $res;
703 743
704 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
706 and return $res; 746 and return $res;
707 } 747 }
708 748
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 770}
731 771
732sub add { 772sub add {
733 my ($self, $child) = @_; 773 my ($self, $child) = @_;
734 774
735 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
738} 777}
739 778
740sub remove { 779sub remove {
741 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
758 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
759} 798}
760 799
761############################################################################# 800#############################################################################
762 801
802# back-buffered drawing area
803
763package CFClient::UI::Window; 804package CFClient::UI::Window;
764 805
765our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
766 807
767use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
785 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 827 $self->update;
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $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 {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 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
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
843} 896}
844 897
845sub size_allocate { 898sub size_allocate {
846 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
847 900
901 my $child = $self->child;
902
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 905
851 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
852 $self->update; 907 $self->update;
853} 908}
854 909
… …
890} 945}
891 946
892sub _render { 947sub _render {
893 my ($self) = @_; 948 my ($self) = @_;
894 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
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 954
897 $self->SUPER::_render; 955 $self->SUPER::_render;
898} 956}
899 957
… …
902package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
903 961
904our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
905 963
906sub new { 964sub new {
907 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
908 968
909 my $self; 969 my $self;
910 970
911 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
912 vertical => 1, 972 vertical => 1,
… …
917 ; 977 ;
918 978
919 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 981 slider => $slider,
922 @_, 982 %arg,
923 ); 983 );
924 984
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
928 987
929 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
930} 995}
931 996
932sub update { 997sub update {
933 my ($self) = @_; 998 my ($self) = @_;
934 999
… …
973 1038
974 if ($self->{bg}) { 1039 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
976 1041
977 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
980 1045
981 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
982 glVertex 0 , 0; 1047 glVertex 0 , 0;
983 glVertex 0 , $h; 1048 glVertex 0 , $h;
984 glVertex $w, $h; 1049 glVertex $w, $h;
… …
997 1062
998our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
999 1064
1000use CFClient::OpenGL; 1065use CFClient::OpenGL;
1001 1066
1002my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1074
1006sub new { 1075sub new {
1007 my $class = shift; 1076 my ($class, %arg) = @_;
1008 1077
1009 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1081 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1082 can_events => 1,
1015 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1016 ); 1086 );
1017 1087
1018 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1019 align => 0, 1089 align => 0,
1020 valign => 1, 1090 valign => 1,
1021 text => $self->{title}, 1091 text => $self->{title},
1022 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1023 1103
1024 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1025} 1113}
1026 1114
1027sub border { 1115sub border {
1028 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1029} 1117}
1030 1118
1031sub size_request { 1119sub size_request {
1032 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1033 1127
1034 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1035 1129
1036 ( 1130 (
1037 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1040} 1134}
1041 1135
1042sub size_allocate { 1136sub size_allocate {
1043 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1044 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1045 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1047 1149
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049 if $self->{title};
1050
1051 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1052} 1154}
1053 1155
1054sub button_down { 1156sub button_down {
1055 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1056 1158
… …
1072 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1073 1175
1074 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1076 1178
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1181
1082 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1083 }; 1184 };
1084 1185
1085 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1190 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1091 1192
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1194
1094 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1096 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1100 } 1203 1
1101} 1204}
1102 1205
1103sub button_up { 1206sub button_up {
1104 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1105 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1106 delete $self->{motion}; 1212 !!delete $self->{motion}
1107} 1213}
1108 1214
1109sub mouse_motion { 1215sub mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1111 1217
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1113} 1221}
1114 1222
1115sub _draw { 1223sub _draw {
1116 my ($self) = @_; 1224 my ($self) = @_;
1117 1225
1226 my $child = $self->{children}[0];
1227
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1230
1121 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1233
1124 my $border = $self->border; 1234 my $border = $self->border;
1125 1235
1126 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1241
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1134 1244
1135 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1250 }
1146 1251
1147 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1148 1253
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1152} 1265}
1153 1266
1154############################################################################# 1267#############################################################################
1155 1268
1156package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1179 1292
1180 $child->set_parent ($self); 1293 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1182 1295
1183 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1184} 1303}
1185 1304
1186# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1306sub clear {
1188 my ($self) = @_; 1307 my ($self) = @_;
… …
1193 for (@children) { 1312 for (@children) {
1194 delete $_->{parent}; 1313 delete $_->{parent};
1195 $_->hide; 1314 $_->hide;
1196 } 1315 }
1197 1316
1198 $self->check_size (1); 1317 $self->realloc;
1199 $self->update;
1200} 1318}
1201 1319
1202sub get_wh { 1320sub get_wh {
1203 my ($self) = @_; 1321 my ($self) = @_;
1204 1322
… …
1324 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1325 1443
1326 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1445 my $children = $self->{children};
1328 1446
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1447 my @req;
1330 my $req = List::Util::sum @req;
1331 1448
1332 if ($req > $space) { 1449 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1450 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1463 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1464 for 0 .. $#$children;
1465 }
1340 } 1466 }
1341 1467
1342 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1343 1469
1344 my $pos = 0; 1470 my $pos = 0;
… …
1404 ellipsise => 3, # end 1530 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1406 fontsize => 1, 1532 fontsize => 1,
1407 align => -1, 1533 align => -1,
1408 valign => -1, 1534 valign => -1,
1409 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1410 can_events => 0, 1537 can_events => 0,
1411 %arg 1538 %arg
1412 ); 1539 );
1413 1540
1414 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1441 1568
1442 delete $self->{texture}; 1569 delete $self->{texture};
1443 $self->SUPER::update; 1570 $self->SUPER::update;
1444} 1571}
1445 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1446sub set_text { 1580sub set_text {
1447 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1448 1582
1449 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1451 1585
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1454 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1455 $self->update; 1591 $self->update;
1456 $self->check_size;
1457} 1592}
1458 1593
1459sub set_markup { 1594sub set_markup {
1460 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1461 1596
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1601
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1469 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1470 $self->update; 1607 $self->update;
1471 $self->check_size;
1472} 1608}
1473 1609
1474sub size_request { 1610sub size_request {
1475 my ($self) = @_; 1611 my ($self) = @_;
1476 1612
1613 $self->{size_req} ||= do {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1619
1483 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1484 1621
1485 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1625
1489 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1490 1627
1491 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1493 } 1633 };
1494 1634
1495 ( 1635 @{ $self->{size_req} }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1636}
1500 1637
1501sub size_allocate { 1638sub size_allocate {
1502 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1503 1640
1641 delete $self->{ox};
1642
1504 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505} 1645}
1506 1646
1507sub set_fontsize { 1647sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1509 1649
1510 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1651 delete $self->{texture};
1512 1652
1513 $self->update; 1653 $self->realloc;
1514 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1515} 1662}
1516 1663
1517sub _draw { 1664sub _draw {
1518 my ($self) = @_; 1665 my ($self) = @_;
1519 1666
… …
1525 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1676
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1531 1679
1680 unless (exists $self->{ox}) {
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1535 1684
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1541 }; 1688 };
1542 1689
1543 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1545 1694
1546 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1547 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1549 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1551 } 1702 }
1552 1703
1553 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1554} 1705}
1555 1706
… …
1572 can_hover => 1, 1723 can_hover => 1,
1573 can_focus => 1, 1724 can_focus => 1,
1574 valign => 0, 1725 valign => 0,
1575 can_events => 1, 1726 can_events => 1,
1576 #text => ... 1727 #text => ...
1728 #hidden => "*",
1577 @_ 1729 @_
1578 ) 1730 )
1579} 1731}
1580 1732
1581sub _set_text { 1733sub _set_text {
… …
1583 1735
1584 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1585 1737
1586 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1587 1739
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1741 $self->{text} = $text;
1592 1742
1593 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1595 1746
1596 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1597} 1751}
1598 1752
1599sub set_text { 1753sub set_text {
1600 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1601 1755
1602 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1757 $self->_set_text ($text);
1604 $self->update;
1605 $self->check_size;
1606} 1758}
1607 1759
1608sub get_text { 1760sub get_text {
1609 $_[0]{text} 1761 $_[0]{text}
1610} 1762}
… …
1640 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1643 } elsif ($uni) { 1795 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1645 } 1799 }
1646 1800
1647 $self->_set_text ($text); 1801 $self->_set_text ($text);
1648 $self->update; 1802
1649 $self->check_size; 1803 $self->realloc;
1804
1805 1
1650} 1806}
1651 1807
1652sub focus_in { 1808sub focus_in {
1653 my ($self) = @_; 1809 my ($self) = @_;
1654 1810
… …
1669 utf8::encode $text; 1825 utf8::encode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1671 1827
1672 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1673 $self->update; 1829 $self->update;
1830
1831 1
1674} 1832}
1675 1833
1676sub mouse_motion { 1834sub mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1679} 1839}
1680 1840
1681sub _draw { 1841sub _draw {
1682 my ($self) = @_; 1842 my ($self) = @_;
1683 1843
1684 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1685 1845
1686 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1689 } else { 1849 } else {
1690 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1691 } 1851 }
1692 1852
1693 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1856 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1760 } else { 1920 } else {
1761 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1762 } 1922 }
1763 1923
1764 } else { 1924 } else {
1765 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1766 } 1928 1
1767
1768} 1929}
1769 1930
1770############################################################################# 1931#############################################################################
1771 1932
1772package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1781 1942
1782sub new { 1943sub new {
1783 my $class = shift; 1944 my $class = shift;
1784 1945
1785 $class->SUPER::new ( 1946 $class->SUPER::new (
1786 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1787 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1789 can_hover => 1, 1951 can_hover => 1,
1790 align => 0, 1952 align => 0,
1791 valign => 0, 1953 valign => 0,
… …
1800 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1801 1963
1802 $self->emit ("activate") 1964 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1805} 1969}
1806 1970
1807sub _draw { 1971sub _draw {
1808 my ($self) = @_; 1972 my ($self) = @_;
1809 1973
1810 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 1975
1816 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1819 1979
… …
1824 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1825} 1985}
1826 1986
1827############################################################################# 1987#############################################################################
1828 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1829package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1830 2028
1831our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1832 2030
1833my @tex = 2031my @tex =
… …
1838 2036
1839sub new { 2037sub new {
1840 my $class = shift; 2038 my $class = shift;
1841 2039
1842 $class->SUPER::new ( 2040 $class->SUPER::new (
1843 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1844 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 2047 state => 0,
… …
1852} 2051}
1853 2052
1854sub size_request { 2053sub size_request {
1855 my ($self) = @_; 2054 my ($self) = @_;
1856 2055
1857 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1858} 2057}
1859 2058
1860sub button_down { 2059sub button_down {
1861 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1862 2061
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1866 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1867 } 2070 1
1868} 2071}
1869 2072
1870sub _draw { 2073sub _draw {
1871 my ($self) = @_; 2074 my ($self) = @_;
1872 2075
1873 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1874 2077
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 2079
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 2083
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2085
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2087
… …
2037 2242
2038 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2040 2245
2041 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2251
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2147 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2154 vertical => 0, 2360 vertical => 0,
2155 can_hover => 1, 2361 can_hover => 1,
2156 inner_pad => 0.02, 2362 inner_pad => 0.02,
2157 @_ 2363 @_
2158 ); 2364 );
… …
2161 $self->update; 2367 $self->update;
2162 2368
2163 $self 2369 $self
2164} 2370}
2165 2371
2372sub changed { }
2373
2166sub set_range { 2374sub set_range {
2167 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2168 2376
2169 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2170 2378
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2173} 2383}
2174 2384
2175sub set_value { 2385sub set_value {
2176 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2177 2387
… …
2196} 2406}
2197 2407
2198sub size_request { 2408sub size_request {
2199 my ($self) = @_; 2409 my ($self) = @_;
2200 2410
2201 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2412}
2206 2413
2207sub button_down { 2414sub button_down {
2208 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2209 2416
2210 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2211 2418
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2420
2214 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2215} 2422}
2216 2423
2217sub mouse_motion { 2424sub mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2219 2426
… …
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2431
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2433
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2228 } 2439 1
2229} 2440}
2230 2441
2231sub update { 2442sub update {
2232 my ($self) = @_; 2443 my ($self) = @_;
2233 2444
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2236 2454
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2239 2457
… …
2245 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2247 2465
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2250 }); 2468 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2469
2258 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2259 2471
2260 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2261 2473
… …
2322sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2324 2536
2325############################################################################# 2537#############################################################################
2326 2538
2327package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2328 2540
2329our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2330 2542
2331use CFClient::OpenGL; 2543use CFClient::OpenGL;
2332 2544
… …
2334 my $class = shift; 2546 my $class = shift;
2335 2547
2336 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2337 fontsize => 1, 2549 fontsize => 1,
2338 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2339 #font => default_font 2552 #font => default_font
2340 @_, 2553 @_,
2341 2554
2342 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2343 par => [], 2556 par => [],
… …
2366 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2367 2580
2368 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2369 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2371 2585
2372 $self->reflow; 2586 $self->reflow;
2373} 2587}
2374 2588
2375sub text_size { 2589sub text_size {
… …
2377 2591
2378 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2379 2593
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2382 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2383 2598
2384 $layout->size 2599 $layout->size
2385} 2600}
2386 2601
… …
2425 2640
2426 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2427 2642
2428 delete $self->{texture}; 2643 delete $self->{texture};
2429 2644
2430 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432 2647
2433 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2434 my $height = 0; 2649 my $height = 0;
2435 2650
… …
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439 2654
2440 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2446 $_->[1] = $h; 2662 $_->[1] = $h;
2447 } 2663 }
… …
2450 } 2666 }
2451 2667
2452 $self->{height} = $height; 2668 $self->{height} = $height;
2453 2669
2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2455 2671
2456 delete $self->{texture}; 2672 delete $self->{texture};
2457 } 2673 }
2458 2674
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2462 2678
2463 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2464 2680
2465 my $y0 = $top; 2681 my $y0 = $top;
… …
2479 my $h = $par->[1]; 2695 my $h = $par->[1];
2480 2696
2481 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2485 2702
2486 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2487 2704
2488 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2500sub _draw { 2717sub _draw {
2501 my ($self) = @_; 2718 my ($self) = @_;
2502 2719
2503 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2508 2725
2509 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2510 2727
2511} 2728}
… …
2594} 2811}
2595 2812
2596sub set_tooltip_from { 2813sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2598 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2599 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2831 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2833 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2616 2845
2617sub size_allocate { 2846sub size_allocate {
2618 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2619 2848
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2621} 2868}
2622 2869
2623sub _draw { 2870sub _draw {
2624 my ($self) = @_; 2871 my ($self) = @_;
2625 2872
… …
2642 glVertex $w, $h; 2889 glVertex $w, $h;
2643 glVertex $w, 0; 2890 glVertex $w, 0;
2644 glEnd; 2891 glEnd;
2645 2892
2646 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2647 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2648} 2896}
2649 2897
2650############################################################################# 2898#############################################################################
2651 2899
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 2959
2712 if ($tex) { 2960 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2718 } 2966 }
2719} 2967}
2720 2968
2721sub DESTROY { 2969sub destroy {
2722 my ($self) = @_; 2970 my ($self) = @_;
2723 2971
2724 $self->{timer}->cancel 2972 $self->{timer}->cancel
2725 if $self->{timer}; 2973 if $self->{timer};
2726 2974
2727 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2728} 2976}
2729 2977
2730############################################################################# 2978#############################################################################
2731 2979
2732package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2733 2981
2734our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2735 2983
2736sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2769 }
2770}
2771 2985
2772############################################################################# 2986#############################################################################
2773 2987
2774package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2775 2989
… …
2787 ); 3001 );
2788 3002
2789 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2790 3004
2791 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2792 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2793 3007
2794 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2795 if (!ref $widget) { 3009 if (!ref $widget) {
2796 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2797 can_hover => 1, 3011 can_hover => 1,
2798 can_events => 1, 3012 can_events => 1,
2799 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2800 } 3015 }
2801 3016
2802 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2803 3018
2804 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2816 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 3032 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2819 3034
2820 $self->show; 3035 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 3037}
2823 3038
2824sub mouse_motion { 3039sub mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2826 3041
2827 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2830} 3047}
2831 3048
2832sub button_up { 3049sub button_up {
2833 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2834 3051
… …
2836 undef $GRAB; 3053 undef $GRAB;
2837 $self->hide; 3054 $self->hide;
2838 3055
2839 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2841 } 3062 1
2842} 3063}
2843 3064
2844############################################################################# 3065#############################################################################
2845 3066
2846package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2847 3068
2848our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2849 3070
2850sub new { 3071sub new {
2851 my $class = shift; 3072 my $class = shift;
2852 3073
2853 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3239 fontsize => 0.8,
2855 @_, 3240 @_,
2856 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2857} 3248}
2858 3249
2859sub reorder { 3250sub reorder {
2860 my ($self) = @_; 3251 my ($self) = @_;
2861 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2862 3258
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3261 }
2866 3262
… …
2869 my @items = sort { 3265 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2873 3269
3270 $self->{timer}->interval (1);
3271
2874 my $count = 10 + 1; 3272 my $count = 10 + 1;
2875 for my $item (@items) { 3273 for my $item (@items) {
2876 last unless --$count; 3274 last unless --$count;
2877 3275
2878 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3280 : $item->{text};
2883 3281
… …
2891 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3295 can_events => 1,
2898 can_hover => 1 3296 can_hover => 1
2899 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2900 } 3310 }
2901 3311
2902 $self->clear; 3312 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2904} 3314}
… …
2909 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2911 3321
2912 return unless $text; 3322 return unless $text;
2913 3323
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3325
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3327
2918 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2920 $item->{count}++; 3330 $item->{count}++;
2921 } else { 3331 } else {
2922 $item->{count} = 1; 3332 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2924 } 3334 }
2925 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2926 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2927 delete $item->{label}; 3337 delete $item->{label};
2928 } else { 3338 } else {
2929 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2930 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2949 3359
2950 $self->reorder; 3360 $self->reorder;
2951 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2952} 3362}
2953 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2954############################################################################# 3372#############################################################################
2955 3373
2956package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2957 3375
2958our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960use CFClient::OpenGL;
2961 3377
2962sub new { 3378sub new {
2963 my $class = shift; 3379 my $class = shift;
2964 3380
2965 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
2966 visible => 1, 3748 visible => 1,
2967 @_, 3749 @_,
2968 ) 3750 );
2969}
2970 3751
2971sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3753
2974 $self->{w} = $w; 3754 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3755}
2984 3756
2985sub size_request { 3757sub size_request {
2986 my ($self) = @_; 3758 my ($self) = @_;
2987 3759
2988 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2989} 3775}
2990 3776
2991sub size_allocate { 3777sub size_allocate {
2992 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2993 3779
2994 for my $child ($self->children) { 3780 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3782
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
2999 3785
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
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 3788
3008 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3009 } 3790 }
3010} 3791}
3011 3792
… …
3022} 3803}
3023 3804
3024sub update { 3805sub update {
3025 my ($self) = @_; 3806 my ($self) = @_;
3026 3807
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3029} 3809}
3030 3810
3031sub add { 3811sub add {
3032 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3033 3813
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3036 3815 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3816
3042 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3818}
3050 3819
3051sub remove { 3820sub remove {
3052 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3053 3822
3054 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3055 3827
3056 while (@children) { 3828 while (@children) {
3057 my $w = pop @children; 3829 my $w = pop @children;
3058 push @children, $w->children; 3830 push @children, $w->children;
3059 $w->set_invisible; 3831 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3079 $_->() 3851 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3081 } 3853 }
3082 3854
3083 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3084 my @queue; 3857 my @queue;
3858 my $widget;
3085 3859
3086 for (;;) { 3860 outer:
3087 if ($self->{check_size}) { 3861 while () {
3088 #TODO use array-of-depth approach 3862 if (my $realloc = delete $self->{realloc}) {
3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3089 3865
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3092 } 3870 }
3093 3871
3872 while () {
3873 @queue or last outer;
3874
3094 my $widget = pop @queue || last; 3875 $widget = pop @{ $queue[-1] || [] }
3095 3876 and last;
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3108 3898
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3110 3900
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3113 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3114 } 3911 }
3115 } 3912 }
3116 3913
3117 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3922
3121 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3123 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3124 $widget->{w} = $w; 3933 $widget->{w} = $w;
3125 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3126 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3127 } 3938 }
3128 } 3939 }
3129 3940
3130 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3131 $_->() 3942 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3133 } 3944 }
3945
3134 3946
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3138 3950
… …
3140 glLoadIdentity; 3952 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3955 glLoadIdentity;
3144 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3145 $self->_draw; 3964 $self->_draw;
3146} 3965}
3147 3966
3148############################################################################# 3967#############################################################################
3149 3968

Diff Legend

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