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

Diff Legend

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