ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

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

Diff Legend

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