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

Diff Legend

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