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

Diff Legend

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