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

Diff Legend

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