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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub 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};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1024 1103
1025 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1026} 1113}
1027 1114
1028sub border { 1115sub border {
1029 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1030} 1117}
1031 1118
1032sub size_request { 1119sub size_request {
1033 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1034 1127
1035 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1036 1129
1037 ( 1130 (
1038 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1041} 1134}
1042 1135
1043sub size_allocate { 1136sub size_allocate {
1044 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1045 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1046 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1048 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1053} 1154}
1054 1155
1055sub button_down { 1156sub button_down {
1056 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1057 1158
… …
1073 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1074 1175
1075 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1077 1178
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1181
1083 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1084 }; 1184 };
1085 1185
1086 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1190 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1092 1192
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1194
1095 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1097 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1101 } 1203 1
1102} 1204}
1103 1205
1104sub button_up { 1206sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1106 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1107 delete $self->{motion}; 1212 !!delete $self->{motion}
1108} 1213}
1109 1214
1110sub mouse_motion { 1215sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1112 1217
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1114} 1221}
1115 1222
1116sub _draw { 1223sub _draw {
1117 my ($self) = @_; 1224 my ($self) = @_;
1118 1225
1226 my $child = $self->{children}[0];
1227
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1230
1122 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1233
1125 my $border = $self->border; 1234 my $border = $self->border;
1126 1235
1127 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1241
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1135 1244
1136 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1248 $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); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1250 }
1147 1251
1148 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1149 1253
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1153} 1265}
1154 1266
1155############################################################################# 1267#############################################################################
1156 1268
1157package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1180 1292
1181 $child->set_parent ($self); 1293 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1183 1295
1184 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1185} 1303}
1186 1304
1187# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1306sub clear {
1189 my ($self) = @_; 1307 my ($self) = @_;
… …
1194 for (@children) { 1312 for (@children) {
1195 delete $_->{parent}; 1313 delete $_->{parent};
1196 $_->hide; 1314 $_->hide;
1197 } 1315 }
1198 1316
1199 $self->check_size (1); 1317 $self->realloc;
1200 $self->update;
1201} 1318}
1202 1319
1203sub get_wh { 1320sub get_wh {
1204 my ($self) = @_; 1321 my ($self) = @_;
1205 1322
… …
1413 ellipsise => 3, # end 1530 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1415 fontsize => 1, 1532 fontsize => 1,
1416 align => -1, 1533 align => -1,
1417 valign => -1, 1534 valign => -1,
1418 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1419 can_events => 0, 1537 can_events => 0,
1420 %arg 1538 %arg
1421 ); 1539 );
1422 1540
1423 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1450 1568
1451 delete $self->{texture}; 1569 delete $self->{texture};
1452 $self->SUPER::update; 1570 $self->SUPER::update;
1453} 1571}
1454 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1455sub set_text { 1580sub set_text {
1456 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1457 1582
1458 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1460 1585
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1463 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1464 $self->update; 1591 $self->update;
1465 $self->check_size;
1466} 1592}
1467 1593
1468sub set_markup { 1594sub set_markup {
1469 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1470 1596
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1601
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1478 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1479 $self->update; 1607 $self->update;
1480 $self->check_size;
1481} 1608}
1482 1609
1483sub size_request { 1610sub size_request {
1484 my ($self) = @_; 1611 my ($self) = @_;
1485 1612
1613 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1619
1492 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1493 1621
1494 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1625
1498 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1499 1627
1500 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1502 } 1633 };
1503 1634
1504 ( 1635 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1636}
1509 1637
1510sub size_allocate { 1638sub size_allocate {
1511 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1512 1640
1641 delete $self->{ox};
1642
1513 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1645}
1515 1646
1516sub set_fontsize { 1647sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1518 1649
1519 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1651 delete $self->{texture};
1521 1652
1522 $self->update; 1653 $self->realloc;
1523 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1524} 1662}
1525 1663
1526sub _draw { 1664sub _draw {
1527 my ($self) = @_; 1665 my ($self) = @_;
1528 1666
… …
1534 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1676
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1540 1679
1680 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1544 1684
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1688 };
1551 1689
1552 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1554 1694
1555 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1556 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1558 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1560 } 1702 }
1561 1703
1562 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1563} 1705}
1564 1706
… …
1581 can_hover => 1, 1723 can_hover => 1,
1582 can_focus => 1, 1724 can_focus => 1,
1583 valign => 0, 1725 valign => 0,
1584 can_events => 1, 1726 can_events => 1,
1585 #text => ... 1727 #text => ...
1728 #hidden => "*",
1586 @_ 1729 @_
1587 ) 1730 )
1588} 1731}
1589 1732
1590sub _set_text { 1733sub _set_text {
… …
1592 1735
1593 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1594 1737
1595 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1596 1739
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1741 $self->{text} = $text;
1601 1742
1602 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1604 1746
1605 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1606} 1751}
1607 1752
1608sub set_text { 1753sub set_text {
1609 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1610 1755
1611 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1757 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1758}
1616 1759
1617sub get_text { 1760sub get_text {
1618 $_[0]{text} 1761 $_[0]{text}
1619} 1762}
… …
1649 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1652 } elsif ($uni) { 1795 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1654 } 1799 }
1655 1800
1656 $self->_set_text ($text); 1801 $self->_set_text ($text);
1657 $self->update; 1802
1658 $self->check_size; 1803 $self->realloc;
1804
1805 1
1659} 1806}
1660 1807
1661sub focus_in { 1808sub focus_in {
1662 my ($self) = @_; 1809 my ($self) = @_;
1663 1810
… …
1678 utf8::encode $text; 1825 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1680 1827
1681 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1682 $self->update; 1829 $self->update;
1830
1831 1
1683} 1832}
1684 1833
1685sub mouse_motion { 1834sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1688} 1839}
1689 1840
1690sub _draw { 1841sub _draw {
1691 my ($self) = @_; 1842 my ($self) = @_;
1692 1843
1693 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1694 1845
1695 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1698 } else { 1849 } else {
1699 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1700 } 1851 }
1701 1852
1702 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1856 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1769 } else { 1920 } else {
1770 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1771 } 1922 }
1772 1923
1773 } else { 1924 } else {
1774 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1775 } 1928 1
1776
1777} 1929}
1778 1930
1779############################################################################# 1931#############################################################################
1780 1932
1781package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1790 1942
1791sub new { 1943sub new {
1792 my $class = shift; 1944 my $class = shift;
1793 1945
1794 $class->SUPER::new ( 1946 $class->SUPER::new (
1795 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1796 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1798 can_hover => 1, 1951 can_hover => 1,
1799 align => 0, 1952 align => 0,
1800 valign => 0, 1953 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1810 1963
1811 $self->emit ("activate") 1964 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1814} 1969}
1815 1970
1816sub _draw { 1971sub _draw {
1817 my ($self) = @_; 1972 my ($self) = @_;
1818 1973
1819 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1975
1825 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1828 1979
… …
1833 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1834} 1985}
1835 1986
1836############################################################################# 1987#############################################################################
1837 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1838package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1839 2028
1840our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1841 2030
1842my @tex = 2031my @tex =
… …
1847 2036
1848sub new { 2037sub new {
1849 my $class = shift; 2038 my $class = shift;
1850 2039
1851 $class->SUPER::new ( 2040 $class->SUPER::new (
1852 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1853 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 2047 state => 0,
… …
1861} 2051}
1862 2052
1863sub size_request { 2053sub size_request {
1864 my ($self) = @_; 2054 my ($self) = @_;
1865 2055
1866 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1867} 2057}
1868 2058
1869sub button_down { 2059sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1871 2061
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1876 } 2070 1
1877} 2071}
1878 2072
1879sub _draw { 2073sub _draw {
1880 my ($self) = @_; 2074 my ($self) = @_;
1881 2075
1882 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1883 2077
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2079
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2083
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2085
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2087
… …
2046 2242
2047 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2049 2245
2050 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2251
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2163 vertical => 0, 2360 vertical => 0,
2164 can_hover => 1, 2361 can_hover => 1,
2165 inner_pad => 0.02, 2362 inner_pad => 0.02,
2166 @_ 2363 @_
2167 ); 2364 );
… …
2170 $self->update; 2367 $self->update;
2171 2368
2172 $self 2369 $self
2173} 2370}
2174 2371
2372sub changed { }
2373
2175sub set_range { 2374sub set_range {
2176 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2177 2376
2178 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2179 2378
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2182} 2383}
2183 2384
2184sub set_value { 2385sub set_value {
2185 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2186 2387
… …
2205} 2406}
2206 2407
2207sub size_request { 2408sub size_request {
2208 my ($self) = @_; 2409 my ($self) = @_;
2209 2410
2210 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2412}
2215 2413
2216sub button_down { 2414sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2218 2416
2219 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2220 2418
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2420
2223 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2224} 2422}
2225 2423
2226sub mouse_motion { 2424sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2228 2426
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2431
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2433
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2237 } 2439 1
2238} 2440}
2239 2441
2240sub update { 2442sub update {
2241 my ($self) = @_; 2443 my ($self) = @_;
2242 2444
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2245 2454
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2248 2457
… …
2254 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2256 2465
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2259 }); 2468 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2469
2267 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2268 2471
2269 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2270 2473
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2333 2536
2334############################################################################# 2537#############################################################################
2335 2538
2336package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2337 2540
2338our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2339 2542
2340use CFClient::OpenGL; 2543use CFClient::OpenGL;
2341 2544
… …
2343 my $class = shift; 2546 my $class = shift;
2344 2547
2345 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2346 fontsize => 1, 2549 fontsize => 1,
2347 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2348 #font => default_font 2552 #font => default_font
2349 @_, 2553 @_,
2350 2554
2351 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2352 par => [], 2556 par => [],
… …
2375 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2376 2580
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 2585
2381 $self->reflow; 2586 $self->reflow;
2382} 2587}
2383 2588
2384sub text_size { 2589sub text_size {
… …
2386 2591
2387 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2388 2593
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2392 2598
2393 $layout->size 2599 $layout->size
2394} 2600}
2395 2601
… …
2434 2640
2435 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2436 2642
2437 delete $self->{texture}; 2643 delete $self->{texture};
2438 2644
2439 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2647
2442 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2649 my $height = 0;
2444 2650
… …
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448 2654
2449 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2452 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h; 2662 $_->[1] = $h;
2456 } 2663 }
… …
2459 } 2666 }
2460 2667
2461 $self->{height} = $height; 2668 $self->{height} = $height;
2462 2669
2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2464 2671
2465 delete $self->{texture}; 2672 delete $self->{texture};
2466 } 2673 }
2467 2674
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2471 2678
2472 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2473 2680
2474 my $y0 = $top; 2681 my $y0 = $top;
… …
2488 my $h = $par->[1]; 2695 my $h = $par->[1];
2489 2696
2490 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2494 2702
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2496 2704
2497 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2509sub _draw { 2717sub _draw {
2510 my ($self) = @_; 2718 my ($self) = @_;
2511 2719
2512 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2517 2725
2518 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2519 2727
2520} 2728}
… …
2603} 2811}
2604 2812
2605sub set_tooltip_from { 2813sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2607 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2608 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2831 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2833 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2845
2626sub size_allocate { 2846sub size_allocate {
2627 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2628 2848
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2630} 2868}
2631 2869
2632sub _draw { 2870sub _draw {
2633 my ($self) = @_; 2871 my ($self) = @_;
2634 2872
… …
2651 glVertex $w, $h; 2889 glVertex $w, $h;
2652 glVertex $w, 0; 2890 glVertex $w, 0;
2653 glEnd; 2891 glEnd;
2654 2892
2655 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2656 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2657} 2896}
2658 2897
2659############################################################################# 2898#############################################################################
2660 2899
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 2959
2721 if ($tex) { 2960 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2727 } 2966 }
2728} 2967}
2729 2968
2730sub DESTROY { 2969sub destroy {
2731 my ($self) = @_; 2970 my ($self) = @_;
2732 2971
2733 $self->{timer}->cancel 2972 $self->{timer}->cancel
2734 if $self->{timer}; 2973 if $self->{timer};
2735 2974
2736 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2737} 2976}
2738 2977
2739############################################################################# 2978#############################################################################
2740 2979
2741package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2742 2981
2743our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2744 2983
2745sub new { 2984# 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 2985
2781############################################################################# 2986#############################################################################
2782 2987
2783package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2784 2989
… …
2796 ); 3001 );
2797 3002
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 3004
2800 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2802 3007
2803 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2804 if (!ref $widget) { 3009 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2806 can_hover => 1, 3011 can_hover => 1,
2807 can_events => 1, 3012 can_events => 1,
2808 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2809 } 3015 }
2810 3016
2811 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2812 3018
2813 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2825 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 3032 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2828 3034
2829 $self->show; 3035 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 3037}
2832 3038
2833sub mouse_motion { 3039sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2835 3041
2836 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2839} 3047}
2840 3048
2841sub button_up { 3049sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2843 3051
… …
2845 undef $GRAB; 3053 undef $GRAB;
2846 $self->hide; 3054 $self->hide;
2847 3055
2848 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2850 } 3062 1
2851} 3063}
2852 3064
2853############################################################################# 3065#############################################################################
2854 3066
2855package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2856 3068
2857our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2858 3070
2859sub new { 3071sub new {
2860 my $class = shift; 3072 my $class = shift;
2861 3073
2862 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3239 fontsize => 0.8,
2864 @_, 3240 @_,
2865 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2866} 3248}
2867 3249
2868sub reorder { 3250sub reorder {
2869 my ($self) = @_; 3251 my ($self) = @_;
2870 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2871 3258
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3261 }
2875 3262
… …
2878 my @items = sort { 3265 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2882 3269
3270 $self->{timer}->interval (1);
3271
2883 my $count = 10 + 1; 3272 my $count = 10 + 1;
2884 for my $item (@items) { 3273 for my $item (@items) {
2885 last unless --$count; 3274 last unless --$count;
2886 3275
2887 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3280 : $item->{text};
2892 3281
… …
2900 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3295 can_events => 1,
2907 can_hover => 1 3296 can_hover => 1
2908 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2909 } 3310 }
2910 3311
2911 $self->clear; 3312 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2913} 3314}
… …
2918 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2920 3321
2921 return unless $text; 3322 return unless $text;
2922 3323
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3325
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3327
2927 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2929 $item->{count}++; 3330 $item->{count}++;
2930 } else { 3331 } else {
2931 $item->{count} = 1; 3332 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2933 } 3334 }
2934 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3337 delete $item->{label};
2937 } else { 3338 } else {
2938 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2958 3359
2959 $self->reorder; 3360 $self->reorder;
2960 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2961} 3362}
2962 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2963############################################################################# 3372#############################################################################
2964 3373
2965package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2966 3375
2967our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3377
2971sub new { 3378sub new {
2972 my $class = shift; 3379 my $class = shift;
2973 3380
2974 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
2975 visible => 1, 3748 visible => 1,
2976 @_, 3749 @_,
2977 ) 3750 );
2978}
2979 3751
2980sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3753
2983 $self->{w} = $w; 3754 $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} 3755}
2993 3756
2994sub size_request { 3757sub size_request {
2995 my ($self) = @_; 3758 my ($self) = @_;
2996 3759
2997 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2998} 3775}
2999 3776
3000sub size_allocate { 3777sub size_allocate {
3001 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
3002 3779
3003 for my $child ($self->children) { 3780 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3782
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3008 3785
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3787 $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 3788
3017 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3018 } 3790 }
3019} 3791}
3020 3792
… …
3031} 3803}
3032 3804
3033sub update { 3805sub update {
3034 my ($self) = @_; 3806 my ($self) = @_;
3035 3807
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3038} 3809}
3039 3810
3040sub add { 3811sub add {
3041 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3042 3813
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3045 3815 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3816
3051 $self->SUPER::add (@children); 3817 $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} 3818}
3059 3819
3060sub remove { 3820sub remove {
3061 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3062 3822
3063 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3064 3827
3065 while (@children) { 3828 while (@children) {
3066 my $w = pop @children; 3829 my $w = pop @children;
3067 push @children, $w->children; 3830 push @children, $w->children;
3068 $w->set_invisible; 3831 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3088 $_->() 3851 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3090 } 3853 }
3091 3854
3092 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3093 my @queue; 3857 my @queue;
3858 my $widget;
3094 3859
3095 for (;;) { 3860 outer:
3096 if ($self->{check_size}) { 3861 while () {
3097 #TODO use array-of-depth approach 3862 if (my $realloc = delete $self->{realloc}) {
3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3098 3865
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3101 } 3870 }
3102 3871
3872 while () {
3873 @queue or last outer;
3874
3103 my $widget = pop @queue || last; 3875 $widget = pop @{ $queue[-1] || [] }
3104 3876 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 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3117 3898
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3119 3900
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3122 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3123 } 3911 }
3124 } 3912 }
3125 3913
3126 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3922
3130 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3132 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3133 $widget->{w} = $w; 3933 $widget->{w} = $w;
3134 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3135 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3136 } 3938 }
3137 } 3939 }
3138 3940
3139 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3140 $_->() 3942 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3142 } 3944 }
3945
3143 3946
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3147 3950
… …
3149 glLoadIdentity; 3952 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3955 glLoadIdentity;
3153 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3154 $self->_draw; 3964 $self->_draw;
3155} 3965}
3156 3966
3157############################################################################# 3967#############################################################################
3158 3968

Diff Legend

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