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.241 by root, Fri May 26 20:50:35 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;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
233 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
234 delete $self->{root}; 278 delete $self->{root};
235 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
240 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
242 285
243 $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;
244} 305}
245 306
246sub hide { 307sub hide {
247 my ($self) = @_; 308 my ($self) = @_;
248 309
… …
250 311
251 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
252 if $self->{parent}; 313 if $self->{parent};
253} 314}
254 315
255sub move { 316sub move_abs {
256 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
257 318
258 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
259 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
260 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
261 322
262 $self->update; 323 $self->update;
263} 324}
264 325
265sub set_size { 326sub set_size {
266 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
267 328
268 $self->{user_w} = $w; 329 $self->{force_w} = $w;
269 $self->{user_h} = $h; 330 $self->{force_h} = $h;
270 331
271 $self->check_size; 332 $self->realloc;
272} 333}
273 334
274sub size_request { 335sub size_request {
275 require Carp; 336 require Carp;
276 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
278 339
279sub configure { 340sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
281 342
282 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
285 348
286 # use alignment to adjust x, y 349 # use alignment to adjust x, y
287 350
288 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 353 }
293 354
294 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 356 $self->{x} = $x;
296 $self->{y} = $y; 357 $self->{y} = $y;
297 $self->update; 358 $self->update;
298 } 359 }
299 360
300 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
302 }
303}
304 363
305sub size_allocate { 364 $self->{alloc_w} = $w;
306 # nothing to be done 365 $self->{alloc_h} = $h;
307}
308 366
309sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
310 my ($self) = @_; 368 }
311
312 $self->check_size (1);
313 $self->update;
314} 369}
315 370
316sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
317} 377}
318 378
319sub set_max_size { 379sub set_max_size {
320 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
321 381
322 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
323 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
324} 386}
325 387
326sub set_tooltip { 388sub set_tooltip {
327 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
328 390
… …
333 395
334 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
335 397
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
339 } 401 }
340} 402}
341 403
342# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
343sub coord2local { 405sub coord2local {
… …
351 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
352 414
353 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
354} 416}
355 417
356sub focus_in { 418sub invoke_focus_in {
357 my ($self) = @_; 419 my ($self) = @_;
358 420
359 return if $FOCUS == $self; 421 return if $FOCUS == $self;
360 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
361 423
362 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
363 425
364 $self->_emit (focus_in => $focus);
365
366 $focus->update if $focus; 426 $focus->update if $focus;
367 $FOCUS->update; 427 $FOCUS->update;
368}
369 428
429 0
430}
431
370sub focus_out { 432sub invoke_focus_out {
371 my ($self) = @_; 433 my ($self) = @_;
372 434
373 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
374 436
375 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
376 438
377 $self->_emit (focus_out => $focus);
378
379 $focus->update if $focus; #? 439 $focus->update if $focus; #?
380 440
381 $::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
382 unless $FOCUS; 442 unless $FOCUS;
383}
384 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
385sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
386sub button_up { } 454sub invoke_button_up { 1 }
387sub key_down { } 455sub invoke_key_down { 1 }
388sub key_up { } 456sub invoke_key_up { 1 }
389 457
390sub button_down { 458sub invoke_button_down {
391 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
392 460
393 $self->focus_in; 461 $self->grab_focus;
394}
395 462
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
400sub 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
401 531
402sub draw { 532sub draw {
403 my ($self) = @_; 533 my ($self) = @_;
404 534
405 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);
406 546
407 glPushMatrix; 547 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 549
412 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 552 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 554 glBegin GL_QUADS;
419 glVertex $x , $y; 555 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
423 glEnd; 559 glEnd;
424 glDisable GL_BLEND; 560 glDisable GL_BLEND;
425 } 561 }
426 562
427 if ($ENV{PCLIENT_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 564 glPushMatrix;
429 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 568 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
436 glEnd; 572 glEnd;
437 glPopMatrix; 573 glPopMatrix;
438 #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;
439 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
440} 579}
441 580
442sub _draw { 581sub _draw {
443 my ($self) = @_; 582 my ($self) = @_;
444 583
445 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
446} 585}
447 586
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506}
507
508sub DESTROY { 587sub DESTROY {
509 my ($self) = @_; 588 my ($self) = @_;
510 589
511 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
512 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
513} 594}
514 595
515############################################################################# 596#############################################################################
516 597
517package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
542 623
543 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
545 626
546 glEnable GL_BLEND; 627 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 629 glColor_premultiply @$color;
549 630
550 glBegin GL_QUADS; 631 glBegin GL_QUADS;
551 glVertex 0 , 0; 632 glVertex 0 , 0;
552 glVertex 0 , $h; 633 glVertex 0 , $h;
553 glVertex $w, $h; 634 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
570} 651}
571 652
572sub size_request { 653sub size_request {
573 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
574} 657}
575 658
576sub draw { } 659sub draw { }
577 660
578############################################################################# 661#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
583 666
584sub new { 667sub new {
585 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
586 669
587 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
588 671
589 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
590 children => [], 673 children => [],
591 can_events => 0, 674 can_events => 0,
592 %arg, 675 %arg,
593 ); 676 );
677
594 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
595 680
596 $self 681 $self
597} 682}
598 683
599sub add { 684sub add {
… …
607 $self->{children} = [ 692 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
610 ]; 695 ];
611 696
612 $self->check_size (1); 697 $self->realloc;
613 $self->update;
614} 698}
615 699
616sub children { 700sub children {
617 @{ $_[0]{children} } 701 @{ $_[0]{children} }
618} 702}
… …
623 delete $child->{parent}; 707 delete $child->{parent};
624 $child->hide; 708 $child->hide;
625 709
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 711
628 $self->check_size (1); 712 $self->realloc;
629 $self->update;
630} 713}
631 714
632sub clear { 715sub clear {
633 my ($self) = @_; 716 my ($self) = @_;
634 717
… …
638 for (@$children) { 721 for (@$children) {
639 delete $_->{parent}; 722 delete $_->{parent};
640 $_->hide; 723 $_->hide;
641 } 724 }
642 725
643 $self->check_size; 726 $self->realloc;
644 $self->update;
645} 727}
646 728
647sub find_widget { 729sub find_widget {
648 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
649 731
650 $x -= $self->{x}; 732 $x -= $self->{x};
651 $y -= $self->{y}; 733 $y -= $self->{y};
652 734
653 my $res; 735 my $res;
654 736
655 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
657 and return $res; 739 and return $res;
658 } 740 }
659 741
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
681} 763}
682 764
683sub add { 765sub add {
684 my ($self, $child) = @_; 766 my ($self, $child) = @_;
685 767
686 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
687
688 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
689} 770}
690 771
691sub remove { 772sub remove {
692 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
701 782
702sub size_request { 783sub size_request {
703 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
704} 785}
705 786
706sub size_allocate { 787sub invoke_size_allocate {
707 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
708 789
709 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
710} 793}
711 794
712############################################################################# 795#############################################################################
796
797# back-buffered drawing area
713 798
714package CFClient::UI::Window; 799package CFClient::UI::Window;
715 800
716our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
717 802
… …
728 813
729 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
730 $self->SUPER::update; 815 $self->SUPER::update;
731} 816}
732 817
733sub size_allocate { 818sub invoke_size_allocate {
734 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
735 820
736 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
738} 824}
739 825
740sub _render { 826sub _render {
827 my ($self) = @_;
828
741 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
742} 830}
743 831
744sub render_child { 832sub render_child {
745 my ($self) = @_; 833 my ($self) = @_;
746 834
747 $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 {
748 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
750 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
751 $self->_render; 846 $self->_render;
752 }; 847 };
753} 848}
754 849
755sub _draw { 850sub _draw {
756 my ($self) = @_; 851 my ($self) = @_;
757 852
758 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
759 854
760 my $tex = $self->{texture} 855 my $tex = $self->{texture}
761 or return; 856 or return;
762 857
763 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
766 861
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 863
769 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
770} 865}
… …
786} 881}
787 882
788sub size_request { 883sub size_request {
789 my ($self) = @_; 884 my ($self) = @_;
790 885
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 887
793 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
794} 889 $h = 10 if $self->{scroll_y};
795 890
891 ($w, $h)
892}
893
796sub size_allocate { 894sub invoke_size_allocate {
797 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
798 896
897 my $child = $self->child;
898
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 901
802 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
803 $self->update; 903 $self->update;
904
905 1
804} 906}
805 907
806sub set_offset { 908sub set_offset {
807 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
808 910
… …
841} 943}
842 944
843sub _render { 945sub _render {
844 my ($self) = @_; 946 my ($self) = @_;
845 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
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 952
848 $self->SUPER::_render; 953 $self->SUPER::_render;
849} 954}
850 955
… …
853package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
854 959
855our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
856 961
857sub new { 962sub new {
858 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
859 966
860 my $self; 967 my $self;
861 968
862 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
863 vertical => 1, 970 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 972 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
867 }, 974 },
868 ; 975 ;
869 976
870 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 979 slider => $slider,
873 @_, 980 %arg,
874 ); 981 );
875 982
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
879 985
880 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
881} 993}
882 994
883sub update { 995sub update {
884 my ($self) = @_; 996 my ($self) = @_;
885 997
… …
888 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
890 $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]);
891} 1003}
892 1004
893sub size_allocate { 1005sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897 1007
898 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 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)
900} 1012}
901 1013
902#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
903# update viewport offset on scroll 1015# update viewport offset on scroll
904 1016
… …
924 1036
925 if ($self->{bg}) { 1037 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
927 1039
928 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
931 1043
932 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
933 glVertex 0 , 0; 1045 glVertex 0 , 0;
934 glVertex 0 , $h; 1046 glVertex 0 , $h;
935 glVertex $w, $h; 1047 glVertex $w, $h;
… …
948 1060
949our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
950 1062
951use CFClient::OpenGL; 1063use CFClient::OpenGL;
952 1064
953my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 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);
956 1072
957sub new { 1073sub new {
958 my $class = shift; 1074 my ($class, %arg) = @_;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1075
962 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1079 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1080 can_events => 1,
968 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
969 ); 1084 );
970 1085
971 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
972 align => 0, 1087 align => 0,
973 valign => 1, 1088 valign => 1,
974 text => $self->{title}, 1089 text => $self->{title},
975 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 }
976 1101
977 $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};
978} 1111}
979 1112
980sub border { 1113sub border {
981 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
982} 1115}
983 1116
984sub size_request { 1117sub size_request {
985 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};
986 1125
987 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
988 1127
989 ( 1128 (
990 $w + $self->border * 2, 1129 $w + $self->border * 2,
991 $h + $self->border * 2, 1130 $h + $self->border * 2,
992 ) 1131 )
993} 1132}
994 1133
995sub size_allocate { 1134sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
997 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
998 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1000 1147
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1005}
1006 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1007sub button_down { 1156sub invoke_button_down {
1008 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1009 1158
1010 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1011 my $border = $self->border; 1160 my $border = $self->border;
1012 1161
… …
1025 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1026 1175
1027 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1029 1178
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1183 $self->realloc;
1034 }; 1184 };
1035 1185
1036 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1190 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1042 1192
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1194
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1048 } 1203 1
1049} 1204}
1050 1205
1051sub button_up { 1206sub invoke_button_up {
1052 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1053 1208
1054 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1055} 1210}
1056 1211
1057sub mouse_motion { 1212sub invoke_mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1059 1214
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1061} 1218}
1062 1219
1063sub _draw { 1220sub _draw {
1064 my ($self) = @_; 1221 my ($self) = @_;
1065 1222
1223 my $child = $self->{children}[0];
1224
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1227
1069 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1230
1072 my $border = $self->border; 1231 my $border = $self->border;
1073 1232
1074 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1238
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1082 1241
1083 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1247 }
1094 1248
1095 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1096 1250
1097 $self->{title}->draw if $self->{title};
1098
1099 $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};
1100} 1262}
1101 1263
1102############################################################################# 1264#############################################################################
1103 1265
1104package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1127 1289
1128 $child->set_parent ($self); 1290 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1130 1292
1131 $self->check_size (1); 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1132} 1300}
1133 1301
1134# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1303sub clear {
1136 my ($self) = @_; 1304 my ($self) = @_;
… …
1141 for (@children) { 1309 for (@children) {
1142 delete $_->{parent}; 1310 delete $_->{parent};
1143 $_->hide; 1311 $_->hide;
1144 } 1312 }
1145 1313
1146 $self->check_size (1); 1314 $self->realloc;
1147 $self->update;
1148} 1315}
1149 1316
1150sub get_wh { 1317sub get_wh {
1151 my ($self) = @_; 1318 my ($self) = @_;
1152 1319
… …
1178 (sum @$ws), 1345 (sum @$ws),
1179 (sum @$hs), 1346 (sum @$hs),
1180 ) 1347 )
1181} 1348}
1182 1349
1183sub size_allocate { 1350sub invoke_size_allocate {
1184 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1185 1352
1186 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1187 1354
1188 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1220 } 1387 }
1221 1388
1222 $y += $row_h; 1389 $y += $row_h;
1223 } 1390 }
1224 1391
1392 1
1225} 1393}
1226 1394
1227sub find_widget { 1395sub find_widget {
1228 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1229 1397
… …
1248 } 1416 }
1249} 1417}
1250 1418
1251############################################################################# 1419#############################################################################
1252 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
1253package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1254 1482
1255# TODO: wrap into common Box base class
1256
1257our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1258 1484
1259sub size_request { 1485sub new {
1260 my ($self) = @_; 1486 my $class = shift;
1261 1487
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1263 1489 vertical => 0,
1264 ( 1490 @_,
1265 (List::Util::sum map $_->[0], @alloc),
1266 (List::Util::max map $_->[1], @alloc),
1267 ) 1491 )
1268} 1492}
1269 1493
1270sub size_allocate {
1271 my ($self, $w, $h) = @_;
1272
1273 ($h, $w) = ($w, $h);
1274
1275 my $children = $self->{children};
1276
1277 my @h = map $_->{req_w}, @$children;
1278
1279 my $req_h = List::Util::sum @h;
1280
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children;
1286 $exp ||= 1;
1287
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 }
1295 }
1296
1297 CFClient::UI::harmonize \@h;
1298
1299 my $y = 0;
1300 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_];
1303 $child->configure ($y, 0, $h, $w);
1304
1305 $y += $h;
1306 }
1307
1308 1
1309}
1310
1311############################################################################# 1494#############################################################################
1312 1495
1313package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1314 1497
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1318 1499
1319sub size_request { 1500sub new {
1320 my ($self) = @_; 1501 my $class = shift;
1321 1502
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1323 1504 vertical => 1,
1324 ( 1505 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1506 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1507}
1368 1508
1369############################################################################# 1509#############################################################################
1370 1510
1371package CFClient::UI::Label; 1511package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1528 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1390 fontsize => 1, 1530 fontsize => 1,
1391 align => -1, 1531 align => -1,
1392 valign => -1, 1532 valign => -1,
1393 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1394 can_events => 0, 1535 can_events => 0,
1395 %arg 1536 %arg
1396 ); 1537 );
1397 1538
1398 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1425 1566
1426 delete $self->{texture}; 1567 delete $self->{texture};
1427 $self->SUPER::update; 1568 $self->SUPER::update;
1428} 1569}
1429 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1430sub set_text { 1578sub set_text {
1431 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1432 1580
1433 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1435 1583
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1438 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1439 $self->update; 1589 $self->update;
1440 $self->check_size;
1441} 1590}
1442 1591
1443sub set_markup { 1592sub set_markup {
1444 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1445 1594
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1599
1451 $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;
1452 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1453 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1454 $self->update; 1605 $self->update;
1455 $self->check_size;
1456} 1606}
1457 1607
1458sub size_request { 1608sub size_request {
1459 my ($self) = @_; 1609 my ($self) = @_;
1460 1610
1611 $self->{size_req} ||= do {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 1617
1467 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1468 1619
1469 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 1623
1473 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1474 1625
1475 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1477 } 1631 };
1478 1632
1479 ( 1633 @{ $self->{size_req} }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1634}
1484 1635
1485sub size_allocate { 1636sub invoke_size_allocate {
1486 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1487 1638
1639 delete $self->{ox};
1640
1488 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1489} 1645}
1490 1646
1491sub set_fontsize { 1647sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1493 1649
1494 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1651 delete $self->{texture};
1496 1652
1497 $self->update; 1653 $self->realloc;
1498 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1499} 1662}
1500 1663
1501sub _draw { 1664sub _draw {
1502 my ($self) = @_; 1665 my ($self) = @_;
1503 1666
… …
1509 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1676
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1515 1679
1680 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1519 1684
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1688 };
1526 1689
1527 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1528 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};
1529 1694
1530 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1533 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1535 } 1702 }
1536 1703
1537 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1538} 1705}
1539 1706
… …
1556 can_hover => 1, 1723 can_hover => 1,
1557 can_focus => 1, 1724 can_focus => 1,
1558 valign => 0, 1725 valign => 0,
1559 can_events => 1, 1726 can_events => 1,
1560 #text => ... 1727 #text => ...
1728 #hidden => "*",
1561 @_ 1729 @_
1562 ) 1730 )
1563} 1731}
1564 1732
1565sub _set_text { 1733sub _set_text {
… …
1567 1735
1568 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1569 1737
1570 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1571 1739
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1741 $self->{text} = $text;
1576 1742
1577 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1579 1746
1580 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1581} 1751}
1582 1752
1583sub set_text { 1753sub set_text {
1584 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1585 1755
1586 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1757 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 1758}
1591 1759
1592sub get_text { 1760sub get_text {
1593 $_[0]{text} 1761 $_[0]{text}
1594} 1762}
… …
1599 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1600 1768
1601 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1602} 1770}
1603 1771
1604sub key_down { 1772sub invoke_key_down {
1605 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1606 1774
1607 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1608 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1609 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1621 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1622 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1623 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1624 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1794 $self->emit ('escape');
1627 } elsif ($uni) { 1795 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1629 } 1799 }
1630 1800
1631 $self->_set_text ($text); 1801 $self->_set_text ($text);
1632 $self->update;
1633 $self->check_size;
1634}
1635 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1636sub focus_in { 1808sub invoke_focus_in {
1637 my ($self) = @_; 1809 my ($self) = @_;
1638 1810
1639 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1640 1812
1641 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1642} 1814}
1643 1815
1644sub button_down { 1816sub invoke_button_down {
1645 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1646 1818
1647 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1648 1820
1649 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1650 1822
1651 # byte-index to char-index 1823 # byte-index to char-index
1652 my $text = $self->{text}; 1824 my $text = $self->{text};
1653 utf8::encode $text; 1825 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1655 1827
1656 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1657 $self->update; 1829 $self->update;
1830
1831 1
1658} 1832}
1659 1833
1660sub mouse_motion { 1834sub invoke_mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1662# 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
1663} 1839}
1664 1840
1665sub _draw { 1841sub _draw {
1666 my ($self) = @_; 1842 my ($self) = @_;
1667 1843
1668 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1669 1845
1670 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1673 } else { 1849 } else {
1674 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1675 } 1851 }
1676 1852
1677 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1856 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1708 1884
1709our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1710 1886
1711use CFClient::OpenGL; 1887use CFClient::OpenGL;
1712 1888
1713sub key_down { 1889sub invoke_key_down {
1714 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1715 1891
1716 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1717 1893
1718 if ($sym == 13) { 1894 if ($sym == 13) {
1719 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1720 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1721 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1722 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1723 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1724 $self->update; 1901 $self->update;
1725 1902
1726 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1727 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1728 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1744 } else { 1921 } else {
1745 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1746 } 1923 }
1747 1924
1748 } else { 1925 } else {
1749 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1750 } 1929 1
1751
1752} 1930}
1753 1931
1754############################################################################# 1932#############################################################################
1755 1933
1756package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1765 1943
1766sub new { 1944sub new {
1767 my $class = shift; 1945 my $class = shift;
1768 1946
1769 $class->SUPER::new ( 1947 $class->SUPER::new (
1770 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1771 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1773 can_hover => 1, 1952 can_hover => 1,
1774 align => 0, 1953 align => 0,
1775 valign => 0, 1954 valign => 0,
1776 can_events => 1, 1955 can_events => 1,
1777 @_ 1956 @_
1778 ) 1957 )
1779} 1958}
1780 1959
1781sub activate { }
1782
1783sub button_up { 1960sub invoke_button_up {
1784 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1785 1962
1786 $self->emit ("activate") 1963 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1789} 1968}
1790 1969
1791sub _draw { 1970sub _draw {
1792 my ($self) = @_; 1971 my ($self) = @_;
1793 1972
1794 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1974
1800 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1803 1978
… …
1808 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1809} 1984}
1810 1985
1811############################################################################# 1986#############################################################################
1812 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
1813package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1814 2025
1815our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1816 2027
1817my @tex = 2028my @tex =
… …
1822 2033
1823sub new { 2034sub new {
1824 my $class = shift; 2035 my $class = shift;
1825 2036
1826 $class->SUPER::new ( 2037 $class->SUPER::new (
1827 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1828 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 2044 state => 0,
… …
1836} 2048}
1837 2049
1838sub size_request { 2050sub size_request {
1839 my ($self) = @_; 2051 my ($self) = @_;
1840 2052
1841 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1842} 2054}
1843 2055
1844sub button_down { 2056sub invoke_button_down {
1845 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1846 2058
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1851 } 2067 1
1852} 2068}
1853 2069
1854sub _draw { 2070sub _draw {
1855 my ($self) = @_; 2071 my ($self) = @_;
1856 2072
1857 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1858 2074
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 2076
1861 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;
1862 2080
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2082
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2084
… …
1874package CFClient::UI::Image; 2092package CFClient::UI::Image;
1875 2093
1876our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1877 2095
1878use CFClient::OpenGL; 2096use CFClient::OpenGL;
1879use Carp qw/confess/;
1880 2097
1881our %loaded_images; 2098our %texture_cache;
1882 2099
1883sub new { 2100sub new {
1884 my $class = shift; 2101 my $class = shift;
1885 2102
1886 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1887 2107
1888 $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";
1889 2110
1890 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1891 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;
1892 2113
1893 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1894 2115
1895 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1896
1897 $self->{aspect} = $tex->{w} / $tex->{h};
1898 2117
1899 $self 2118 $self
1900} 2119}
1901 2120
1902sub size_request { 2121sub size_request {
1903 my ($self) = @_; 2122 my ($self) = @_;
1904 2123
1905 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1906} 2125}
1907 2126
1908sub _draw { 2127sub _draw {
1909 my ($self) = @_; 2128 my ($self) = @_;
1910 2129
… …
2021 2240
2022 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2024 2243
2025 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2026 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;
2027 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2249
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2351 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2352 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2353 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2354 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2355 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2356 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2357 min_h => $::WIDTH / 80,
2138 vertical => 0, 2358 vertical => 0,
2139 can_hover => 1, 2359 can_hover => 1,
2140 inner_pad => 0.02, 2360 inner_pad => 0.02,
2141 @_ 2361 @_
2142 ); 2362 );
… …
2150sub set_range { 2370sub set_range {
2151 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2152 2372
2153 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2154 2374
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2157} 2379}
2158 2380
2159sub set_value { 2381sub set_value {
2160 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2161 2383
… …
2172 if $unit; 2394 if $unit;
2173 2395
2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2175 2397
2176 if ($value != $old_value) { 2398 if ($value != $old_value) {
2177 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2178 $self->update; 2400 $self->update;
2179 } 2401 }
2180} 2402}
2181 2403
2182sub size_request { 2404sub size_request {
2183 my ($self) = @_; 2405 my ($self) = @_;
2184 2406
2185 my $w = $self->{req_w}; 2407 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2408}
2190 2409
2191sub button_down { 2410sub invoke_button_down {
2192 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2193 2412
2194 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2195 2414
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2416
2198 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2199} 2418}
2200 2419
2201sub mouse_motion { 2420sub invoke_mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2203 2422
2204 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2206 2425
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2427
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2429
2211 $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
2212 } 2435 1
2213} 2436}
2214 2437
2215sub update { 2438sub update {
2216 my ($self) = @_; 2439 my ($self) = @_;
2217 2440
2218 $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}) {
2219 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2220 2450
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2223 2453
… …
2229 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2231 2461
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2234 }); 2464 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2465
2242 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2243 2467
2244 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2245 2469
… …
2306sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2308 2532
2309############################################################################# 2533#############################################################################
2310 2534
2311package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2312 2536
2313our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2314 2538
2315use CFClient::OpenGL; 2539use CFClient::OpenGL;
2316 2540
… …
2318 my $class = shift; 2542 my $class = shift;
2319 2543
2320 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2321 fontsize => 1, 2545 fontsize => 1,
2322 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2323 #font => default_font 2548 #font => default_font
2324 @_, 2549 @_,
2325 2550
2326 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2327 par => [], 2552 par => [],
… …
2342 2567
2343 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2344 $self->reflow; 2569 $self->reflow;
2345} 2570}
2346 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2347sub size_allocate { 2578sub invoke_size_allocate {
2348 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2349 2580
2350 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2351 2583
2352 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2353 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2354 $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});
2355 2588
2356 $self->reflow; 2589 $self->reflow;
2357}
2358 2590
2359sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2360 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2361 2596
2362 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2363 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $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});
2366 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2367 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2368 $layout->size 2606 $layout
2369} 2607}
2370 2608
2371sub reflow { 2609sub reflow {
2372 my ($self) = @_; 2610 my ($self) = @_;
2373 2611
… …
2382 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2383} 2621}
2384 2622
2385sub clear { 2623sub clear {
2386 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2387 2628
2388 $self->{par} = []; 2629 $self->{par} = [];
2389 $self->{height} = 0; 2630 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391} 2632}
2392 2633
2393sub add_paragraph { 2634sub add_paragraph {
2394 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2395 2636
2396 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2397 my ($w, $h) = $self->text_size ($line); 2638
2398 $self->{height} += $h; 2639 $para = {
2399 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,
2400 } 2646 };
2401 2647
2402 $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;
2403} 2660}
2404 2661
2405sub update { 2662sub update {
2406 my ($self) = @_; 2663 my ($self) = @_;
2407 2664
… …
2409 2666
2410 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2411 2668
2412 delete $self->{texture}; 2669 delete $self->{texture};
2413 2670
2414 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416 2673
2417 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2418 my $height = 0; 2675 my $height = 0;
2419 2676
2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2424 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2426 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2430 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2431 } 2685 }
2432 2686
2433 $height += $_->[1]; 2687 $height += $para->{h};
2434 } 2688 }
2435 2689
2436 $self->{height} = $height; 2690 $self->{height} = $height;
2437 2691
2438 $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]);
2439 2693
2440 delete $self->{texture}; 2694 delete $self->{texture};
2441 } 2695 }
2442 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2446 2704
2447 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2448 2706
2449 my $y0 = $top; 2707 my $y0 = $top;
2450 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2451 2709
2452 my $y = 0; 2710 my $y = 0;
2453
2454 my $layout = $self->{layout};
2455
2456 $layout->set_font ($self->{font}) if $self->{font};
2457 2711
2458 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2461 2715
2462 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2463 my $h = $par->[1]; 2717 my $h = $para->{h};
2464 2718
2465 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] }); 2720
2467 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($par->[4]);
2469 2722
2470 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2471 2724
2472 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2473 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 }
2474 } 2740 }
2475 2741
2476 $y += $h; 2742 $y += $h;
2477 } 2743 }
2478 2744
2479 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2480 }; 2746 };
2481 }); 2747 });
2482} 2748}
2483 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2484sub _draw { 2759sub _draw {
2485 my ($self) = @_; 2760 my ($self) = @_;
2486 2761
2487 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2490 $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});
2491 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2492 2767
2493 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2494
2495} 2769}
2496 2770
2497############################################################################# 2771#############################################################################
2498 2772
2499package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2544 2818
2545sub new { 2819sub new {
2546 my $class = shift; 2820 my $class = shift;
2547 2821
2548 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2549 state => 0, 2823 state => 0,
2550 connect_activate => \&toggle_flopper, 2824 on_activate => \&toggle_flopper,
2551 @_ 2825 @_
2552 ); 2826 );
2553 2827
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2828 $self
2560} 2829}
2561 2830
2562sub toggle_flopper { 2831sub toggle_flopper {
2563 my ($self) = @_; 2832 my ($self) = @_;
2564 2833
2565 # TODO: use animation 2834 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2835}
2577 2836
2578############################################################################# 2837#############################################################################
2579 2838
2580package CFClient::UI::Tooltip; 2839package CFClient::UI::Tooltip;
… …
2593} 2852}
2594 2853
2595sub set_tooltip_from { 2854sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2597 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
2598 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2872 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2874 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2611 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2612 2883
2613 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2614} 2885}
2615 2886
2616sub size_allocate { 2887sub invoke_size_allocate {
2617 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2618 2889
2619 $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 });
2620} 2909}
2621 2910
2622sub _draw { 2911sub _draw {
2623 my ($self) = @_; 2912 my ($self) = @_;
2624 2913
… …
2641 glVertex $w, $h; 2930 glVertex $w, $h;
2642 glVertex $w, 0; 2931 glVertex $w, 0;
2643 glEnd; 2932 glEnd;
2644 2933
2645 glTranslate 2 - 0.375, 2 - 0.375; 2934 glTranslate 2 - 0.375, 2 - 0.375;
2935
2646 $self->SUPER::_draw; 2936 $self->SUPER::_draw;
2647} 2937}
2648 2938
2649############################################################################# 2939#############################################################################
2650 2940
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 3000
2711 if ($tex) { 3001 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2717 } 3007 }
2718} 3008}
2719 3009
2720sub DESTROY { 3010sub destroy {
2721 my ($self) = @_; 3011 my ($self) = @_;
2722 3012
2723 $self->{timer}->cancel 3013 $self->{timer}->cancel
2724 if $self->{timer}; 3014 if $self->{timer};
2725 3015
2726 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2727} 3017}
2728 3018
2729############################################################################# 3019#############################################################################
2730 3020
2731package CFClient::UI::Inventory; 3021package CFClient::UI::Buttonbar;
2732 3022
2733our @ISA = CFClient::UI::ScrolledWindow::; 3023our @ISA = CFClient::UI::HBox::;
2734 3024
2735sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 3026
2776############################################################################# 3027#############################################################################
2777 3028
2778package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2779 3030
… …
2791 ); 3042 );
2792 3043
2793 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2794 3045
2795 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2796 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2797 3048
2798 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2799 if (!ref $widget) { 3050 if (!ref $widget) {
2800 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2801 can_hover => 1, 3052 can_hover => 1,
2802 can_events => 1, 3053 can_events => 1,
2803 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2804 } 3056 }
2805 3057
2806 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2807 3059
2808 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2813 3065
2814# 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)
2815sub popup { 3067sub popup {
2816 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2817 3069
2818 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2819 3071
2820 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 3073 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2823 3075
2824 $self->show; 3076 $self->show;
2825 $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);
2826} 3078}
2827 3079
2828sub mouse_motion { 3080sub invoke_mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2830 3082
2831 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2834}
2835 3086
3087 0
3088}
3089
2836sub button_up { 3090sub invoke_button_up {
2837 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2838 3092
2839 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2840 undef $GRAB; 3094 undef $GRAB;
2841 $self->hide; 3095 $self->hide;
2842 3096
2843 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2845 } 3103 1
2846} 3104}
2847 3105
2848############################################################################# 3106#############################################################################
2849 3107
2850package CFClient::UI::Statusbox; 3108package CFClient::UI::Multiplexer;
2851 3109
2852our @ISA = CFClient::UI::VBox::; 3110our @ISA = CFClient::UI::Container::;
2853 3111
2854sub new { 3112sub new {
2855 my $class = shift; 3113 my $class = shift;
2856 3114
2857 $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 (
2858 fontsize => 0.8, 3282 fontsize => 0.8,
2859 @_, 3283 @_,
2860 ) 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
2861} 3291}
2862 3292
2863sub reorder { 3293sub reorder {
2864 my ($self) = @_; 3294 my ($self) = @_;
2865 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} };
2866 3301
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3304 }
2870 3305
… …
2873 my @items = sort { 3308 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2877 3312
3313 $self->{timer}->interval (1);
3314
2878 my $count = 10 + 1; 3315 my $count = 10 + 1;
2879 for my $item (@items) { 3316 for my $item (@items) {
2880 last unless --$count; 3317 last unless --$count;
2881 3318
2882 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3323 : $item->{text};
2887 3324
… …
2895 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3338 can_events => 1,
2902 can_hover => 1 3339 can_hover => 1
2903 }; 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;
2904 } 3353 }
2905 3354
2906 $self->clear; 3355 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2908} 3357}
… …
2913 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2915 3364
2916 return unless $text; 3365 return unless $text;
2917 3366
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3368
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3370
2922 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2924 $item->{count}++; 3373 $item->{count}++;
2925 } else { 3374 } else {
2926 $item->{count} = 1; 3375 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2928 } 3377 }
2929 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2930 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2931 delete $item->{label}; 3380 delete $item->{label};
2932 } else { 3381 } else {
2933 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2934 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
2953 3402
2954 $self->reorder; 3403 $self->reorder;
2955 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
2956} 3405}
2957 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
2958############################################################################# 3415#############################################################################
2959 3416
2960package CFClient::UI::Root; 3417package CFClient::UI::Inventory;
2961 3418
2962our @ISA = CFClient::UI::Container::; 3419our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3420
2966sub new { 3421sub new {
2967 my $class = shift; 3422 my $class = shift;
2968 3423
2969 $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 => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
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");
3693
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 {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
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 (
2970 visible => 1, 3801 visible => 1,
2971 @_, 3802 @_,
2972 ) 3803 );
2973}
2974 3804
2975sub configure { 3805 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3806
2978 $self->{w} = $w; 3807 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3808}
2988 3809
2989sub size_request { 3810sub size_request {
2990 my ($self) = @_; 3811 my ($self) = @_;
2991 3812
2992 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
2993} 3814}
2994 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
2995sub size_allocate { 3830sub invoke_size_allocate {
2996 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
2997 3832
2998 for my $child ($self->children) { 3833 for my $child ($self->children) {
2999 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)};
3000 3835
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3836 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3837 $Y = $child->{force_y} if exists $child->{force_y};
3003 3838
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3839 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3841
3010 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3011 } 3843 }
3844
3845 1
3012} 3846}
3013 3847
3014sub coord2local { 3848sub coord2local {
3015 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3016 3850
… …
3024} 3858}
3025 3859
3026sub update { 3860sub update {
3027 my ($self) = @_; 3861 my ($self) = @_;
3028 3862
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3863 $::WANT_REFRESH++;
3031} 3864}
3032 3865
3033sub add { 3866sub add {
3034 my ($self, @children) = @_; 3867 my ($self, @children) = @_;
3035 3868
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3869 $_->{is_toplevel} = 1
3044 3870 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3871
3050 $self->SUPER::add (@children); 3872 $self->SUPER::add (@children);
3051} 3873}
3052 3874
3053sub remove { 3875sub remove {
3054 my ($self, @children) = @_; 3876 my ($self, @children) = @_;
3055 3877
3056 $self->SUPER::remove (@children); 3878 $self->SUPER::remove (@children);
3879
3880 delete $self->{is_toplevel}
3881 for @children;
3057 3882
3058 while (@children) { 3883 while (@children) {
3059 my $w = pop @children; 3884 my $w = pop @children;
3060 push @children, $w->children; 3885 push @children, $w->children;
3061 $w->set_invisible; 3886 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3905 while ($self->{refresh_hook}) {
3081 $_->() 3906 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
3083 } 3908 }
3084 3909
3085 if ($self->{check_size}) { 3910 if ($self->{realloc}) {
3086 my @queue = ([], []); 3911 my %queue;
3912 my @queue;
3913 my $widget;
3087 3914
3088 for (;;) { 3915 outer:
3089 if ($self->{check_size}) { 3916 while () {
3090 # heuristic: check containers last 3917 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3918 for $widget (values %$realloc) {
3092 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 }
3093 } 3925 }
3094 3926
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3927 while () {
3928 @queue or last outer;
3096 3929
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3930 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3931 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 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}) {
3105 $widget->{req_w} = $w; 3951 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3952 $widget->{req_h} = $h;
3107 3953
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3954 $self->{size_alloc}{$widget+0} = $widget;
3109 3955
3110 $widget->{parent}->check_size
3111 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 }
3112 } 3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3113 } 3966 }
3114 } 3967 }
3115 3968
3116 while ($self->{size_alloc}) { 3969 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 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)};
3119 3977
3120 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3122 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
3123 $widget->{w} = $w; 3988 $widget->{w} = $w;
3124 $widget->{h} = $h; 3989 $widget->{h} = $h;
3990
3125 $widget->emit (size_allocate => $w, $h); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
3126 } 3993 }
3127 } 3994 }
3128 3995
3129 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
3130 $_->() 3997 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
3132 } 3999 }
4000
3133 4001
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
3137 4005
… …
3139 glLoadIdentity; 4007 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 4010 glLoadIdentity;
3143 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
3144 $self->_draw; 4019 $self->_draw;
3145} 4020}
3146 4021
3147############################################################################# 4022#############################################################################
3148 4023

Diff Legend

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