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

Diff Legend

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