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

Diff Legend

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