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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
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 center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 253}
261 254
262sub set_visible { 255sub set_visible {
263 my ($self) = @_; 256 my ($self) = @_;
264 257
265 return if $self->{visible}; 258 return if $self->{visible};
266 259
267 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
269 262
270 $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;
271} 268}
272 269
273sub set_invisible { 270sub set_invisible {
274 my ($self) = @_; 271 my ($self) = @_;
275 272
276 return unless $self->{visible}; 273 return unless $self->{visible};
277 274
278 # broken show/hide model 275 $_->set_invisible for $self->children;
279 276
277 delete $self->{visible};
280 delete $self->{root}; 278 delete $self->{root};
281 delete $self->{visible};
282 279
283 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
285 282
286 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
288 285
289 $self->focus_out; 286 $self->focus_out;
290 287
291 $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;
292} 306}
293 307
294sub hide { 308sub hide {
295 my ($self) = @_; 309 my ($self) = @_;
296 310
… …
298 312
299 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
300 if $self->{parent}; 314 if $self->{parent};
301} 315}
302 316
303sub move { 317sub move_abs {
304 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
305 319
306 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
307 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
308 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
309 323
310 $self->update; 324 $self->update;
311} 325}
312 326
313sub set_size { 327sub set_size {
314 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
315 329
316 $self->{def_w} = $w; 330 $self->{force_w} = $w;
317 $self->{def_h} = $h; 331 $self->{force_h} = $h;
318 332
319 $self->check_size; 333 $self->realloc;
320} 334}
321 335
322sub size_request { 336sub size_request {
323 require Carp; 337 require Carp;
324 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
326 340
327sub configure { 341sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
329 343
330 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
333 349
334 # use alignment to adjust x, y 350 # use alignment to adjust x, y
335 351
336 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 354 }
341 355
342 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 357 $self->{x} = $x;
344 $self->{y} = $y; 358 $self->{y} = $y;
345 $self->update; 359 $self->update;
346 } 360 }
347 361
348 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $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;
350 } 369 }
351} 370}
352 371
353sub size_allocate { 372sub size_allocate {
354 # nothing to be done 373 # nothing to be done
355} 374}
356 375
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::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
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
448sub 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
449 538
450sub draw { 539sub draw {
451 my ($self) = @_; 540 my ($self) = @_;
452 541
453 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);
454 553
455 glPushMatrix; 554 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw;
458 glPopMatrix;
459 556
460 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
461 my ($x, $y) = @$self{qw(x y)};
462
463 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464 glEnable GL_BLEND; 559 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466 glBegin GL_QUADS; 561 glBegin GL_QUADS;
467 glVertex $x , $y; 562 glVertex 0 , 0;
468 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
469 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
470 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
471 glEnd; 566 glEnd;
472 glDisable GL_BLEND; 567 glDisable GL_BLEND;
473 } 568 }
474 569
475 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 571 glPushMatrix;
477 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
479 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 575 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
484 glEnd; 579 glEnd;
485 glPopMatrix; 580 glPopMatrix;
486 #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;
487 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
488} 586}
489 587
490sub _draw { 588sub _draw {
491 my ($self) = @_; 589 my ($self) = @_;
492 590
493 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
494} 592}
495 593
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 594sub DESTROY {
556 my ($self) = @_; 595 my ($self) = @_;
557 596
558 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
559 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
560} 601}
561 602
562############################################################################# 603#############################################################################
563 604
564package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
589 630
590 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
591 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
592 633
593 glEnable GL_BLEND; 634 glEnable GL_BLEND;
594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595 glColor @$color; 636 glColor_premultiply @$color;
596 637
597 glBegin GL_QUADS; 638 glBegin GL_QUADS;
598 glVertex 0 , 0; 639 glVertex 0 , 0;
599 glVertex 0 , $h; 640 glVertex 0 , $h;
600 glVertex $w, $h; 641 glVertex $w, $h;
… …
615 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
617} 658}
618 659
619sub size_request { 660sub size_request {
620 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
621} 664}
622 665
623sub draw { } 666sub draw { }
624 667
625############################################################################# 668#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
630 673
631sub new { 674sub new {
632 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
633 676
634 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
635 678
636 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
637 children => [], 680 children => [],
638 can_events => 0, 681 can_events => 0,
639 %arg, 682 %arg,
640 ); 683 );
684
641 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
642 687
643 $self 688 $self
644} 689}
645 690
646sub add { 691sub add {
… …
654 $self->{children} = [ 699 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
657 ]; 702 ];
658 703
659 $self->check_size (1); 704 $self->realloc;
660 $self->update;
661} 705}
662 706
663sub children { 707sub children {
664 @{ $_[0]{children} } 708 @{ $_[0]{children} }
665} 709}
… …
670 delete $child->{parent}; 714 delete $child->{parent};
671 $child->hide; 715 $child->hide;
672 716
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 718
675 $self->check_size (1); 719 $self->realloc;
676 $self->update;
677} 720}
678 721
679sub clear { 722sub clear {
680 my ($self) = @_; 723 my ($self) = @_;
681 724
… …
685 for (@$children) { 728 for (@$children) {
686 delete $_->{parent}; 729 delete $_->{parent};
687 $_->hide; 730 $_->hide;
688 } 731 }
689 732
690 $self->check_size; 733 $self->realloc;
691 $self->update;
692} 734}
693 735
694sub find_widget { 736sub find_widget {
695 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
696 738
697 $x -= $self->{x}; 739 $x -= $self->{x};
698 $y -= $self->{y}; 740 $y -= $self->{y};
699 741
700 my $res; 742 my $res;
701 743
702 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
704 and return $res; 746 and return $res;
705 } 747 }
706 748
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
728} 770}
729 771
730sub add { 772sub add {
731 my ($self, $child) = @_; 773 my ($self, $child) = @_;
732 774
733 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
734
735 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
736} 777}
737 778
738sub remove { 779sub remove {
739 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
756 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
757} 798}
758 799
759############################################################################# 800#############################################################################
760 801
802# back-buffered drawing area
803
761package CFClient::UI::Window; 804package CFClient::UI::Window;
762 805
763our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
764 807
765use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
783 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 827 $self->update;
785} 828}
786 829
787sub _render { 830sub _render {
831 my ($self) = @_;
832
788 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
789} 834}
790 835
791sub render_child { 836sub render_child {
792 my ($self) = @_; 837 my ($self) = @_;
793 838
794 $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 {
795 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
797 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
798 $self->_render; 850 $self->_render;
799 }; 851 };
800} 852}
801 853
802sub _draw { 854sub _draw {
803 my ($self) = @_; 855 my ($self) = @_;
804 856
805 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
806 858
807 my $tex = $self->{texture} 859 my $tex = $self->{texture}
808 or return; 860 or return;
809 861
810 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
813 865
814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815 867
816 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
817} 869}
… …
833} 885}
834 886
835sub size_request { 887sub size_request {
836 my ($self) = @_; 888 my ($self) = @_;
837 889
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 891
840 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
842 894
843 ($w, $h) 895 ($w, $h)
844} 896}
845 897
846sub size_allocate { 898sub size_allocate {
847 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
848 900
901 my $child = $self->child;
902
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 905
852 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
853 $self->update; 907 $self->update;
854} 908}
855 909
… …
891} 945}
892 946
893sub _render { 947sub _render {
894 my ($self) = @_; 948 my ($self) = @_;
895 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
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 954
898 $self->SUPER::_render; 955 $self->SUPER::_render;
899} 956}
900 957
… …
903package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
904 961
905our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
906 963
907sub new { 964sub new {
908 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
909 968
910 my $self; 969 my $self;
911 970
912 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
913 vertical => 1, 972 vertical => 1,
… …
918 ; 977 ;
919 978
920 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 981 slider => $slider,
923 @_, 982 %arg,
924 ); 983 );
925 984
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
929 987
930 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
931} 995}
932 996
933sub update { 997sub update {
934 my ($self) = @_; 998 my ($self) = @_;
935 999
… …
974 1038
975 if ($self->{bg}) { 1039 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
977 1041
978 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
981 1045
982 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
983 glVertex 0 , 0; 1047 glVertex 0 , 0;
984 glVertex 0 , $h; 1048 glVertex 0 , $h;
985 glVertex $w, $h; 1049 glVertex $w, $h;
… …
998 1062
999our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1000 1064
1001use CFClient::OpenGL; 1065use CFClient::OpenGL;
1002 1066
1003my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 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);
1006 1074
1007sub new { 1075sub new {
1008 my $class = shift; 1076 my ($class, %arg) = @_;
1009 1077
1010 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1081 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1082 can_events => 1,
1016 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1017 ); 1086 );
1018 1087
1019 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1020 align => 0, 1089 align => 0,
1021 valign => 1, 1090 valign => 1,
1022 text => $self->{title}, 1091 text => $self->{title},
1023 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1024 1094
1025 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1026} 1103}
1027 1104
1028sub border { 1105sub border {
1029 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1030} 1107}
1031 1108
1032sub size_request { 1109sub size_request {
1033 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1034 1114
1035 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1036 1116
1037 ( 1117 (
1038 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1041} 1121}
1042 1122
1043sub size_allocate { 1123sub size_allocate {
1044 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1045 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1046 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1048 1136
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1053} 1138}
1054 1139
1055sub button_down { 1140sub button_down {
1056 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1057 1142
… …
1073 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1074 1159
1075 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1077 1162
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1165
1083 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1084 }; 1168 };
1085 1169
1086 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1174 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1092 1176
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1178
1095 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1097 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1101 } 1187 1
1102} 1188}
1103 1189
1104sub button_up { 1190sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1106 1192
1107 delete $self->{motion}; 1193 !!delete $self->{motion}
1108} 1194}
1109 1195
1110sub mouse_motion { 1196sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1112 1198
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1114} 1202}
1115 1203
1116sub _draw { 1204sub _draw {
1117 my ($self) = @_; 1205 my ($self) = @_;
1118 1206
1207 my $child = $self->{children}[0];
1208
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1211
1122 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1214
1125 my $border = $self->border; 1215 my $border = $self->border;
1126 1216
1127 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1222
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1135 1225
1136 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1231 }
1147 1232
1148 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1149 1234
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1153} 1241}
1154 1242
1155############################################################################# 1243#############################################################################
1156 1244
1157package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1180 1268
1181 $child->set_parent ($self); 1269 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1183 1271
1184 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1185} 1279}
1186 1280
1187# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1282sub clear {
1189 my ($self) = @_; 1283 my ($self) = @_;
… …
1194 for (@children) { 1288 for (@children) {
1195 delete $_->{parent}; 1289 delete $_->{parent};
1196 $_->hide; 1290 $_->hide;
1197 } 1291 }
1198 1292
1199 $self->check_size (1); 1293 $self->realloc;
1200 $self->update;
1201} 1294}
1202 1295
1203sub get_wh { 1296sub get_wh {
1204 my ($self) = @_; 1297 my ($self) = @_;
1205 1298
… …
1413 ellipsise => 3, # end 1506 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1415 fontsize => 1, 1508 fontsize => 1,
1416 align => -1, 1509 align => -1,
1417 valign => -1, 1510 valign => -1,
1418 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1419 can_events => 0, 1513 can_events => 0,
1420 %arg 1514 %arg
1421 ); 1515 );
1422 1516
1423 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1450 1544
1451 delete $self->{texture}; 1545 delete $self->{texture};
1452 $self->SUPER::update; 1546 $self->SUPER::update;
1453} 1547}
1454 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1455sub set_text { 1556sub set_text {
1456 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1457 1558
1458 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1460 1561
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1463 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1464 $self->update; 1567 $self->update;
1465 $self->check_size;
1466} 1568}
1467 1569
1468sub set_markup { 1570sub set_markup {
1469 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1470 1572
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1577
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1478 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1479 $self->update; 1583 $self->update;
1480 $self->check_size;
1481} 1584}
1482 1585
1483sub size_request { 1586sub size_request {
1484 my ($self) = @_; 1587 my ($self) = @_;
1485 1588
1589 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1595
1492 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1493 1597
1494 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1601
1498 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1499 1603
1500 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1502 } 1609 };
1503 1610
1504 ( 1611 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1612}
1509 1613
1510sub size_allocate { 1614sub size_allocate {
1511 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1512 1616
1617 delete $self->{ox};
1618
1513 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1621}
1515 1622
1516sub set_fontsize { 1623sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1518 1625
1519 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1627 delete $self->{texture};
1521 1628
1522 $self->update; 1629 $self->realloc;
1523 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1524} 1638}
1525 1639
1526sub _draw { 1640sub _draw {
1527 my ($self) = @_; 1641 my ($self) = @_;
1528 1642
… …
1534 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1652
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1540 1655
1656 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1544 1660
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1664 };
1551 1665
1552 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1554 1670
1555 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1556 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1558 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1560 } 1678 }
1561 1679
1562 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1563} 1681}
1564 1682
… …
1581 can_hover => 1, 1699 can_hover => 1,
1582 can_focus => 1, 1700 can_focus => 1,
1583 valign => 0, 1701 valign => 0,
1584 can_events => 1, 1702 can_events => 1,
1585 #text => ... 1703 #text => ...
1704 #hidden => "*",
1586 @_ 1705 @_
1587 ) 1706 )
1588} 1707}
1589 1708
1590sub _set_text { 1709sub _set_text {
… …
1592 1711
1593 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1594 1713
1595 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1596 1715
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1717 $self->{text} = $text;
1601 1718
1602 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1604 1722
1605 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1606} 1727}
1607 1728
1608sub set_text { 1729sub set_text {
1609 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1610 1731
1611 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1733 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1734}
1616 1735
1617sub get_text { 1736sub get_text {
1618 $_[0]{text} 1737 $_[0]{text}
1619} 1738}
… …
1649 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1652 } elsif ($uni) { 1771 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1654 } 1775 }
1655 1776
1656 $self->_set_text ($text); 1777 $self->_set_text ($text);
1657 $self->update; 1778
1658 $self->check_size; 1779 $self->realloc;
1780
1781 1
1659} 1782}
1660 1783
1661sub focus_in { 1784sub focus_in {
1662 my ($self) = @_; 1785 my ($self) = @_;
1663 1786
… …
1678 utf8::encode $text; 1801 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1680 1803
1681 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1682 $self->update; 1805 $self->update;
1806
1807 1
1683} 1808}
1684 1809
1685sub mouse_motion { 1810sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1688} 1815}
1689 1816
1690sub _draw { 1817sub _draw {
1691 my ($self) = @_; 1818 my ($self) = @_;
1692 1819
1693 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1694 1821
1695 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1698 } else { 1825 } else {
1699 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1700 } 1827 }
1701 1828
1702 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1832 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1769 } else { 1896 } else {
1770 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1771 } 1898 }
1772 1899
1773 } else { 1900 } else {
1774 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1775 } 1904 1
1776
1777} 1905}
1778 1906
1779############################################################################# 1907#############################################################################
1780 1908
1781package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1790 1918
1791sub new { 1919sub new {
1792 my $class = shift; 1920 my $class = shift;
1793 1921
1794 $class->SUPER::new ( 1922 $class->SUPER::new (
1795 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1796 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1798 can_hover => 1, 1927 can_hover => 1,
1799 align => 0, 1928 align => 0,
1800 valign => 0, 1929 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1810 1939
1811 $self->emit ("activate") 1940 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1814} 1945}
1815 1946
1816sub _draw { 1947sub _draw {
1817 my ($self) = @_; 1948 my ($self) = @_;
1818 1949
1819 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1951
1825 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1828 1955
… …
1847 1974
1848sub new { 1975sub new {
1849 my $class = shift; 1976 my $class = shift;
1850 1977
1851 $class->SUPER::new ( 1978 $class->SUPER::new (
1852 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1853 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1985 state => 0,
… …
1861} 1989}
1862 1990
1863sub size_request { 1991sub size_request {
1864 my ($self) = @_; 1992 my ($self) = @_;
1865 1993
1866 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1867} 1995}
1868 1996
1869sub button_down { 1997sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1871 1999
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1876 } 2008 1
1877} 2009}
1878 2010
1879sub _draw { 2011sub _draw {
1880 my ($self) = @_; 2012 my ($self) = @_;
1881 2013
1882 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1883 2015
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2017
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2021
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2023
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2025
… …
2046 2180
2047 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2049 2183
2050 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2189
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2163 vertical => 0, 2298 vertical => 0,
2164 can_hover => 1, 2299 can_hover => 1,
2165 inner_pad => 0.02, 2300 inner_pad => 0.02,
2166 @_ 2301 @_
2167 ); 2302 );
… …
2170 $self->update; 2305 $self->update;
2171 2306
2172 $self 2307 $self
2173} 2308}
2174 2309
2310sub changed { }
2311
2175sub set_range { 2312sub set_range {
2176 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2177 2314
2178 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2179 2316
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2182} 2321}
2183 2322
2184sub set_value { 2323sub set_value {
2185 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2186 2325
… …
2205} 2344}
2206 2345
2207sub size_request { 2346sub size_request {
2208 my ($self) = @_; 2347 my ($self) = @_;
2209 2348
2210 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2350}
2215 2351
2216sub button_down { 2352sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2218 2354
2219 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2220 2356
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2358
2223 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2224} 2360}
2225 2361
2226sub mouse_motion { 2362sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2228 2364
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2369
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2371
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2237 } 2377 1
2238} 2378}
2239 2379
2240sub update { 2380sub update {
2241 my ($self) = @_; 2381 my ($self) = @_;
2242 2382
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2245 2392
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2248 2395
… …
2254 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2256 2403
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2259 }); 2406 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2407
2267 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2268 2409
2269 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2270 2411
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2333 2474
2334############################################################################# 2475#############################################################################
2335 2476
2336package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2337 2478
2338our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2339 2480
2340use CFClient::OpenGL; 2481use CFClient::OpenGL;
2341 2482
… …
2343 my $class = shift; 2484 my $class = shift;
2344 2485
2345 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2346 fontsize => 1, 2487 fontsize => 1,
2347 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2348 #font => default_font 2490 #font => default_font
2349 @_, 2491 @_,
2350 2492
2351 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2352 par => [], 2494 par => [],
… …
2375 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2376 2518
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 2523
2381 $self->reflow; 2524 $self->reflow;
2382} 2525}
2383 2526
2384sub text_size { 2527sub text_size {
… …
2386 2529
2387 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2388 2531
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2392 2536
2393 $layout->size 2537 $layout->size
2394} 2538}
2395 2539
… …
2434 2578
2435 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2436 2580
2437 delete $self->{texture}; 2581 delete $self->{texture};
2438 2582
2439 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2585
2442 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2587 my $height = 0;
2444 2588
… …
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448 2592
2449 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2452 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h; 2600 $_->[1] = $h;
2456 } 2601 }
… …
2459 } 2604 }
2460 2605
2461 $self->{height} = $height; 2606 $self->{height} = $height;
2462 2607
2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2464 2609
2465 delete $self->{texture}; 2610 delete $self->{texture};
2466 } 2611 }
2467 2612
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2471 2616
2472 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2473 2618
2474 my $y0 = $top; 2619 my $y0 = $top;
… …
2488 my $h = $par->[1]; 2633 my $h = $par->[1];
2489 2634
2490 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2494 2640
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2496 2642
2497 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2509sub _draw { 2655sub _draw {
2510 my ($self) = @_; 2656 my ($self) = @_;
2511 2657
2512 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2517 2663
2518 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2519 2665
2520} 2666}
… …
2603} 2749}
2604 2750
2605sub set_tooltip_from { 2751sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2607 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2608 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2769 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2771 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2783
2626sub size_allocate { 2784sub size_allocate {
2627 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2628 2786
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2630} 2806}
2631 2807
2632sub _draw { 2808sub _draw {
2633 my ($self) = @_; 2809 my ($self) = @_;
2634 2810
… …
2651 glVertex $w, $h; 2827 glVertex $w, $h;
2652 glVertex $w, 0; 2828 glVertex $w, 0;
2653 glEnd; 2829 glEnd;
2654 2830
2655 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2656 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2657} 2834}
2658 2835
2659############################################################################# 2836#############################################################################
2660 2837
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 2897
2721 if ($tex) { 2898 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2727 } 2904 }
2728} 2905}
2729 2906
2730sub DESTROY { 2907sub destroy {
2731 my ($self) = @_; 2908 my ($self) = @_;
2732 2909
2733 $self->{timer}->cancel 2910 $self->{timer}->cancel
2734 if $self->{timer}; 2911 if $self->{timer};
2735 2912
2736 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2737} 2914}
2738 2915
2739############################################################################# 2916#############################################################################
2740 2917
2741package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2742 2919
2743our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2744 2921
2745sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 2923
2781############################################################################# 2924#############################################################################
2782 2925
2783package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2784 2927
… …
2796 ); 2939 );
2797 2940
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 2942
2800 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2802 2945
2803 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2804 if (!ref $widget) { 2947 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2806 can_hover => 1, 2949 can_hover => 1,
2807 can_events => 1, 2950 can_events => 1,
2808 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2809 } 2953 }
2810 2954
2811 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2812 2956
2813 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2825 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2970 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2828 2972
2829 $self->show; 2973 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2975}
2832 2976
2833sub mouse_motion { 2977sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2835 2979
2836 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2839} 2985}
2840 2986
2841sub button_up { 2987sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2843 2989
… …
2845 undef $GRAB; 2991 undef $GRAB;
2846 $self->hide; 2992 $self->hide;
2847 2993
2848 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2850 } 3000 1
2851} 3001}
2852 3002
2853############################################################################# 3003#############################################################################
2854 3004
2855package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2856 3006
2857our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2858 3008
2859sub new { 3009sub new {
2860 my $class = shift; 3010 my $class = shift;
2861 3011
2862 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3177 fontsize => 0.8,
2864 @_, 3178 @_,
2865 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2866} 3186}
2867 3187
2868sub reorder { 3188sub reorder {
2869 my ($self) = @_; 3189 my ($self) = @_;
2870 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2871 3196
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3199 }
2875 3200
… …
2878 my @items = sort { 3203 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2882 3207
3208 $self->{timer}->interval (1);
3209
2883 my $count = 10 + 1; 3210 my $count = 10 + 1;
2884 for my $item (@items) { 3211 for my $item (@items) {
2885 last unless --$count; 3212 last unless --$count;
2886 3213
2887 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3218 : $item->{text};
2892 3219
… …
2900 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3233 can_events => 1,
2907 can_hover => 1 3234 can_hover => 1
2908 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2909 } 3248 }
2910 3249
2911 $self->clear; 3250 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2913} 3252}
… …
2918 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2920 3259
2921 return unless $text; 3260 return unless $text;
2922 3261
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3263
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3265
2927 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2929 $item->{count}++; 3268 $item->{count}++;
2930 } else { 3269 } else {
2931 $item->{count} = 1; 3270 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2933 } 3272 }
2934 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3275 delete $item->{label};
2937 } else { 3276 } else {
2938 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2958 3297
2959 $self->reorder; 3298 $self->reorder;
2960 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2961} 3300}
2962 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2963############################################################################# 3310#############################################################################
2964 3311
2965package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2966 3313
2967our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3315
2971sub new { 3316sub new {
2972 my $class = shift; 3317 my $class = shift;
2973 3318
2974 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
2975 visible => 1, 3685 visible => 1,
2976 @_, 3686 @_,
2977 ) 3687 );
2978}
2979 3688
2980sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3690
2983 $self->{w} = $w; 3691 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3692}
2993 3693
2994sub size_request { 3694sub size_request {
2995 my ($self) = @_; 3695 my ($self) = @_;
2996 3696
2997 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
2998} 3712}
2999 3713
3000sub size_allocate { 3714sub size_allocate {
3001 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3002 3716
3003 for my $child ($self->children) { 3717 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3719
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3008 3722
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3725
3017 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3018 } 3727 }
3019} 3728}
3020 3729
… …
3031} 3740}
3032 3741
3033sub update { 3742sub update {
3034 my ($self) = @_; 3743 my ($self) = @_;
3035 3744
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3038} 3746}
3039 3747
3040sub add { 3748sub add {
3041 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3042 3750
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3045 3752 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3753
3051 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3755}
3059 3756
3060sub remove { 3757sub remove {
3061 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3062 3759
3063 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3064 3764
3065 while (@children) { 3765 while (@children) {
3066 my $w = pop @children; 3766 my $w = pop @children;
3067 push @children, $w->children; 3767 push @children, $w->children;
3068 $w->set_invisible; 3768 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3088 $_->() 3788 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3090 } 3790 }
3091 3791
3092 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3093 my @queue; 3794 my @queue;
3795 my $widget;
3094 3796
3095 for (;;) { 3797 outer:
3096 if ($self->{check_size}) { 3798 while () {
3097 #TODO use array-of-depth approach 3799 if (my $realloc = delete $self->{realloc}) {
3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3098 3802
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3101 } 3807 }
3102 3808
3809 while () {
3810 @queue or last outer;
3811
3103 my $widget = pop @queue || last; 3812 $widget = pop @{ $queue[-1] || [] }
3104 3813 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3117 3835
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3119 3837
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3122 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3123 } 3848 }
3124 } 3849 }
3125 3850
3126 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3859
3130 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3132 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3133 $widget->{w} = $w; 3870 $widget->{w} = $w;
3134 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3135 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3136 } 3875 }
3137 } 3876 }
3138 3877
3139 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3140 $_->() 3879 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3142 } 3881 }
3882
3143 3883
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3147 3887
… …
3149 glLoadIdentity; 3889 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3892 glLoadIdentity;
3153 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3154 $self->_draw; 3901 $self->_draw;
3155} 3902}
3156 3903
3157############################################################################# 3904#############################################################################
3158 3905

Diff Legend

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