ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

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

Diff Legend

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