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

Diff Legend

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