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

Diff Legend

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