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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
241sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
242} 381}
243 382
244sub set_max_size { 383sub set_max_size {
245 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
246 385
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 388}
250 389
251# return top left coordinates 390sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
254 392
255 $self->{parent} 393 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
257 395
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
259} 404}
260 405
261# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
262sub coord2local { 407sub coord2local {
263 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
264 409
265 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 411}
268 412
269# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
270sub coord2global { 414sub coord2global {
271 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
272 416
273 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 418}
276 419
277sub focus_in { 420sub focus_in {
278 my ($self) = @_; 421 my ($self) = @_;
279 422
280 return if $FOCUS == $self; 423 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
282 425
283 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
284 427
285 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
286 429
287 $focus->update if $focus; 430 $focus->update if $focus;
288 $FOCUS->update; 431 $FOCUS->update;
289} 432}
290 433
… …
293 436
294 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
295 438
296 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
297 440
298 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
299 442
300 $focus->update if $focus; #? 443 $focus->update if $focus; #?
301}
302 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
303sub mouse_motion { } 449sub mouse_motion { 0 }
304sub button_up { } 450sub button_up { 0 }
305sub key_down { } 451sub key_down { 0 }
306sub key_up { } 452sub key_up { 0 }
307 453
308sub button_down { 454sub button_down {
309 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
310 456
311 $self->focus_in; 457 $self->focus_in;
312}
313 458
314sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
315sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
316sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
317sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
318sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
319 535
320sub draw { 536sub draw {
321 my ($self) = @_; 537 my ($self) = @_;
322 538
323 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
324 550
325 glPushMatrix; 551 glPushMatrix;
326 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
327 $self->_draw; 553 $self->_draw;
328 glPopMatrix; 554 glPopMatrix;
… …
340 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
341 glEnd; 567 glEnd;
342 glDisable GL_BLEND; 568 glDisable GL_BLEND;
343 } 569 }
344 570
345 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
346 glPushMatrix; 572 glPushMatrix;
347 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 576 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
354 glEnd; 580 glEnd;
355 glPopMatrix; 581 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 583 }
358} 584}
359 585
360sub _draw { 586sub _draw {
361 my ($self) = @_; 587 my ($self) = @_;
362 588
363 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
364} 590}
365 591
366sub find_widget {
367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
370
371 return $self
372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
374
375 ()
376}
377
378sub set_parent {
379 my ($self, $parent) = @_;
380
381 Scalar::Util::weaken ($self->{parent} = $parent);
382}
383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
410sub update {
411 my ($self) = @_;
412
413 $self->{parent}->update
414 if $self->{parent};
415}
416
417sub connect {
418 my ($self, $signal, $cb) = @_;
419
420 push @{ $self->{signal_cb}{$signal} }, $cb;
421}
422
423sub emit {
424 my ($self, $signal, @args) = @_;
425
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
427}
428
429sub DESTROY { 592sub DESTROY {
430 my ($self) = @_; 593 my ($self) = @_;
431 594
595 delete $WIDGET{$self+0};
432 #$self->deactivate; 596 #$self->deactivate;
433} 597}
434 598
435############################################################################# 599#############################################################################
436 600
… …
445 my $class = shift; 609 my $class = shift;
446 610
447 # range [value, low, high, page] 611 # range [value, low, high, page]
448 612
449 $class->SUPER::new ( 613 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
452 @_ 616 @_
453 ) 617 )
454} 618}
455 619
456sub _draw { 620sub _draw {
457 my ($self) = @_; 621 my ($self) = @_;
458 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
460 629
461 glEnable GL_BLEND; 630 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
464 633
465 glBegin GL_QUADS; 634 glBegin GL_QUADS;
466 glVertex 0 , 0; 635 glVertex 0 , 0;
467 glVertex 0 , $h; 636 glVertex 0 , $h;
468 glVertex $w, $h; 637 glVertex $w, $h;
469 glVertex $w, 0; 638 glVertex $w, 0;
470 glEnd; 639 glEnd;
471 640
472 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
473} 643}
474 644
475############################################################################# 645#############################################################################
476 646
477package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
482 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
484} 654}
485 655
486sub size_request { 656sub size_request {
487 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
488} 660}
489 661
490sub draw { } 662sub draw { }
491 663
492############################################################################# 664#############################################################################
… …
496our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
497 669
498sub new { 670sub new {
499 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
500 672
501 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
502 674
503 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
504 children => [], 676 children => [],
505 can_events => 0, 677 can_events => 0,
506 %arg, 678 %arg,
507 ); 679 );
680
508 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
509 683
510 $self 684 $self
511} 685}
512 686
513sub add { 687sub add {
514 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
515 689
516 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
517 692
518 use sort 'stable'; 693 use sort 'stable';
519 694
520 $self->{children} = [ 695 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
523 ]; 698 ];
524 699
525 $child->check_size; 700 $self->realloc;
526} 701}
527 702
528sub children { 703sub children {
529 @{ $_[0]{children} } 704 @{ $_[0]{children} }
530} 705}
… …
535 delete $child->{parent}; 710 delete $child->{parent};
536 $child->hide; 711 $child->hide;
537 712
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 714
540 $self->check_size; 715 $self->realloc;
541 $self->update;
542} 716}
543 717
544sub clear { 718sub clear {
545 my ($self) = @_; 719 my ($self) = @_;
546 720
… …
549 723
550 for (@$children) { 724 for (@$children) {
551 delete $_->{parent}; 725 delete $_->{parent};
552 $_->hide; 726 $_->hide;
553 } 727 }
728
729 $self->realloc;
554} 730}
555 731
556sub find_widget { 732sub find_widget {
557 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
558 734
559 $x -= $self->{x}; 735 $x -= $self->{x};
560 $y -= $self->{y}; 736 $y -= $self->{y};
561 737
562 my $res; 738 my $res;
563 739
564 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
565 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
566 and return $res; 742 and return $res;
567 } 743 }
568 744
569 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 809}
634 810
635sub update { 811sub update {
636 my ($self) = @_; 812 my ($self) = @_;
637 813
638 # we want to do this delayed... 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 815 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 816}
652 817
653sub size_allocate { 818sub size_allocate {
654 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
655 820
656 $self->child->configure (0, 0, $w, $h); 821 $self->SUPER::size_allocate ($w, $h);
822 $self->update;
823}
657 824
825sub _render {
826 my ($self) = @_;
827
828 $self->{children}[0]->draw;
829}
830
831sub render_child {
832 my ($self) = @_;
833
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT;
837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
658 $self->render_chld; 845 $self->_render;
846 };
659} 847}
660 848
661sub _draw { 849sub _draw {
662 my ($self) = @_; 850 my ($self) = @_;
663 851
664 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
665 853
666 my $tex = $self->{texture} 854 my $tex = $self->{texture}
667 or return; 855 or return;
668 856
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1;
673 860
674 $tex->draw_quad (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 862
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
678} 864}
679 865
680############################################################################# 866#############################################################################
681 867
682package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
683 869
684our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 871
712sub new { 872sub new {
713 my $class = shift; 873 my $class = shift;
714 874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
882sub size_request {
883 my ($self) = @_;
884
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886
887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
902 $self->update;
903}
904
905sub set_offset {
906 my ($self, $x, $y) = @_;
907
908 $self->{view_x} = int $x;
909 $self->{view_y} = int $y;
910
911 $self->update;
912}
913
914# hmm, this does not work for topleft of $self... but we should not ask for that
915sub coord2local {
916 my ($self, $x, $y) = @_;
917
918 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
919}
920
921sub coord2global {
922 my ($self, $x, $y) = @_;
923
924 $x = List::Util::min $self->{w}, $x - $self->{view_x};
925 $y = List::Util::min $self->{h}, $y - $self->{view_y};
926
927 $self->SUPER::coord2global ($x, $y)
928}
929
930sub find_widget {
931 my ($self, $x, $y) = @_;
932
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y)
939 }
940}
941
942sub _render {
943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949
950 $self->SUPER::_render;
951}
952
953#############################################################################
954
955package CFClient::UI::ScrolledWindow;
956
957our @ISA = CFClient::UI::HBox::;
958
959sub new {
960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
963
964 my $self;
965
966 my $slider = new CFClient::UI::Slider
967 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]);
971 },
972 ;
973
715 my $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 975 vp => (new CFClient::UI::ViewPort expand => 1),
717 border_bg => [1, 1, 1, 1], 976 slider => $slider,
718 border => 0.8, 977 %arg,
719 @_
720 ); 978 );
721 979
980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
982
722 $self 983 $self
723} 984}
724 985
725sub _draw { 986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000}
1001
1002sub size_allocate {
726 my ($self) = @_; 1003 my ($self, $w, $h) = @_;
727 1004
728 my ($w, $h) = ($self->{w}, $self->{h}); 1005 $self->SUPER::size_allocate ($w, $h);
729 1006
730 glEnable GL_BLEND; 1007 my $child = $self->{vp}->child;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734
735# glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0;
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742
743
744 $self->child->draw;
745 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D;
747} 1009}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
748 1013
749############################################################################# 1014#############################################################################
750 1015
751package CFClient::UI::FancyFrame; 1016package CFClient::UI::Frame;
752 1017
753our @ISA = CFClient::UI::Bin::; 1018our @ISA = CFClient::UI::Bin::;
754 1019
755use CFClient::OpenGL; 1020use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 1021
761sub new { 1022sub new {
762 my $class = shift; 1023 my $class = shift;
763 1024
764 # TODO: user_x, user_y, overwrite moveto? 1025 $class->SUPER::new (
1026 bg => undef,
1027 @_,
1028 )
1029}
1030
1031sub _draw {
1032 my ($self) = @_;
1033
1034 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)};
1036
1037 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} };
1040
1041 glBegin GL_QUADS;
1042 glVertex 0 , 0;
1043 glVertex 0 , $h;
1044 glVertex $w, $h;
1045 glVertex $w, 0;
1046 glEnd;
1047
1048 glDisable GL_BLEND;
1049 }
1050
1051 $self->SUPER::_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::UI::FancyFrame;
1057
1058our @ISA = CFClient::UI::Bin::;
1059
1060use CFClient::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069
1070sub new {
1071 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
765 1074
766 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1078 border => 0.6,
770 can_events => 1, 1079 can_events => 1,
771 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
772 ); 1083 );
773 1084
774 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
775 align => 0, 1086 align => 0,
776 valign => 1, 1087 valign => 1,
777 text => $self->{title}, 1088 text => $title,
778 fontsize => 1; 1089 fontsize => $self->{border}
1090 if defined $title;
779 1091
780 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
781} 1100}
782 1101
783sub border { 1102sub border {
784 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
785} 1104}
786 1105
787sub size_request { 1106sub size_request {
788 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
789 1111
790 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
791 1113
792 ( 1114 (
793 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
796} 1118}
797 1119
798sub size_allocate { 1120sub size_allocate {
799 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
800 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
801 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
803 1133
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
805 if $self->{title};
806
807 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
808} 1135}
809 1136
810sub button_down { 1137sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
812 1139
1140 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1141 my $border = $self->border;
814 1142
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1143 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1144 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1145
1146 if ($lr & $td) {
1147 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1148 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1149 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1150
1151 my $mx = $x < $border;
1152 my $my = $y < $border;
1153
821 $self->{motion} = sub { 1154 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
823 1156
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1157 my $dx = $ev->{x} - $ox;
1158 my $dy = $ev->{y} - $oy;
825 1159
826 $self->{user_w} = $bw + $x - $ox; 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
828 $self->check_size; 1162
1163 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
829 }; 1165 };
830 1166
831 } elsif ($x >= 0 && $x < $self->{w} 1167 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
836 1170
837 $self->{motion} = sub { 1171 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
839 1173
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
841 1175
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
843 $self->update;
844 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
845 } 1182 1
846} 1183}
847 1184
848sub button_up { 1185sub button_up {
849 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
850 1187
851 delete $self->{motion}; 1188 !!delete $self->{motion}
852} 1189}
853 1190
854sub mouse_motion { 1191sub mouse_motion {
855 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
856 1193
857 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
858} 1197}
859 1198
860sub _draw { 1199sub _draw {
861 my ($self) = @_; 1200 my ($self) = @_;
862 1201
1202 my $child = $self->{children}[0];
1203
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
865 1206
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1209
871 my $border = $self->border; 1210 my $border = $self->border;
872 1211
873 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1217
879 my $bg = $tex[0]; 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} };
880 1220
881 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1222 # solve this better(?)
883 my $rep_y = $ch / $bg->{h}; 1223 $bg->{s} = $cw / $bg->{w};
884 1224 $bg->{t} = $ch / $bg->{h};
885 glColor @{ $self->{bg} };
886
887 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1226 }
891 1227
892 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1229
895 $self->{title}->draw if $self->{title};
896 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
897} 1236}
898 1237
899############################################################################# 1238#############################################################################
900 1239
901package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
909sub new { 1248sub new {
910 my $class = shift; 1249 my $class = shift;
911 1250
912 $class->SUPER::new ( 1251 $class->SUPER::new (
913 col_expand => [], 1252 col_expand => [],
914 @_ 1253 @_,
915 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1259}
917 1260
918sub add { 1261sub add {
919 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
920 1263
921 $child->set_parent ($self); 1264 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
923 1266
924 $child->check_size; 1267 $self->realloc;
925} 1268}
926 1269
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
932sub clear { 1271sub clear {
933 my ($self) = @_; 1272 my ($self) = @_;
934 1273
935 my @children = $self->children; 1274 my @children = $self->children;
936 delete $self->{children}; 1275 delete $self->{children};
… …
938 for (@children) { 1277 for (@children) {
939 delete $_->{parent}; 1278 delete $_->{parent};
940 $_->hide; 1279 $_->hide;
941 } 1280 }
942 1281
943 $self->update; 1282 $self->realloc;
944} 1283}
945 1284
946sub get_wh { 1285sub get_wh {
947 my ($self) = @_; 1286 my ($self) = @_;
948 1287
… …
979sub size_allocate { 1318sub size_allocate {
980 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
981 1320
982 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
983 1322
984 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
986 1325
987 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1383 }
1045} 1384}
1046 1385
1047############################################################################# 1386#############################################################################
1048 1387
1049package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1050
1051# TODO: wrap into common Box base class
1052 1389
1053our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1054 1391
1055sub size_request { 1392sub size_request {
1056 my ($self) = @_; 1393 my ($self) = @_;
1057 1394
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1059 1396 ? (
1060 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1061 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1062 (List::Util::max map $_->[1], @alloc), 1399 )
1063 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1064} 1404}
1065 1405
1066sub size_allocate { 1406sub size_allocate {
1067 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1068 1408
1069 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1070
1071 my $children = $self->{children}; 1410 my $children = $self->{children};
1072 1411
1073 my @h = map $_->{req_w}, @$children; 1412 my @req;
1074 1413
1075 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1076 1415 @req = ($space / (@$children || 1)) x @$children;
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1081 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1082 $exp ||= 1;
1083 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1084 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 } 1430 }
1091 } 1431 }
1092 1432
1093 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1094 1434
1095 my $y = 0; 1435 my $pos = 0;
1096 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1099 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1100 1439
1101 $y += $h; 1440 $pos += $alloc;
1102 } 1441 }
1103 1442
1104 1 1443 1
1105} 1444}
1106 1445
1107############################################################################# 1446#############################################################################
1108 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1109package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1110 1464
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1114 1466
1115sub size_request { 1467sub new {
1116 my ($self) = @_; 1468 my $class = shift;
1117 1469
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1119 1471 vertical => 1,
1120 ( 1472 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1473 )
1124} 1474}
1125 1475
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1476#############################################################################
1164 1477
1165package CFClient::UI::Label; 1478package CFClient::UI::Label;
1166 1479
1167our @ISA = CFClient::UI::Base::; 1480our @ISA = CFClient::UI::DrawBG::;
1168 1481
1169use CFClient::OpenGL; 1482use CFClient::OpenGL;
1170 1483
1171sub new { 1484sub new {
1172 my ($class, %arg) = @_; 1485 my ($class, %arg) = @_;
1173 1486
1174 my $self = $class->SUPER::new ( 1487 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1488 fg => [1, 1, 1],
1489 #bg => none
1490 #active_bg => none
1176 #font => default_font 1491 #font => default_font
1492 #text => initial text
1493 #markup => initial narkup
1494 #max_w => maximum pixel width
1495 ellipsise => 3, # end
1496 layout => (new CFClient::Layout),
1177 fontsize => 1, 1497 fontsize => 1,
1178 text => "",
1179 align => -1, 1498 align => -1,
1180 valign => -1, 1499 valign => -1,
1181 padding => 2, 1500 padding_x => 2,
1182 layout => new CFClient::Layout, 1501 padding_y => 2,
1183 can_events => 0, 1502 can_events => 0,
1184 %arg 1503 %arg
1185 ); 1504 );
1186 1505
1187 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1507 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1508 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1509 $self->{template} = $layout;
1191 } 1510 }
1192 1511
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1512 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1513 $self->set_markup (delete $self->{markup});
1514 } else {
1515 $self->set_text (delete $self->{text});
1516 }
1195 1517
1196 $self 1518 $self
1197} 1519}
1198 1520
1199sub escape { 1521sub escape($) {
1200 local $_ = $_[1]; 1522 local $_ = $_[0];
1201 1523
1202 s/&/&amp;/g; 1524 s/&/&amp;/g;
1203 s/>/&gt;/g; 1525 s/>/&gt;/g;
1204 s/</&lt;/g; 1526 s/</&lt;/g;
1205 1527
1206 $_[1] 1528 $_
1529}
1530
1531sub update {
1532 my ($self) = @_;
1533
1534 delete $self->{texture};
1535 $self->SUPER::update;
1207} 1536}
1208 1537
1209sub set_text { 1538sub set_text {
1210 my ($self, $text) = @_; 1539 my ($self, $text) = @_;
1211 1540
1541 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text";
1543
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1213 1546
1214 delete $self->{texture}; 1547 $self->realloc;
1215 $self->check_size;
1216 $self->update; 1548 $self->update;
1217} 1549}
1218 1550
1219sub set_markup { 1551sub set_markup {
1220 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1221 1553
1554 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup";
1556
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1223 1561
1224 delete $self->{texture}; 1562 $self->realloc;
1225 $self->check_size;
1226 $self->update; 1563 $self->update;
1227} 1564}
1228 1565
1229sub size_request { 1566sub size_request {
1230 my ($self) = @_; 1567 my ($self) = @_;
1231 1568
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1570 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1574
1236 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1237 1576
1238 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
… …
1243 1582
1244 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1246 } 1585 }
1247 1586
1248 ( 1587 ($w, $h)
1249 $w + $self->{padding} * 2,
1250 $h + $self->{padding} * 2,
1251 )
1252} 1588}
1253 1589
1254sub size_allocate { 1590sub size_allocate {
1255 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1256 1592
1593 delete $self->{ox};
1594
1257 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1258} 1597}
1259 1598
1260sub set_fontsize { 1599sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1262 1601
1263 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1603 delete $self->{texture};
1265 $self->check_size; 1604
1266 $self->update; 1605 $self->realloc;
1267} 1606}
1268 1607
1269sub _draw { 1608sub _draw {
1270 my ($self) = @_; 1609 my ($self) = @_;
1271 1610
1611 $self->SUPER::_draw; # draw background, if applicable
1612
1272 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620
1276 new_from_layout CFClient::Texture $self->{layout} 1621 new_from_layout CFClient::Texture $self->{layout}
1277 }; 1622 };
1278 1623
1279 glEnable GL_BLEND; 1624 unless (exists $self->{ox}) {
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5);
1628
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5);
1632 };
1633
1281 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1636
1637 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1638 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $tex->draw_quad ($self->{ox}, $self->{oy}); 1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1299 1643
1300 glDisable GL_TEXTURE_2D; 1644 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1645}
1303 1646
1304############################################################################# 1647#############################################################################
1305 1648
1306package CFClient::UI::EntryBase; 1649package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1320 can_hover => 1, 1663 can_hover => 1,
1321 can_focus => 1, 1664 can_focus => 1,
1322 valign => 0, 1665 valign => 0,
1323 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1324 @_ 1668 @_
1325 ) 1669 )
1326} 1670}
1327 1671
1328sub _set_text { 1672sub _set_text {
… …
1338 $self->{text} = $text; 1682 $self->{text} = $text;
1339 1683
1340 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1342 1686
1343 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688}
1689
1690sub set_text {
1691 my ($self, $text) = @_;
1692
1693 $self->{cursor} = length $text;
1694 $self->_set_text ($text);
1695
1696 $self->realloc;
1344} 1697}
1345 1698
1346sub get_text { 1699sub get_text {
1347 $_[0]{text} 1700 $_[0]{text}
1348} 1701}
… …
1351 my ($self) = @_; 1704 my ($self) = @_;
1352 1705
1353 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1354 1707
1355 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1709}
1371 1710
1372sub key_down { 1711sub key_down {
1373 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1374 1713
… …
1376 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1378 1717
1379 my $text = $self->get_text; 1718 my $text = $self->get_text;
1380 1719
1381 if ($sym == 8) { 1720 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1733 $self->_emit ('escape');
1395 } elsif ($uni) { 1734 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1397 } 1738 }
1398 1739
1399 $self->_set_text ($text); 1740 $self->_set_text ($text);
1400 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1401} 1745}
1402 1746
1403sub focus_in { 1747sub focus_in {
1404 my ($self) = @_; 1748 my ($self) = @_;
1405 1749
… …
1420 utf8::encode $text; 1764 utf8::encode $text;
1421 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1422 1766
1423 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1424 $self->update; 1768 $self->update;
1769
1770 1
1425} 1771}
1426 1772
1427sub mouse_motion { 1773sub mouse_motion {
1428 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1429# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1430} 1778}
1431 1779
1432sub _draw { 1780sub _draw {
1433 my ($self) = @_; 1781 my ($self) = @_;
1434 1782
… …
1485 if ($sym == 13) { 1833 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1491 $self->update; 1839 $self->update;
1492 1840
1493 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1511 } else { 1859 } else {
1512 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1513 } 1861 }
1514 1862
1515 } else { 1863 } else {
1516 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1517 } 1867 1
1518
1519} 1868}
1520 1869
1521############################################################################# 1870#############################################################################
1522 1871
1523package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1532 1881
1533sub new { 1882sub new {
1534 my $class = shift; 1883 my $class = shift;
1535 1884
1536 $class->SUPER::new ( 1885 $class->SUPER::new (
1537 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1538 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1541 can_hover => 1, 1890 can_hover => 1,
1542 align => 0, 1891 align => 0,
1543 valign => 0, 1892 valign => 0,
1544 can_events => 1, 1893 can_events => 1,
1545 @_ 1894 @_
1546 ) 1895 )
1547} 1896}
1548 1897
1898sub activate { }
1899
1549sub button_up { 1900sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1551 1902
1903 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate"); 1906
1555 } 1907 1
1556} 1908}
1557 1909
1558sub _draw { 1910sub _draw {
1559 my ($self) = @_; 1911 my ($self) = @_;
1560 1912
… …
1562 1914
1563 if ($GRAB == $self) { 1915 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1916 $self->{fg} = $self->{active_fg};
1565 } 1917 }
1566 1918
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1919 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1921 glColor 0, 0, 0, 1;
1572 1922
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1924
1575 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1926
1578 $self->SUPER::_draw; 1927 $self->SUPER::_draw;
1579} 1928}
1580 1929
1581############################################################################# 1930#############################################################################
… …
1592 1941
1593sub new { 1942sub new {
1594 my $class = shift; 1943 my $class = shift;
1595 1944
1596 $class->SUPER::new ( 1945 $class->SUPER::new (
1597 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1598 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1950 bg => [0, 0, 0, 0.2],
1951 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1952 state => 0,
1601 can_hover => 1, 1953 can_hover => 1,
1602 @_ 1954 @_
1603 ) 1955 )
1604} 1956}
1605 1957
1606sub size_request { 1958sub size_request {
1607 my ($self) = @_; 1959 my ($self) = @_;
1608 1960
1609 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1610} 1962}
1611 1963
1612sub button_down { 1964sub button_down {
1613 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1614 1966
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1617 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1619 } 1975 1
1620} 1976}
1621 1977
1622sub _draw { 1978sub _draw {
1623 my ($self) = @_; 1979 my ($self) = @_;
1624 1980
1625 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1626 1982
1627 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1628 1984
1629 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1630 1988
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1990
1633 glEnable GL_BLEND; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1992
1634 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1994 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1995 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1996}
1644 1997
1645############################################################################# 1998#############################################################################
1646 1999
1647package CFClient::UI::Image; 2000package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 2043 glTranslate 0, -$self->{w}, 0;
1691 2044
1692 ($w, $h) = ($h, $w); 2045 ($w, $h) = ($h, $w);
1693 } 2046 }
1694 2047
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 2048 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 2050
1700 $tex->draw_quad (0, 0, $w, $h); 2051 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 2052
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 2053 glDisable GL_TEXTURE_2D;
1704} 2054}
1705 2055
1706############################################################################# 2056#############################################################################
1707 2057
… …
1755} 2105}
1756 2106
1757sub set_max { 2107sub set_max {
1758 my ($self, $max) = @_; 2108 my ($self, $max) = @_;
1759 2109
2110 return if $self->{max_val} == $max;
2111
1760 $self->{max_val} = $max; 2112 $self->{max_val} = $max;
2113 $self->update;
1761} 2114}
1762 2115
1763sub set_value { 2116sub set_value {
1764 my ($self, $val, $max) = @_; 2117 my ($self, $val, $max) = @_;
1765 2118
1766 $self->set_max ($max) 2119 $self->set_max ($max)
1767 if defined $max; 2120 if defined $max;
1768 2121
1769 $max = $self->{max_val}; 2122 return if $self->{val} == $val;
2123
1770 $self->{val} = $val; 2124 $self->{val} = $val;
1771
1772 $self->update; 2125 $self->update;
1773} 2126}
1774 2127
1775sub _draw { 2128sub _draw {
1776 my ($self) = @_; 2129 my ($self) = @_;
… …
1859 2212
1860 $self->{value}->set_fontsize ($fsize); 2213 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2214 $self->{max} ->set_fontsize ($fsize);
1862} 2215}
1863 2216
2217sub set_max {
2218 my ($self, $max) = @_;
2219
2220 $self->{gauge}->set_max ($max);
2221 $self->{max}->set_text ($max);
2222}
2223
1864sub set_value { 2224sub set_value {
1865 my ($self, $val, $max) = @_; 2225 my ($self, $val, $max) = @_;
1866 2226
1867 $self->set_max ($max) 2227 $self->set_max ($max)
1868 if defined $max; 2228 if defined $max;
1869 2229
1870 $self->{gauge}->set_value ($val, $max); 2230 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2231 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2232}
1880 2233
1881############################################################################# 2234#############################################################################
1882 2235
1883package CFClient::UI::Slider; 2236package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2246 qw(s1_slider.png s1_slider_bg.png);
1894 2247
1895sub new { 2248sub new {
1896 my $class = shift; 2249 my $class = shift;
1897 2250
1898 # range [value, low, high, page] 2251 # range [value, low, high, page, unit]
1899 2252
1900 # TODO: 0-width page 2253 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2254 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2255 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2259 bg => [0, 0, 0, 0.2],
2260 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2262 min_w => $::WIDTH / 80,
1908 req_h => 20, 2263 min_h => $::WIDTH / 80,
1909 vertical => 0, 2264 vertical => 0,
1910 can_hover => 1, 2265 can_hover => 1,
1911 inner_pad => 5, 2266 inner_pad => 0.02,
1912 @_ 2267 @_
1913 ); 2268 );
1914 2269
2270 $self->set_value ($self->{range}[0]);
2271 $self->update;
2272
1915 $self 2273 $self
1916} 2274}
1917 2275
2276sub changed { }
2277
2278sub set_range {
2279 my ($self, $range) = @_;
2280
2281 ($range, $self->{range}) = ($self->{range}, $range);
2282
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2285}
2286
2287sub set_value {
2288 my ($self, $value) = @_;
2289
2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2291
2292 $hi = $lo + 1 if $hi <= $lo;
2293
2294 $page = $hi - $lo if $page > $hi - $lo;
2295
2296 $value = $lo if $value < $lo;
2297 $value = $hi - $page if $value > $hi - $page;
2298
2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2300 if $unit;
2301
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303
2304 if ($value != $old_value) {
2305 $self->_emit (changed => $value);
2306 $self->update;
2307 }
2308}
2309
1918sub size_request { 2310sub size_request {
1919 my ($self) = @_; 2311 my ($self) = @_;
1920 2312
1921 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
1922 my $h = $self->{req_h};
1923
1924 $self->{vertical} ? ($h, $w) : ($w, $h)
1925} 2314}
1926 2315
1927sub button_down { 2316sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
1929 2318
1930 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2320
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322
1931 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
1932} 2324}
1933 2325
1934sub mouse_motion { 2326sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
1936 2328
1937 if ($GRAB == $self) { 2329 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331
2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2333
2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2335
2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2341 1
2342}
2343
2344sub update {
2345 my ($self) = @_;
2346
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2348 $self->set_value ($self->{range}[0]);
2349
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
1939 2352
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2354
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2357
1945 $x -= $inner_pad_px; # substract the padding 2358 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2359 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2360
1951 $self->emit (changed => $x); 2361 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2362 $self->{knob_w} = $knob_w;
1953 } 2363 });
1954}
1955 2364
1956# the inner_* stuff is for generating a padding for the slider handle, 2365 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2366}
1963 2367
1964sub _draw { 2368sub _draw {
1965 my ($self) = @_; 2369 my ($self) = @_;
1966 2370
1967 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
1968 2372
1969 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
1970 2374
1971 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
1973 2377
2378 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2380 }
1979 2381
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2384
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2387
2006 # draw background 2388 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2390
2009 # draw handle 2391 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2393
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2014} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2015 2437
2016############################################################################# 2438#############################################################################
2017 2439
2018package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2019 2441
… …
2028 fontsize => 1, 2450 fontsize => 1,
2029 can_events => 0, 2451 can_events => 0,
2030 #font => default_font 2452 #font => default_font
2031 @_, 2453 @_,
2032 2454
2033 layout => (new CFClient::Layout), 2455 layout => (new CFClient::Layout 1),
2034 par => [], 2456 par => [],
2035 height => 0, 2457 height => 0,
2036 children => [ 2458 children => [
2037 (new CFClient::UI::Empty expand => 1), 2459 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2460 (new CFClient::UI::Slider vertical => 1),
2039 ], 2461 ],
2040 ); 2462 );
2041 2463
2042 $self->{children}[1]->connect (changed => sub { 2464 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2465
2046 $self 2466 $self
2047} 2467}
2048 2468
2049sub set_fontsize { 2469sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2470 my ($self, $fontsize) = @_;
2051 2471
2052 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2473 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2474}
2074 2475
2075sub size_allocate { 2476sub size_allocate {
2076 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2077 2478
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2484
2084 $self->reflow; 2485 $self->reflow;
2085} 2486}
2086 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2087sub add_paragraph { 2522sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2089 2524
2090 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2091 2526 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2095 2530
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2099 $self->{children}[1]->update;
2100} 2532}
2101 2533
2102sub update { 2534sub update {
2103 my ($self) = @_; 2535 my ($self) = @_;
2104 2536
… …
2106 2538
2107 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2108 2540
2109 delete $self->{texture}; 2541 delete $self->{texture};
2110 2542
2111 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2112 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2547 my $height = 0;
2114 2548
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2116 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2117 2564
2118 $self->{height} = $height; 2565 $self->{height} = $height;
2119 2566
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2568
2122 delete $self->{texture}; 2569 delete $self->{texture};
2123 } 2570 }
2124 2571
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2128 2575
2576 my $top = int $self->{children}[1]{range}[0];
2577
2578 my $y0 = $top;
2579 my $y1 = $top + $H;
2580
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2129 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2590
2145 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2592 my $h = $par->[1];
2147 2593
2148 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2149 $layout->set_text ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2150 2598
2151 glColor @{ $par->[1] }; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2600
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2603 }
2155 2604
2156 $y += $h; 2605 $y += $h;
2157 } 2606 }
2158 2607
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2608 glDisable GL_BLEND;
2161 }; 2609 };
2162 }); 2610 });
2163} 2611}
2164 2612
2165sub _draw { 2613sub _draw {
2166 my ($self) = @_; 2614 my ($self) = @_;
2167 2615
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2618 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2174 }
2175 2621
2176 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2177 2623
2178} 2624}
2179 2625
… …
2227 2673
2228sub new { 2674sub new {
2229 my $class = shift; 2675 my $class = shift;
2230 2676
2231 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2232 state => 0, 2678 state => 0,
2233 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2234 @_ 2680 @_
2235 ); 2681 );
2236 2682
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2683 $self
2243} 2684}
2244 2685
2245sub toggle_flopper { 2686sub toggle_flopper {
2246 my ($self) = @_; 2687 my ($self) = @_;
2247 2688
2248 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2690}
2260 2691
2261############################################################################# 2692#############################################################################
2262 2693
2263package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2273 @_, 2704 @_,
2274 can_events => 0, 2705 can_events => 0,
2275 ) 2706 )
2276} 2707}
2277 2708
2278sub set_markup { 2709sub set_tooltip_from {
2279 my ($self, $text) = @_; 2710 my ($self, $widget) = @_;
2280 2711
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2712 my $tooltip = $widget->{tooltip};
2282 $self->{label}->set_markup ($text); 2713
2283 $self->add ($self->{label}); 2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2721 $self->add (new CFClient::UI::Label
2722 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8,
2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 );
2284} 2729}
2285 2730
2286sub size_request { 2731sub size_request {
2287 my ($self) = @_; 2732 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2733
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2735
2293 ($w + 4, $h + 4) 2736 ($w + 4, $h + 4)
2294} 2737}
… …
2297 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2298 2741
2299 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300} 2743}
2301 2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2761}
2762
2302sub _draw { 2763sub _draw {
2303 my ($self) = @_; 2764 my ($self) = @_;
2304 2765
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2766 glTranslate 0.375, 0.375;
2307 2767
2308 my ($w, $h) = @$self{qw(w h)}; 2768 my ($w, $h) = @$self{qw(w h)};
2309 2769
2310 glColor 1, 0.8, 0.4; 2770 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2781 glVertex 0 , $h;
2322 glVertex $w, $h; 2782 glVertex $w, $h;
2323 glVertex $w, 0; 2783 glVertex $w, 0;
2324 glEnd; 2784 glEnd;
2325 2785
2326 glPopMatrix; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2327 2787
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2330} 2789}
2331 2790
2332############################################################################# 2791#############################################################################
2333 2792
… …
2338use CFClient::OpenGL; 2797use CFClient::OpenGL;
2339 2798
2340sub new { 2799sub new {
2341 my $class = shift; 2800 my $class = shift;
2342 2801
2343 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2344 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2345 @_, 2805 @_,
2346 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2347} 2823}
2348 2824
2349sub size_request { 2825sub size_request {
2350 (32, 8) 2826 (32, 8)
2351} 2827}
2352 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2353sub draw { 2837sub _draw {
2354 my ($self) = @_; 2838 my ($self) = @_;
2355 2839
2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2852
2358 if ($tex) { 2853 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2856 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2859 }
2860}
2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2368} 2869}
2369 2870
2370############################################################################# 2871#############################################################################
2371 2872
2873package CFClient::UI::Buttonbar;
2874
2875our @ISA = CFClient::UI::HBox::;
2876
2877# TODO: should actualyl wrap buttons and other goodies.
2878
2879#############################################################################
2880
2881package CFClient::UI::Menu;
2882
2883our @ISA = CFClient::UI::FancyFrame::;
2884
2885use CFClient::OpenGL;
2886
2887sub new {
2888 my $class = shift;
2889
2890 my $self = $class->SUPER::new (
2891 items => [],
2892 z => 100,
2893 @_,
2894 );
2895
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897
2898 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item;
2900
2901 # handle various types of items, only text for now
2902 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label
2904 can_hover => 1,
2905 can_events => 1,
2906 text => $widget;
2907 }
2908
2909 $self->{item}{$widget} = $item;
2910
2911 $self->{vbox}->add ($widget);
2912 }
2913
2914 $self
2915}
2916
2917# popup given the event (must be a mouse button down event currently)
2918sub popup {
2919 my ($self, $ev) = @_;
2920
2921 $self->_emit ("popdown");
2922
2923 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self;
2925 $self->{button} = $ev->{button};
2926
2927 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929}
2930
2931sub mouse_motion {
2932 my ($self, $ev, $x, $y) = @_;
2933
2934 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2939}
2940
2941sub button_up {
2942 my ($self, $ev, $x, $y) = @_;
2943
2944 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB;
2946 $self->hide;
2947
2948 $self->_emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 $class->SUPER::new (
3075 fontsize => 0.8,
3076 @_,
3077 )
3078}
3079
3080sub reorder {
3081 my ($self) = @_;
3082 my $NOW = time;
3083
3084 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 }
3087
3088 my @widgets;
3089
3090 my @items = sort {
3091 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} };
3094
3095 my $count = 10 + 1;
3096 for my $item (@items) {
3097 last unless --$count;
3098
3099 push @widgets, $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text};
3104
3105 for ($short) {
3106 s/^\s+//;
3107 s/\s+/ /g;
3108 }
3109
3110 new CFClient::UI::Label
3111 markup => $short,
3112 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg},
3118 can_events => 1,
3119 can_hover => 1
3120 };
3121 }
3122
3123 $self->clear;
3124 $self->SUPER::add (reverse @widgets);
3125}
3126
3127sub add {
3128 my ($self, $text, %arg) = @_;
3129
3130 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
3134
3135 my $timeout = time + ((delete $arg{timeout}) || 60);
3136
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138
3139 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) {
3141 $item->{count}++;
3142 } else {
3143 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text;
3145 }
3146 $item->{id} = ++$self->{id};
3147 $item->{timeout} = $timeout;
3148 delete $item->{label};
3149 } else {
3150 $self->{item}{$group} = {
3151 id => ++$self->{id},
3152 text => $text,
3153 timeout => $timeout,
3154 tooltip => $text,
3155 fg => [0.8, 0.8, 0.8, 0.8],
3156 pri => 0,
3157 count => 1,
3158 %arg,
3159 };
3160 }
3161
3162 $self->reorder;
3163}
3164
3165sub reconfigure {
3166 my ($self) = @_;
3167
3168 delete $_->{label}
3169 for values %{ $self->{item} || {} };
3170
3171 $self->reorder;
3172 $self->SUPER::reconfigure;
3173}
3174
3175#############################################################################
3176
3177package CFClient::UI::Inventory;
3178
3179our @ISA = CFClient::UI::ScrolledWindow::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
2372package CFClient::UI::Root; 3472package CFClient::UI::Root;
2373 3473
2374our @ISA = CFClient::UI::Container::; 3474our @ISA = CFClient::UI::Container::;
2375 3475
2376use CFClient::OpenGL; 3476use CFClient::OpenGL;
2377 3477
2378sub check_size { 3478sub new {
2379 my ($self) = @_; 3479 my $class = shift;
2380 3480
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2382} 3489}
2383 3490
2384sub size_request { 3491sub size_request {
2385 ($::WIDTH, $::HEIGHT) 3492 my ($self) = @_;
2386}
2387 3493
2388sub configure { 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3509}
3510
3511sub size_allocate {
2389 my ($self, $x, $y, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2390 3513
2391 $self->SUPER::configure ($x, $y, $w, $h);
2392
2393 for my $child (@{$self->{children}}) { 3514 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3516
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3517 $X = $child->{force_x} if exists $child->{force_x};
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3519
3520 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h};
3522
2398 $child->configure ($X, $Y, $W,$H); 3523 $child->configure ($X, $Y, $W, $H);
2399 } 3524 }
2400} 3525}
2401 3526
2402sub _topleft { 3527sub coord2local {
2403 my ($self, $x, $y) = @_; 3528 my ($self, $x, $y) = @_;
2404 3529
2405 ($x, $y) 3530 ($x, $y)
2406} 3531}
2407 3532
3533sub coord2global {
3534 my ($self, $x, $y) = @_;
3535
3536 ($x, $y)
3537}
3538
2408sub update { 3539sub update {
2409 my ($self) = @_; 3540 my ($self) = @_;
2410 3541
2411 $self->check_size; 3542 $::WANT_REFRESH++;
2412 ::refresh ();
2413} 3543}
2414 3544
2415sub add { 3545sub add {
2416 my ($self, $child) = @_; 3546 my ($self, @children) = @_;
2417 3547
2418 # integerize window positions 3548 $_->{is_toplevel} = 1
2419 $child->{x} = int $child->{x}; 3549 for @children;
2420 $child->{y} = int $child->{y};
2421 3550
2422 $self->SUPER::add ($child); 3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
2423} 3567}
2424 3568
2425sub on_refresh { 3569sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2427 3571
2428 $self->{refresh_hook}{$id} = $cb; 3572 $self->{refresh_hook}{$id} = $cb;
2429} 3573}
2430 3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
2431sub draw { 3581sub draw {
2432 my ($self) = @_; 3582 my ($self) = @_;
2433 3583
2434 while (my $rcb = delete $self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3585 $_->()
3586 for values %{delete $self->{refresh_hook}};
2436 } 3587 }
3588
3589 if ($self->{realloc}) {
3590 my %queue;
3591 my @queue;
3592 my $widget;
3593
3594 outer:
3595 while () {
3596 if (my $realloc = delete $self->{realloc}) {
3597 for $widget (values %$realloc) {
3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3604 }
3605
3606 while () {
3607 @queue or last outer;
3608
3609 $widget = pop @{ $queue[-1] || [] }
3610 and last;
3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3627 $widget->{req_w} = $w;
3628 $widget->{req_h} = $h;
3629
3630 $self->{size_alloc}{$widget+0} = $widget;
3631
3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3642 }
3643 }
3644
3645 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653
3654 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0;
3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3664 $widget->{w} = $w;
3665 $widget->{h} = $h;
3666
3667 $widget->emit (size_allocate => $w, $h);
3668 }
3669 }
3670 }
3671
3672 while ($self->{post_alloc_hook}) {
3673 $_->()
3674 for values %{delete $self->{post_alloc_hook}};
3675 }
3676
2437 3677
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
2441 3681
2442 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3683 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3686 glLoadIdentity;
2447 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
2448 $self->_draw; 3695 $self->_draw;
2449} 3696}
2450 3697
2451############################################################################# 3698#############################################################################
2452 3699
2453package CFClient::UI; 3700package CFClient::UI;
2454 3701
2455$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3704
24581 37051
2459 3706

Diff Legend

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