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

Diff Legend

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